ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-13 13:27:29 +02:00
Code Issues Releases Wiki Activity

Commit Graph

  • 72e5df0cf5 Merge branch 'new-note-type' into 'master' ynerant 2020-04-05 02:06:19 +02:00
  • f95290e323 Merge branch 'fix-setup' into 'master' ynerant 2020-04-03 04:06:35 +02:00
  • 04f9ae51ed Fix docker setup, remove select2 files (unused) Yohann D'ANELLO 2020-04-03 04:03:58 +02:00
  • 0cdc8ae004 RolePermissions were missing in the API Yohann D'ANELLO 2020-04-02 16:06:58 +02:00
  • 17ea2246ca Remove useless field in activities Yohann D'ANELLO 2020-04-02 15:43:41 +02:00
  • be42801709 The memoization doesn't work when objects don't have a primary key. Yohann D'ANELLO 2020-04-02 14:50:28 +02:00
  • 8ad464ae0c Fix CI Yohann D'ANELLO 2020-04-02 00:42:00 +02:00
  • 5c9c0bbc2a Optimize permissions, use memoization Yohann D'ANELLO 2020-04-02 00:30:22 +02:00
  • 3f5faa0b05 Add tab for user list Yohann D'ANELLO 2020-04-01 20:56:24 +02:00
  • 5eb08fd822 Dynamic user research Yohann D'ANELLO 2020-04-01 20:14:16 +02:00
  • 2853fe252b Renew memberships Yohann D'ANELLO 2020-04-01 18:47:56 +02:00
  • 356c8588e7 Users that are not member of the club Kfet can't have a negative balance Yohann D'ANELLO 2020-04-01 17:00:06 +02:00
  • 92ab5ee3af Fix memberships with clubs without memberships (we always need treasurers...) Yohann D'ANELLO 2020-04-01 04:34:42 +02:00
  • 535c493bc7 Fix some issues Yohann D'ANELLO 2020-04-01 04:20:47 +02:00
  • 0df0f3f66b Membership fees for paid and unpaid students, closes #43 Yohann D'ANELLO 2020-04-01 04:07:55 +02:00
  • d5b010980b Full membership support Yohann D'ANELLO 2020-04-01 03:42:19 +02:00
  • bf9789bd9e Restructurate memberships, closes #16 Yohann D'ANELLO 2020-03-31 23:54:14 +02:00
  • e98693b214 Memberships are optional for clubs Yohann D'ANELLO 2020-03-31 16:22:11 +02:00
  • dd3b7bd7e5 Remove note activities Yohann D'ANELLO 2020-03-31 14:57:44 +02:00
  • 12945945bc Update translations Yohann D'ANELLO 2020-03-31 14:10:30 +02:00
  • 1aae18e6a6 Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) Yohann D'ANELLO 2020-03-31 04:16:30 +02:00
  • c384ee02eb Implement a new type of note (see #45) Yohann D'ANELLO 2020-03-31 01:03:30 +02:00
  • c8854cf45d Merge branch 'activity' into 'master' ynerant 2020-03-30 22:43:12 +02:00
  • b0b3aa35a9 Guests can't be invited if the activity is not validated Yohann D'ANELLO 2020-03-30 17:35:47 +02:00
  • fcb4da2db3 Guests can't be invited since the activity is started Yohann D'ANELLO 2020-03-30 17:27:02 +02:00
  • fb5796d35e Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. Yohann D'ANELLO 2020-03-30 00:42:32 +02:00
  • 935ebf291a use note id , not alias id Pierre-antoine Comby 2020-03-28 21:31:22 +01:00
  • aaf49c9b99 balance on a second line Pierre-antoine Comby 2020-03-28 21:30:55 +01:00
  • 691a03ecad Add some initial permissions for activities Yohann D'ANELLO 2020-03-28 19:05:21 +01:00
  • 6ea59a4603 Merge branch 'master' into tranfer_front Pierre-antoine Comby 2020-03-28 17:47:20 +01:00
  • 948263a867 color codes from note balances Pierre-antoine Comby 2020-03-28 17:44:22 +01:00
  • f3656f367c default picture is 200x200 Pierre-antoine Comby 2020-03-28 17:44:03 +01:00
  • d8949a993a get alias and note infos together Pierre-antoine Comby 2020-03-28 17:42:29 +01:00
  • c8b72cf1ff Guests can pay with CB or coins, lot of other improvements Yohann D'ANELLO 2020-03-28 16:52:58 +01:00
  • 81cfaf12fa People can join activities Yohann D'ANELLO 2020-03-28 13:38:31 +01:00
  • a805e41367 Fix CI Yohann D'ANELLO 2020-03-28 02:09:10 +01:00
  • 08ed694438 Update translations Yohann D'ANELLO 2020-03-28 02:08:29 +01:00
  • a8422411bc Entry page (we can search people) Yohann D'ANELLO 2020-03-28 01:45:13 +01:00
  • 8c1d902c30 Open and validate activities Yohann D'ANELLO 2020-03-27 22:48:20 +01:00
  • d6e202a26f Display guests list Yohann D'ANELLO 2020-03-27 21:18:27 +01:00
  • 0d43d74c60 Display activity details Yohann D'ANELLO 2020-03-27 19:47:43 +01:00
  • 34949f0859 Fix activity in Guest model Yohann D'ANELLO 2020-03-27 19:16:38 +01:00
  • ceb5690838 Invite people Yohann D'ANELLO 2020-03-27 18:02:22 +01:00
  • 4f4bbf6d0e Fix server starting Yohann D'ANELLO 2020-03-27 16:32:46 +01:00
  • f09364d3d8 Custom auto-complete fields, remove DAL requirement Yohann D'ANELLO 2020-03-27 16:19:33 +01:00
  • 823bcfe781 Fix CI Yohann D'ANELLO 2020-03-27 14:19:55 +01:00
  • dadd840645 Merge remote-tracking branch 'origin/master' into activity Yohann D'ANELLO 2020-03-27 14:16:10 +01:00
  • 8b4c39269c Merge branch 'front_club' into 'master' Pierre-antoine Comby 2020-03-27 14:11:28 +01:00
  • 09fb0e1470 Merge branch 'master' into front_club Pierre-antoine Comby 2020-03-27 14:07:22 +01:00
  • ee3d441a56 add parent club link Pierre-antoine Comby 2020-03-27 14:04:30 +01:00
  • ed746f39b2 Merge branch 'devalidation_reason' into 'master' Pierre-antoine Comby 2020-03-27 13:56:39 +01:00
  • bef4958759 Merge branch 'master' into 'devalidation_reason' ynerant 2020-03-27 13:52:48 +01:00
  • f81e2b5b5b Use custom inputs for date picker and amounts Yohann D'ANELLO 2020-03-27 13:50:02 +01:00
  • e27b456aea Merge branch 'parent-club' into 'master' Pierre-antoine Comby 2020-03-27 13:29:43 +01:00
  • a3a8fd601c revert to ReadProtectedViewset Pierre-antoine Comby 2020-03-27 13:26:47 +01:00
  • 45b14ed1bd Create activities Yohann D'ANELLO 2020-03-27 01:31:54 +01:00
  • 213e5a8369 Fix CI Yohann D'ANELLO 2020-03-27 00:40:35 +01:00
  • 841d56d5b3 Merge remote-tracking branch 'origin/master' into activity Yohann D'ANELLO 2020-03-27 00:32:22 +01:00
  • c50e17c555 error handling up to client Pierre-antoine Comby 2020-03-26 23:05:37 +01:00
  • f7a66920e0 move common script to alias.js Pierre-antoine Comby 2020-03-26 23:05:08 +01:00
  • 49dd88dbb7 add errMsg function Pierre-antoine Comby 2020-03-26 23:04:51 +01:00
  • 61b6aceb36 crappy name -> crappy behavior Pierre-antoine Comby 2020-03-26 23:04:14 +01:00
  • a00e43bc26 Fix alias deletion Yohann D'ANELLO 2020-03-26 21:04:32 +01:00
  • e125601f52 almost working javascript Pierre-antoine Comby 2020-03-26 17:48:17 +01:00
  • 92ca835d0e switch to template column Pierre-antoine Comby 2020-03-26 17:47:17 +01:00
  • 271fab3b75 use small btn in table Pierre-antoine Comby 2020-03-26 17:46:38 +01:00
  • 04b39f09af remove forms Pierre-antoine Comby 2020-03-26 17:45:49 +01:00
  • 757dfdd914 serializer config Pierre-antoine Comby 2020-03-26 17:45:24 +01:00
  • d9cdb01350 remove alias handling backend, gonna use DRF Pierre-antoine Comby 2020-03-26 17:44:01 +01:00
  • 7568abb681 some minor cleaning Pierre-antoine Comby 2020-03-26 17:41:11 +01:00
  • e8cbd46374 Merge branch 'remove-noteuser-fixture' into 'master' ynerant 2020-03-26 16:04:09 +01:00
  • 01410d2b23 Store used aliases in transactions Yohann D'ANELLO 2020-03-26 15:59:51 +01:00
  • 41aa6964d2 Store used aliases in transactions Yohann D'ANELLO 2020-03-26 14:45:48 +01:00
  • 1b26df6481 move template_category to own fixture Pierre-antoine Comby 2020-03-26 14:08:18 +01:00
  • 59cd166b79 [member] tabs --> spaces Benjamin Graillot 2020-03-25 18:05:46 +01:00
  • 33e3657120 add aliases view to clubs Pierre-antoine Comby 2020-03-25 18:00:40 +01:00
  • c86ddf17ad [member] Check membership of parent club Benjamin Graillot 2020-03-25 17:54:28 +01:00
  • a41e51e23a add member get side information Pierre-antoine Comby 2020-03-25 17:42:54 +01:00
  • 26d70c4ef9 page title and edit buttons Pierre-antoine Comby 2020-03-25 17:25:44 +01:00
  • c41999422f Merge branch 'front_club' into 'master' Pierre-antoine Comby 2020-03-25 17:02:55 +01:00
  • 02ba4b6db6 Merge branch 'tresorerie' into 'master' Pierre-antoine Comby 2020-03-25 16:59:51 +01:00
  • 826573f553 whitespaces compliance Pierre-antoine Comby 2020-03-25 16:58:15 +01:00
  • 2d18cb983f fee in cents for fixture and initial picture Pierre-antoine Comby 2020-03-25 16:12:57 +01:00
  • ff17f1e877 Club view should as good as profile ones Pierre-antoine Comby 2020-03-25 16:11:44 +01:00
  • 5cf75ebf9e When a transaction can't becreated because the user don't have the permission to take too much money, then we create an invalid transaction Yohann D'ANELLO 2020-03-25 15:27:38 +01:00
  • bc3fdbe7a7 Add docstring Yohann D'ANELLO 2020-03-25 14:54:26 +01:00
  • e5ab391236 Better user interface Yohann D'ANELLO 2020-03-25 14:50:21 +01:00
  • 23db42e448 Give a reason when a transaction is invalidated Yohann D'ANELLO 2020-03-25 13:13:01 +01:00
  • 9a7f1bba21 Fix CI (no idea of why this error happened) Yohann D'ANELLO 2020-03-25 00:39:40 +01:00
  • 57a01c48a8 Merge branch 'master' into 'tresorerie' ynerant 2020-03-25 00:30:14 +01:00
  • 075cb1b592 Transaction can't be attached to a closed remittance Yohann D'ANELLO 2020-03-25 00:25:24 +01:00
  • 0ac94547d1 Merge branch 'manage_button' into 'master' Pierre-antoine Comby 2020-03-25 00:17:34 +01:00
  • f85f292d5b linter compliance Pierre-antoine Comby 2020-03-25 00:12:56 +01:00
  • 0411646ae6 make the CI pass and nicer front Pierre-antoine Comby 2020-03-25 00:03:48 +01:00
  • 20ea017e96 row color to show if display Pierre-antoine Comby 2020-03-24 23:32:48 +01:00
  • b3c1032f4f wrap in function for correct behavior Pierre-antoine Comby 2020-03-24 23:27:08 +01:00
  • 9be93db9af les boeufs avant la charrue, a faire sur une autre branche Pierre-antoine Comby 2020-03-24 23:14:13 +01:00
  • 9f53bda1cd clean code Pierre-antoine Comby 2020-03-24 23:02:12 +01:00
  • 41568916b8 error fixes Pierre-antoine Comby 2020-03-24 22:13:15 +01:00
  • ba04a6555f dynamically delete buttons Pierre-antoine Comby 2020-03-24 22:12:44 +01:00