1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-02-21 23:51:18 +00:00

Commit Graph

  • 8cbf56b5a6 Merge branch 'requirements' into 'master' Benjamin Graillot 2020-03-08 22:42:22 +01:00
  • c7ba0e470e Split requirements into files Benjamin Graillot 2020-03-08 22:42:22 +01:00
  • 46a65a8f16 Merge branch 'explicit_is_better_than_implicit' into 'master' Maxime Bombar 2020-03-08 00:30:11 +01:00
  • aaa958d146 Import used modules ... Maxime Bombar 2020-03-07 18:24:33 -05:00
  • 6aab22c0ea Merge branch 'get_rid_of_PAC_2' into 'master' Maxime Bombar 2020-03-08 00:04:42 +01:00
  • f17104770b Delete comby.xyz from ALLOWED_HOSTS Maxime Bombar 2020-03-07 23:55:35 +01:00
  • 44020398e9 Merge branch 'remove-psycopg2' into 'master' Benjamin Graillot 2020-03-07 23:42:49 +01:00
  • 931e41804d Remove psycopg2 from requirements Benjamin Graillot 2020-03-07 23:39:22 +01:00
  • 7f91f27753 Merge branch 'fix-ci' into 'master' ynerant 2020-03-07 22:37:37 +01:00
  • d0206fb790 Make erdnaxe be happy Yohann D'ANELLO 2020-03-07 22:28:59 +01:00
  • 9f41f7c9a5 New typo in README.md Maxime Bombar 2020-03-07 22:20:42 +01:00
  • d0667ad7cb Typo in README.md Maxime Bombar 2020-03-07 21:29:45 +01:00
  • 3eb0c185f2 Merge branch 'fix-fixtures-polymorphic-types' into 'master' ynerant 2020-03-07 18:59:58 +01:00
  • 21fd121ba7 Add signup link, customize templates Yohann D'ANELLO 2020-03-07 18:55:18 +01:00
  • b21c63105e Merge branch 'fix_signin' into 'master' ynerant 2020-03-07 18:27:25 +01:00
  • 099c761321 Merge branch 'master' into 'fix_signin' ynerant 2020-03-07 18:21:56 +01:00
  • 8f1caddbe0 Add signup link, customize templates Yohann D'ANELLO 2020-03-07 18:18:35 +01:00
  • b47a45e040 Merge branch 'fix_picture_upload' into 'master' Pierre-antoine Comby 2020-03-07 18:03:05 +01:00
  • 663ee072d4 always save to png Pierre-antoine Comby 2020-03-07 17:58:41 +01:00
  • f6b58e8c86 Merge branch 'fix_static' into 'master' Pierre-antoine Comby 2020-03-07 17:52:11 +01:00
  • 762585134c fix static files config for development enviromnent Pierre-antoine Comby 2020-03-07 17:47:34 +01:00
  • 448929b900 Merge branch 'get_rid_of_PAC' into 'master' Pierre-antoine Comby 2020-03-07 17:37:14 +01:00
  • 70c9c3254f Merge branch 'fix_signin' into 'master' Pierre-antoine Comby 2020-03-07 17:37:04 +01:00
  • 55a7754277 use localhost in dev Pierre-antoine Comby 2020-03-07 17:27:28 +01:00
  • 09137dd9d7 Fix anonymous users issue Yohann D'ANELLO 2020-03-07 16:45:45 +01:00
  • b019c546cd Use example.org in nginx_note.conf_example Maxime Bombar 2020-03-07 15:56:00 +01:00
  • 30ce17b644 Update a lot of things Yohann D'ANELLO 2020-03-07 13:12:17 +01:00
  • a014a97e14 Merge remote-tracking branch 'origin/rights' into rights Yohann D'ANELLO 2020-03-07 11:21:08 +01:00
  • 9d61e217e9 [permission] Only split permission up to 3 Benjamin Graillot 2020-03-07 11:21:19 +01:00
  • 7e29f1d482 Merge remote-tracking branch 'origin/rights' into rights Yohann D'ANELLO 2020-03-07 10:48:42 +01:00
  • 5df1f42f43 [permission] Syntax error Benjamin Graillot 2020-03-07 10:48:38 +01:00
  • 0884270474 Merge branch 'master' into rights Yohann D'ANELLO 2020-03-07 10:42:51 +01:00
  • 5b995f16f1 Merge branch 'logging' into 'master' ynerant 2020-03-07 10:36:28 +01:00
  • 6f7374710b Merge branch 'master' into 'logging' ynerant 2020-03-07 10:32:17 +01:00
  • 8a9ad0a6e5 [permission] Handle add rights Benjamin Graillot 2020-03-07 09:30:22 +01:00
  • 7303fb9943 Merge branch 'alias' into 'master' Pierre-antoine Comby 2020-03-06 21:53:52 +01:00
  • ab8888a085 Merge branch 'master' into 'alias' Pierre-antoine Comby 2020-03-06 21:49:46 +01:00
  • 0193a4d898 Merge branch 'cas' into 'master' ynerant 2020-03-06 21:38:57 +01:00
  • deb19e45c1 center form Pierre-antoine Comby 2020-03-06 20:16:44 +01:00
  • 38feb693f3 crop,resized, and save picture at the right place Pierre-antoine Comby 2020-03-06 20:07:15 +01:00
  • 08b97e722b add support for cropping image. WIP. Pierre-antoine Comby 2020-03-05 23:32:01 +01:00
  • 13055c393a Merge branch 'master' into alias Pierre-antoine Comby 2020-03-05 21:43:06 +01:00
  • 3c22d3b8a5 Merge branch 'static_files' into 'master' Pierre-antoine Comby 2020-03-05 21:41:44 +01:00
  • 2e8505e9b4 ménage dans les imports Pierre-antoine Comby 2020-03-04 16:34:52 +01:00
  • fd74080ce3 profile picture update view is working Pierre-antoine Comby 2020-03-04 16:34:12 +01:00
  • c4198a64af add button for profile pic view Pierre-antoine Comby 2020-03-03 14:45:50 +01:00
  • 14ccc8da75 Add ImageForm Pierre-antoine Comby 2020-03-03 14:26:31 +01:00
  • f992c117f4 rename second_form to profile_form Pierre-antoine Comby 2020-03-03 14:25:16 +01:00
  • 211859e940 add default profile pic Pierre-antoine Comby 2020-03-03 14:24:07 +01:00
  • 901454f338 rename template for consistency Pierre-antoine Comby 2020-03-03 11:05:02 +01:00
  • d5f718fbba start activity view and urls Pierre-antoine Comby 2020-03-01 17:16:38 +01:00
  • b3d45ba64b alias page inherit from profile template Pierre-antoine Comby 2020-03-01 17:36:49 +01:00
  • b7e68722aa front improvement on alias page Pierre-antoine Comby 2020-03-01 13:42:22 +01:00
  • 35d5bcdf0f Deletion of alias now possible! Pierre-antoine Comby 2020-03-01 00:25:53 +01:00
  • 27391049f2 remove duplicated form Pierre-antoine Comby 2020-02-28 16:12:35 +01:00
  • db95944574 add delete boutons, work with only one alias Pierre-antoine Comby 2020-02-28 15:25:45 +01:00
  • c77bc0c032 add deleteView for aliases Pierre-antoine Comby 2020-02-28 13:52:15 +01:00
  • 9133c84ef2 comment bug Pierre-antoine Comby 2020-02-28 13:49:50 +01:00
  • f77351b444 Add view for aliases Pierre-antoine Comby 2020-02-28 13:37:31 +01:00
  • f1cedc902e Merge branch 'fix_profile' into 'master' Pierre-antoine Comby 2020-02-27 21:00:55 +01:00
  • 0ea0d77707 fix #27 Pierre-antoine Comby 2020-02-27 20:56:06 +01:00
  • c372b6587e Merge branch 'no_money_created' into 'master' Pierre-antoine Comby 2020-02-27 19:52:30 +01:00
  • ea9cda0d41 Update translations Yohann D'ANELLO 2020-02-27 17:49:57 +01:00
  • 3764bc44ff Fix money creation, closes #25 Yohann D'ANELLO 2020-02-27 17:22:59 +01:00
  • b23237f669 Uncomment required line Yohann D'ANELLO 2020-02-27 16:26:07 +01:00
  • 9cd050e2f0 Logging is finally processed at post saved, but old instance is querried Yohann D'ANELLO 2020-02-27 16:25:18 +01:00
  • bcee5f8f2f Don't log when there is no modification, or only when a user is connected Yohann D'ANELLO 2020-02-27 15:53:06 +01:00
  • 125f437345 Profiles are saved after the user Yohann D'ANELLO 2020-02-27 15:41:15 +01:00
  • 3c52c1d002 Users have now automatically an attached profile to a user (fix an old bug) Yohann D'ANELLO 2020-02-27 15:36:12 +01:00
  • d316c3130c Logs are created post save Yohann D'ANELLO 2020-02-27 15:35:38 +01:00
  • aecd3fc86f Update excluded models list Yohann D'ANELLO 2020-02-27 15:30:16 +01:00
  • 12ddfad254 Update JSON Yohann D'ANELLO 2020-02-27 14:59:01 +01:00
  • 2f51057f4c Add IP address to migrations Yohann D'ANELLO 2020-02-27 14:47:34 +01:00
  • 079e423343 Merge branch 'master' into logging Yohann D'ANELLO 2020-02-27 14:36:27 +01:00
  • 5995969a67 Detect migrations Yohann D'ANELLO 2020-02-27 14:35:50 +01:00
  • c22e73a86e Don't create automatically a new user on login Yohann D'ANELLO 2020-02-27 14:11:00 +01:00
  • 202fc655eb Merge remote-tracking branch 'origin/cas' into cas Yohann D'ANELLO 2020-02-27 14:01:20 +01:00
  • 8503bf9d57 Add default initial fixture for CAS server Yohann D'ANELLO 2020-02-27 14:00:20 +01:00
  • 94d327821a Merge remote-tracking branch 'origin/master' into cas Yohann D'ANELLO 2020-02-27 13:59:52 +01:00
  • f319c217b0 Add default initial fixture for CAS server Yohann D'ANELLO 2020-02-27 13:52:39 +01:00
  • 04e40e9a91 Merge branch 'master' into cas Yohann D'ANELLO 2020-02-27 13:39:22 +01:00
  • 1c762e5444 Trying to get IP Yohann D'ANELLO 2020-02-27 13:34:38 +01:00
  • 94c0971abf Merge branch '26-menu-principal-ne-s-ouvre-pas-sur-telephone' into 'master' Pierre-antoine Comby 2020-02-27 12:06:16 +01:00
  • a348178d13 Fix id name Pierre-antoine Comby 2020-02-27 12:00:02 +01:00
  • 10854eb334 Update some excluded models Yohann D'ANELLO 2020-02-26 23:55:40 +01:00
  • 1c0bf21cbe Content type stored in logs instead of model name Yohann D'ANELLO 2020-02-26 23:34:27 +01:00
  • 92d12e6d59 don't use STATICFILES_DIRS Pierre-antoine Comby 2020-02-26 19:32:12 +01:00
  • c93bd3c458 Merge branch 'form_improve' into 'master' Pierre-antoine Comby 2020-02-26 13:23:54 +01:00
  • 707770a5b4 fix #28 Pierre-antoine Comby 2020-02-25 22:55:27 +01:00
  • eb6f142bf8 autofocus of signup form on first field Pierre-antoine Comby 2020-02-25 22:26:43 +01:00
  • 70c09da9f8 add static files Pierre-antoine Comby 2020-02-25 22:15:46 +01:00
  • 2de5a8030e set STATIC_ROOT Pierre-antoine Comby 2020-02-25 22:14:56 +01:00
  • 25fc35c857 Merge branch 'import_nk15' into 'master' Pierre-antoine Comby 2020-02-25 20:31:41 +01:00
  • 0cd0b11fa5 remove name Field of TemplateTransaction Pierre-antoine Comby 2020-02-25 14:15:59 +01:00
  • 33eba8a403 add last_negative field to note Pierre-antoine Comby 2020-02-25 14:15:36 +01:00
  • 414ef0fb38 Correction typos + ajout d'acl + passage à python3-venv Michaël Paulon 2020-02-25 10:50:22 +01:00
  • 4e5e80978b Merge branch 'import_nk15' into 'master' Pierre-antoine Comby 2020-02-24 18:48:17 +01:00
  • 5421943fba Merge branch 'import_nk15' of gitlab.crans.org:bde/nk20 into import_nk15 Pierre-antoine Comby 2020-02-24 18:44:10 +01:00
  • f25bfc8706 Merge branch 'fix_form' into 'master' Benjamin Graillot 2020-02-24 18:38:06 +01:00
  • 640e48b5df [note] no transaction_type Benjamin Graillot 2020-02-24 18:33:51 +01:00