1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-02-06 07:13:00 +00:00

Commit Graph

  • 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
  • 432f14d9d1 Product's amounts can be negative, in case of discounts (treasurers are free to generate what invoice they want) Yohann D'ANELLO 2020-03-24 22:01:02 +01:00
  • 8ab142c122 no need to be static after all Pierre-antoine Comby 2020-03-24 20:25:08 +01:00
  • a33d373f6e Comment code Yohann D'ANELLO 2020-03-24 20:22:15 +01:00
  • d4b8d35206 check permission with PermissionBackend. Pierre-antoine Comby 2020-03-24 20:16:56 +01:00
  • 093e585b79 We don't need to create proxies for special transactions that don't require a remittance Yohann D'ANELLO 2020-03-24 17:14:29 +01:00
  • 4cf1047faa Manage remittance types Yohann D'ANELLO 2020-03-24 17:06:50 +01:00
  • 1b03eac95b Last and first name didn't auto-complete because of a bug Yohann D'ANELLO 2020-03-24 01:34:47 +01:00
  • a52741b87f Add tabs (can be improved) Yohann D'ANELLO 2020-03-24 01:12:22 +01:00
  • d25d342d28 Update translations Yohann D'ANELLO 2020-03-24 01:04:01 +01:00
  • 5682c5489e Close remittances Yohann D'ANELLO 2020-03-24 00:50:55 +01:00
  • 33139bdbde Dynamic search of buttons Pierre-antoine Comby 2020-03-24 00:07:25 +01:00
  • 414722df18 Link transactions and remittances Yohann D'ANELLO 2020-03-23 23:42:37 +01:00
  • 95888ea316 Add some tables for special transactions Yohann D'ANELLO 2020-03-23 22:43:16 +01:00
  • 2defb04d52 Remove my own VPS DNS Yohann D'ANELLO 2020-03-23 22:42:56 +01:00
  • d6e00f7bba Fix SpecialTransaction proxies Yohann D'ANELLO 2020-03-23 22:13:16 +01:00
  • cf45b08c5b Automatically link SpecialTransactions and their proxies Yohann D'ANELLO 2020-03-23 21:30:57 +01:00
  • 884a7d0f08 Use a proxy for special transactions in treasury app for modularity (not a clean way, but without any other solution...) Yohann D'ANELLO 2020-03-23 21:15:59 +01:00
  • 7cd8a37aec non dynamic search for button Pierre-antoine Comby 2020-03-23 20:21:25 +01:00
  • 1ce7dc0118 reorganize tabs of nav bar Pierre-antoine Comby 2020-03-23 15:53:10 +01:00
  • 4e17b50e35 Merge branch 'master' into manage_button Pierre-antoine Comby 2020-03-23 15:40:01 +01:00
  • 41a0529d0c fixin the merge... Pierre-antoine Comby 2020-03-23 15:35:24 +01:00
  • bbda99a3ac Merge branch 'master' into manage_button Pierre-antoine Comby 2020-03-23 15:31:39 +01:00
  • 3cdb3f6d38 Refactor and comment noteView Pierre-antoine Comby 2020-03-23 15:28:09 +01:00
  • a4cb19e5b1 [member] Added parent_club field to Club Benjamin Graillot 2020-03-23 09:07:39 +01:00
  • 05d8b3bc69 Merge branch 'tranfer_front' into 'master' Pierre-antoine Comby 2020-03-22 22:39:50 +01:00
  • 610a4f0b3f show Note info always on left Pierre-antoine Comby 2020-03-22 22:35:07 +01:00
  • 4533d928da Merge branch 'fix_login' into 'master' Pierre-antoine Comby 2020-03-22 22:27:59 +01:00
  • da63bd75f1 this is not the place for cas config Pierre-antoine Comby 2020-03-22 22:22:51 +01:00
  • c295e5cbc7 fix indentation Pierre-antoine Comby 2020-03-22 22:22:37 +01:00
  • c3bea59f2f update script projects Pierre-antoine Comby 2020-03-22 22:09:45 +01:00
  • b9fac82d89 Fixtures are more natural Yohann D'ANELLO 2020-03-22 14:54:05 +01:00
  • c200ae8c3c ask for cas only if available. Pierre-antoine Comby 2020-03-22 22:01:33 +01:00
  • 5fd472d408 Create, view and update remittances Yohann D'ANELLO 2020-03-22 18:27:22 +01:00
  • 3551568de5 Add remittance model Yohann D'ANELLO 2020-03-22 17:29:31 +01:00