1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-30 04:13:01 +00:00
Commit Graph

283 Commits

Author SHA1 Message Date
Pierre-antoine Comby
13055c393a Merge branch 'master' into alias 2020-03-05 21:43:06 +01:00
Pierre-antoine Comby
3c22d3b8a5 Merge branch 'static_files' into 'master'
Static files

See merge request bde/nk20!24
2020-03-05 21:41:44 +01:00
Pierre-antoine Comby
2e8505e9b4 ménage dans les imports 2020-03-04 16:34:52 +01:00
Pierre-antoine Comby
fd74080ce3 profile picture update view is working 2020-03-04 16:34:12 +01:00
Pierre-antoine Comby
c4198a64af add button for profile pic view 2020-03-03 14:45:50 +01:00
Pierre-antoine Comby
14ccc8da75 Add ImageForm 2020-03-03 14:26:31 +01:00
Pierre-antoine Comby
f992c117f4 rename second_form to profile_form 2020-03-03 14:25:16 +01:00
Pierre-antoine Comby
211859e940 add default profile pic 2020-03-03 14:24:07 +01:00
Pierre-antoine Comby
901454f338 rename template for consistency 2020-03-03 11:05:02 +01:00
Pierre-antoine Comby
b3d45ba64b alias page inherit from profile template 2020-03-01 17:36:49 +01:00
Pierre-antoine Comby
b7e68722aa front improvement on alias page 2020-03-01 16:20:13 +01:00
Pierre-antoine Comby
35d5bcdf0f Deletion of alias now possible! 2020-03-01 00:25:53 +01:00
Pierre-antoine Comby
27391049f2 remove duplicated form 2020-02-28 16:12:35 +01:00
Pierre-antoine Comby
db95944574 add delete boutons, work with only one alias 2020-02-28 15:25:45 +01:00
Pierre-antoine Comby
c77bc0c032 add deleteView for aliases 2020-02-28 13:52:15 +01:00
Pierre-antoine Comby
9133c84ef2 comment bug 2020-02-28 13:49:50 +01:00
Pierre-antoine Comby
f77351b444 Add view for aliases 2020-02-28 13:37:31 +01:00
Pierre-antoine Comby
f1cedc902e Merge branch 'fix_profile' into 'master'
fix #27

Closes #27

See merge request bde/nk20!30
2020-02-27 21:00:55 +01:00
Pierre-antoine Comby
0ea0d77707 fix #27 2020-02-27 20:56:06 +01:00
Pierre-antoine Comby
c372b6587e Merge branch 'no_money_created' into 'master'
Fix #25

Closes #25

See merge request bde/nk20!27
2020-02-27 19:52:30 +01:00
Yohann D'ANELLO
ea9cda0d41 Update translations 2020-02-27 17:49:57 +01:00
Yohann D'ANELLO
3764bc44ff Fix money creation, closes #25 2020-02-27 17:22:59 +01:00
Pierre-antoine Comby
94c0971abf Merge branch '26-menu-principal-ne-s-ouvre-pas-sur-telephone' into 'master'
Resolve "Menu principal ne s'ouvre pas sur téléphone"

Closes #26

See merge request bde/nk20!26
2020-02-27 12:06:16 +01:00
Pierre-antoine Comby
a348178d13 Fix id name 2020-02-27 12:00:02 +01:00
Pierre-antoine Comby
92d12e6d59 don't use STATICFILES_DIRS 2020-02-26 19:32:12 +01:00
Pierre-antoine Comby
c93bd3c458 Merge branch 'form_improve' into 'master'
Form improve

Closes #28

See merge request bde/nk20!25
2020-02-26 13:23:54 +01:00
Pierre-antoine Comby
707770a5b4 fix #28 2020-02-25 22:55:27 +01:00
Pierre-antoine Comby
eb6f142bf8 autofocus of signup form on first field 2020-02-25 22:26:43 +01:00
Pierre-antoine Comby
70c09da9f8 add static files 2020-02-25 22:15:46 +01:00
Pierre-antoine Comby
2de5a8030e set STATIC_ROOT 2020-02-25 22:14:56 +01:00
Pierre-antoine Comby
25fc35c857 Merge branch 'import_nk15' into 'master'
Import nk15

See merge request bde/nk20!23
2020-02-25 20:31:41 +01:00
Pierre-antoine Comby
0cd0b11fa5 remove name Field of TemplateTransaction
Redundant with `reason` from Transaction
2020-02-25 14:15:59 +01:00
Pierre-antoine Comby
33eba8a403 add last_negative field to note 2020-02-25 14:15:36 +01:00
Michaël Paulon
414ef0fb38 Correction typos + ajout d'acl + passage à python3-venv 2020-02-25 10:50:22 +01:00
Pierre-antoine Comby
4e5e80978b Merge branch 'import_nk15' into 'master'
Import nk15: rm import_nk15

See merge request bde/nk20!22
2020-02-24 18:48:17 +01:00
Pierre-antoine Comby
5421943fba Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-24 18:44:10 +01:00
Benjamin Graillot
f25bfc8706 Merge branch 'fix_form' into 'master'
[note] no transaction_type

See merge request bde/nk20!21
2020-02-24 18:38:06 +01:00
Benjamin Graillot
640e48b5df [note] no transaction_type 2020-02-24 18:33:51 +01:00
Pierre-antoine Comby
9039c6fba6 Merge branch 'import_nk15' into 'master'
Import nk15

See merge request bde/nk20!19
2020-02-24 18:24:22 +01:00
Pierre-antoine Comby
6ad7974612 import script is move to new repository 2020-02-24 14:17:48 +01:00
Pierre-antoine Comby
277f4847d9 Merge branch 'polymorphic_transaction' into 'import_nk15'
Polymorphic transaction

See merge request bde/nk20!20
2020-02-24 10:36:04 +01:00
Benjamin Graillot
c2fbb1bcdf Polymorphic transaction 2020-02-24 10:36:04 +01:00
Pierre-antoine Comby
9207c5cdec add aliases import 2020-02-23 21:11:42 +01:00
Pierre-antoine Comby
e850c5755b clean code, dont activate user 2020-02-23 21:10:48 +01:00
Pierre-antoine Comby
f5a80dd0a5 fix typo 2020-02-23 21:05:51 +01:00
Pierre-antoine Comby
4de817bd75 Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 2020-02-23 18:56:58 +01:00
Pierre-antoine Comby
7230f9c535 transaction_type -> category 2020-02-23 18:56:03 +01:00
Pierre-antoine Comby
b18e5b03a4 add boutons import 2020-02-23 18:45:21 +01:00
Benjamin Graillot
40a7d3b295 [note] TransactionCategory --> TemplateCategory 2020-02-23 17:27:55 +01:00
Pierre-antoine Comby
126686ab03 add a TransactionType model 2020-02-23 16:50:14 +01:00