Commit graph

318 commits

Author SHA1 Message Date
a71d249e6c Merge pull request #96 from aavenel/master
New feature : Settle the bill
2013-05-09 18:32:55 -07:00
A.Avenel
ff9ead2203 Optimization 2013-05-09 23:23:23 +02:00
A.Avenel
058cc8a9e5 correct french translation 2013-05-09 22:33:15 +02:00
A.Avenel
4d329a76ae Bugfix#92 : error when deleting an user 2013-04-08 11:29:31 +02:00
A.Avenel
1999ebd925 one more fix to french translation ... 2013-04-08 00:14:16 +02:00
A.Avenel
9fcdd0dee3 Forget to translate some sentences ... 2013-04-07 23:48:23 +02:00
A.Avenel
c1f4348b52 update french translation 2013-04-07 23:38:39 +02:00
A.Avenel
a0e94f3c11 bugfix : "Settle" link was not active on navbar. 2013-04-07 23:01:32 +02:00
A.Avenel
0d7c82b122 More code cleanup for "settle bills" 2013-04-07 22:14:32 +02:00
A.Avenel
1fa0cff180 use "member.id" instead of "member" 2013-04-07 20:25:25 +02:00
A.Avenel
b410e48851 Merge branch 'flask0.9' of github.com:aavenel/ihatemoney 2013-02-19 15:36:37 +01:00
A.Avenel
a4b8283fba Update tests to work with flask 0.9 2013-02-19 15:27:51 +01:00
A.Avenel
bfea4e436f update for flask 0.9 2013-02-18 19:18:49 +01:00
A.Avenel
8b114c5718 update for "create archive" interface 2012-11-26 21:52:25 +01:00
A.Avenel
ee7459025d Increase max-height for modal
so we can display more members without using scrollbars
2012-11-25 14:01:47 +01:00
A.Avenel
bbd4a1a838 Cosmetic changes for "add a bill" panel 2012-11-25 13:53:30 +01:00
A.Avenel
79bd22c25c Add unit tests for settle_bill 2012-11-03 20:53:51 +01:00
A.Avenel
2b51131aa4 Merge git://github.com/Lastpixl/ihatemoney into HEAD
Conflicts:
	budget/templates/layout.html
	budget/templates/list_bills.html
2012-11-03 17:34:05 +01:00
A.Avenel
0fcc2c72ec Some love for the dashboard view 2012-09-03 23:11:32 +02:00
A.Avenel
44dc06bb6f Bugfix : "Submit and add a new one" not working 2012-09-03 21:06:07 +02:00
A.Avenel
d0129abc0e Bugfix : calendar widget not working when you edit a bill. 2012-09-03 18:11:31 +02:00
A.Avenel
a2b950d9c8 Remove some old code no longer needed (Correct 404 errors about jquery-ui) 2012-09-03 17:40:34 +02:00
688a281464 remove epio support 2012-09-02 14:09:41 +02:00
6a544855d7 Fix project deletion. fix #87 2012-09-02 13:53:01 +02:00
e75809dddf Enhance the test suite 2012-09-02 13:26:56 +02:00
b3ce91c79f add sentry support 2012-06-10 01:49:01 +02:00
599895cac3 Switched to the new naming scheme for extensions 2012-05-19 15:09:57 +02:00
Frédéric Sureau
be32a2550e Update to Boostrap v2.
Remove unused libs (QTip, JQueryUI) and add bootstrap-datepicker which is much lighter.
2012-04-05 15:40:09 +02:00
870101c237 add settings for epio 2012-04-01 20:36:28 +02:00
90acad67f9 make tests run on python 2.7 also 2012-04-01 19:39:26 +02:00
Frédéric Sureau
192ca41b0a Adds test for the has_bills() method of Person model 2012-03-29 01:13:00 +02:00
Frédéric Sureau
c343bf96ea Merge branch 'master' of git://github.com/spiral-project/ihatemoney 2012-03-28 17:02:02 +02:00
Xavier Mehrenberger
cb13fbb782 Split bills function and basic template. 2012-03-12 01:35:28 +01:00
Feth AREZKI
46d2dfeb29 remove unused code
If that code is ever needed, I'll try to rewrite it as a class
decorator, which is more hype
2012-03-06 22:42:58 +01:00
Feth AREZKI
353aec4f1e remove unused imports, and pep8 2012-03-06 22:14:29 +01:00
Feth AREZKI
e04a4154e8 remove unused imports and from blah import * 2012-03-06 22:14:10 +01:00
Feth AREZKI
e22ee5dfd2 remove from blah import * 2012-03-06 22:13:47 +01:00
Feth AREZKI
9583fe3cbe code reread: noop, and pep8 <3 2012-03-06 20:37:32 +01:00
Feth AREZKI
6a50e7318b pep8 <3 and '*' imports removal 2012-03-06 18:42:44 +01:00
Feth AREZKI
fddf60a662 pep8 <3 and '*' imports removal 2012-03-06 18:41:55 +01:00
Feth AREZKI
c51c02481b tolerance to smtp error when creating project 2012-02-20 17:03:44 +01:00
Feth AREZKI
04f8470223 cosmit. rem trailing spaces 2012-02-20 16:58:18 +01:00
Frédéric Sureau
71cb07a92b Merge remote-tracking branch 'upstream/master' 2012-02-15 16:09:23 +01:00
Adrien CLERC
bd1b0aaff3 Add QTip2 and use it to display a message about access code on the first page. 2012-02-11 19:18:34 +01:00
Adrien CLERC
2f928e08be Use embedded fonts instead of Google. 2012-02-09 23:02:55 +01:00
Adrien CLERC
e1ca284d84 Add font generated from FontSquirrel. The CSS have
been slightly modified.
2012-02-09 23:01:28 +01:00
Frédéric Sureau
caf9b6fcc2 Correct bug in members model. The has_bills method did not worked as expected. Fix #73. 2012-01-28 12:40:10 +01:00
Frédéric Sureau
a59465c9a5 Changed delete feature to only support POST method. Fix #21. 2012-01-28 01:35:04 +01:00
848e4a34ce Fix an error in dashboard.html 2011-12-04 00:23:55 +01:00
A.Avenel
1a5abcfbf2 Fix for a bug introduced in last commit : crash of dashboard view when there is no bill. 2011-12-03 22:25:19 +01:00
A.Avenel
0633b153f6 Small commit to add more informations in dashboard view. 2011-12-03 17:40:50 +01:00
b1665770e8 The 'submit and add a new one' button now acts as intended 2011-12-03 16:41:46 +01:00
79cbd72c03 oops, forgot to include dashboard.html in a previous commit. See #42 2011-12-03 16:15:25 +01:00
3a2958a44e Add a 'sumbit and add a new one' button for new bills. Fix #53 2011-11-28 01:42:02 +01:00
46f9807806 Fix a little styling mistake. Now the menu displays the right way 2011-11-28 01:15:52 +01:00
05e7a7934a Fix #59. Edit now works properly 2011-11-28 01:07:06 +01:00
7dd7d1d14f add a (dead simple) dashboard. Fixes #42 2011-11-28 00:36:00 +01:00
fc88b65bbe add bootstrap-modal.js 2011-11-28 00:35:34 +01:00
f75bf39307 Transform the bill addition form, using a popup. See #53 2011-11-28 00:22:10 +01:00
8570e79170 reorganize the static folder structure 2011-11-28 00:20:30 +01:00
44060f03df update bootstrap to the last version. Clean some css 2011-11-27 23:11:09 +01:00
bb146b09d7 Fix #54. The flash message is now in green 2011-11-27 04:33:45 +01:00
ea29704819 jinja2.6 is required 2011-11-27 04:33:15 +01:00
f0c750f99a merge with quentin 2011-11-27 04:13:30 +01:00
47010d4cd7 change the icons, simplify some javascript 2011-11-27 04:11:22 +01:00
Tinmn
2cadead381 Members are now sorted by name in the balance. 2011-11-26 14:24:48 +01:00
672f2a1ca1 revert arnaud's commit about delete links 2011-11-24 00:27:51 +01:00
Tinmn
2a6ccaa0cf Correction of a (very) minor bug of bill hover (commit 6df17b7d97). 2011-11-21 02:35:57 +01:00
Tinmn
6df17b7d97 Bill's members highlights in the balance in accordance with #69.
I'm not satisfied with the payer display but I have better in mind.
2011-11-20 20:30:14 +01:00
Tinmn
2e9d1b882a Change delete bill logo in accordance with #67. 2011-11-20 16:43:03 +01:00
Tinmn
ebf705a20f Bill owers are now separated with a ',' in the bill list. 2011-11-20 16:32:48 +01:00
Tinmn
a5cc50b0c2 Addition of an auto hiding user information message in the add user text field (with translation). 2011-11-20 14:37:32 +01:00
Arnaud Bos
9962b6d60f Merge branch 'master' of github.com:spiral-project/ihatemoney 2011-11-17 09:07:32 +01:00
Arnaud Bos
3bf8cececf Minor CSS changes 2011-11-17 09:07:21 +01:00
A.Avenel
e20c3bdb6b Small fix in CommaDecimalField class 2011-11-03 13:33:11 +01:00
A.Avenel
6df3bcdf13 Oops, forgot to commit tests 2011-11-02 15:26:35 +01:00
A.Avenel
66bd6268fa Merge remote branches 'upstream/master' and 'origin/master' 2011-11-02 14:36:16 +01:00
A.Avenel
94ab8fbcc3 Part of a fix to #62 : french numbers should use commas rather than dots 2011-11-02 14:35:38 +01:00
Arnaud Bos
0fe49c13d5 See #54. Move the flashing message to absolute positionning to avoid annoying shifting of the bills list. 2011-11-02 13:44:55 +01:00
Arnaud Bos
ac2935b429 Ease "Add a bill" form occurrence with slideUp/slideDown effects. Related to #53. 2011-11-02 13:20:00 +01:00
Arnaud Bos
f3972db96a Add a way to delete a project. Fix #63 2011-11-02 12:16:01 +01:00
Arnaud Bos
655774e4d4 Merge pull request #65 from aavenel/master
Bug fix in order to show the calendar widget when you edit a bill.
2011-11-01 17:09:03 -07:00
Arnaud Bos
d9cf29c510 First draft of fixing sidebar ugly hovering effect pointed in #51. 2011-11-02 00:54:43 +01:00
A.Avenel
471ef87d3e Bug fix in order to show the calendar widget when you edit a bill. Also fix another bug related to cancel button. 2011-11-02 00:23:21 +01:00
Arnaud Bos
0d44b97c4a Make the new bill link more visible. Fix #50. 2011-11-01 14:41:51 +01:00
Arnaud Bos
5963d7df9d Replace edit / delete links by icons. Fix #49. 2011-11-01 14:35:20 +01:00
Arnaud Bos
d1b641b45e Correct "payed" --> "paid" typo. Fix #60. See #48 for spelling mistakes and typos 2011-11-01 13:07:32 +01:00
Arnaud Bos
7f805b63ca Improvement of the sidebar look. Related to #34. Fix #52. 2011-11-01 12:57:12 +01:00
Arnaud Bos
1e0898dd87 Last selected payer and translations. Fix #47.
- Last selected payer selected by default when creating a new bill

- Fix some translation typos and modify a few labels
2011-10-20 04:18:12 +02:00
6f4f04b117 Document the API. Fix #46 2011-10-18 23:26:13 +02:00
4e1819523f Minor changes to the slidebar. See #34 2011-10-18 18:39:38 +02:00
b88b317faa Bills can't be negative. Fix #45 2011-10-18 18:13:54 +02:00
6e3834048b Use the relation table for "has_bills".
This fixes a bug related to the way we made joins to query q postgresql db.
I found that we didn't needed at all any join, so a simple lookup in the m2m relation table allows to speed up things.

Fix #44
2011-10-18 17:48:23 +02:00
Arnaud Bos
c3b3e2f770 Paint sidebar in green. Close #34 2011-10-18 04:30:34 +02:00
6f3b9dfda8 change the link in the footer as well 2011-10-18 00:04:50 +02:00
435ec2626d Make the rest module a flask extension.
It's now flask_rest.
2011-10-17 17:30:57 +02:00
3f9022ac13 the format for the date is yy-mm-dd 2011-10-17 00:15:44 +02:00
db7e1496b0 Add the ability to change the language explicitely. I'm not sure the UI is better with this. Any thoughts are welcome. Fix #35 2011-10-17 00:03:41 +02:00
f7a969240a Add a datepicker (with support of i18n). Fix #37 2011-10-16 23:38:27 +02:00
9a3e4537cb Format floats with 2 decimals. Fix #39 2011-10-16 13:59:22 +02:00
2553303fa4 serve static files with nginx 2011-10-15 21:50:15 +02:00
ebcd64237d clicking on the logo should return on the homepage 2011-10-15 21:49:27 +02:00
c1267da2ea translate 'each' as well 2011-10-15 02:53:09 +02:00
8acd4984dd add the project's title in the list of bills 2011-10-15 02:40:19 +02:00
ad392db53e update some strings in the french translation 2011-10-15 02:26:43 +02:00
b07c8a9273 remove the archive feature for now 2011-10-15 02:25:12 +02:00
d9c7977a59 fix a bit the UI (identifier on bill's list) 2011-10-15 02:24:02 +02:00
c54fac69c9 Fix translations of forms.
Forms are not context related, thus translations are done only once if not done
in a lazy way. the fix is to use lazy_gettext rather than gettext. Fix #12
2011-10-15 01:58:30 +02:00
f61d1432c7 Translate the application using Flask-babel.
The only translation so far is french, but more can be added. The browser language
is used thanks to the HTTP languages headers.

There are still some problems with the translation of some strings, I don't know
why this is. See #12
2011-10-15 01:19:19 +02:00
45ccc8b509 I HAZ TO RUN TESTS BEFORE COMMITING 2011-10-14 15:48:31 +02:00
9c4fd0c210 add epio.ini 2011-10-13 23:14:27 +02:00
20f905a5c0 put back requirements.txt in budget 2011-10-13 23:05:53 +02:00
f0f73a3c8b move requirements.txt 2011-10-13 22:54:58 +02:00
97132ce88a Fix some problems related to postgresql and models 2011-10-13 21:27:56 +02:00
b7ba8e43c4 Coerce the payer choice to int, default is unicode. Fix #33 2011-10-13 21:24:23 +02:00
fdb75316d6 Coerce the payer choice to int, default is unicode 2011-10-13 20:20:11 +02:00
5245a1a6c7 Do not prompt the user with a 'prompt()' in javascript when deleting members. Fix #29 2011-10-08 17:13:36 +02:00
7d9fde0460 Round the balance. Fix #1 2011-10-08 16:43:46 +02:00
75209aeed0 Add a password recovery feature. Fix #32 2011-10-08 15:52:12 +02:00
1338653bd2 iclude the edit_project template 2011-10-08 15:12:29 +02:00
19ae3ab3b2 merge with master 2011-10-08 13:45:05 +02:00
48bc551853 Complete the REST API + Tests. Fix #27 2011-10-08 13:27:30 +02:00
Arnaud Bos
402dbce153 Merge mistake, my bad
- Restore ProjectForm.password as a PasswordField and not TextField
2011-09-18 23:50:14 +02:00
Arnaud Bos
681f22f3e4 Merge branch 'master' into auth-forms-usability 2011-09-18 23:39:10 +02:00
20ab40690d Provide a way to edit a project. Fix #17 2011-09-14 22:03:18 +02:00
5721be1d15 Fix #26. Footer is now relative 2011-09-14 18:22:26 +02:00
7bf3492961 Merge branch 'master' of github.com:ametaireau/budget-manager 2011-09-14 14:52:17 +02:00
1b8258a521 Add a test for #23 2011-09-14 14:50:54 +02:00
Arnaud Bos
6212b643ec Simplified #30 fix. 2011-09-14 02:19:10 +02:00
Arnaud Bos
34ccb3546d Validate authentication form if given identifier is null. Fix #30. 2011-09-14 02:07:26 +02:00
Arnaud Bos
89e1bbe134 Make the identifier clearer to the end-user.
- Send an email to the user with the summary of the created project
  containing a reminder of the identifier, password and a link.

- Add flash message with the identifier in the /invite page/

- Add a small note containing the identifier in the upper right corner
  of the project main page.
2011-09-14 01:16:25 +02:00
b0d41291af API: Create and Update support 2011-09-13 22:58:53 +02:00
8528526f0b API: set the mimetype on the response 2011-09-13 19:24:48 +02:00
e13ceaf351 REST API is now able to list stuff \o/ 2011-09-13 18:15:07 +02:00
a60b0c2b48 add mimetype support to the rest API utils 2011-09-13 11:52:11 +02:00
d2e2260e52 Add a serialization mechanism 2011-09-13 11:27:36 +02:00
ef3d761fc7 Add Handlers for members and bills. 2011-09-11 23:00:32 +02:00
4bb96b28de API first draft: utils. (related to #27)
Introduces the "rest" module, with reusable utils for flask applications (will be packaged as a flask extension later on).
2011-09-11 22:11:36 +02:00
Arnaud Bos
88cd2f8675 Fix #24 on Authentication and New project forms usability.
- Do not display anymore the identifier field in home.

- Let the user enter the id if the slug generated from project name already exists as a project id.

- Moved get_billform_for from 'utils' to 'forms', to avoid issue (was 'from forms import ...' into utils,
  and 'from utils import ...' into forms, which causeed an error).
2011-09-11 05:30:28 +02:00
ef353d643c Refactor the application to use blueprints.
This allows to isolate some behavior in the context of the web application so
the API and the web application can behave in different ways.
2011-09-09 21:21:37 +02:00
45dc6edacb Move some logic to the models and add comments. 2011-09-09 19:57:28 +02:00
801802836a Start working on archive management 2011-09-09 19:14:19 +02:00
0303ab4db7 Add a way to reactivate an user, make the add project non obstrusive 2011-08-25 18:25:58 +02:00
3f8cabd5a8 change the color of the font in the main page 2011-08-25 18:25:10 +02:00
1ccfa8a07d don't display delete link if the user is deactivated 2011-08-22 23:30:48 +02:00
e0a40a0c7c display a flash message when an user is coming back 2011-08-22 23:29:10 +02:00
e97d460a4a iterate also on deactivated people, show them if they owe or should receive money 2011-08-22 23:26:49 +02:00
5550e18cfd Add missing tests. Fixes #14 and #22. 2011-08-22 23:19:00 +02:00
9eab5be9a3 RequestRedirect uses a HTTP 301. We need 303.
This is mainly because 301 is cacheable whereas 303 (See other) isn't.
The redirect response given by the app when trying to connect to a project
(via /project_name) while not authenticated was to permanently redirect to
/authenticate.

Once authenticated, the browser was redirected to the /project_name, that was
cached, leading to an endless loop.

303 see other allows to solve this problem.
2011-08-21 22:35:01 +02:00
63777c16bc authentication dance 2011-08-21 22:20:50 +02:00