Commit Graph

650 Commits

Author SHA1 Message Date
Pierre Brunet 41b5be1fba Add CR 01.05 2017-01-07 17:39:47 +01:00
Skia d400995e9d Update setup command to ease development 2017-01-07 10:36:54 +01:00
Skia 70aaf0b1c6 Merge branch 'CR' into 'master'
add CR

See merge request !42
2017-01-05 19:55:20 +01:00
Pierre Brunet 83938a69dd add CR 2017-01-05 19:44:11 +01:00
Skia 57bb072008 Merge branch 'Tresorerie' into 'master'
Add benefit on sellings view

See merge request !41
2017-01-05 18:05:32 +01:00
Antoine Bartuccio 2c71c18d1b --amend 2017-01-05 18:02:02 +01:00
Antoine Bartuccio 86e3c09bae Add benefit on sellings view 2017-01-05 15:48:06 +01:00
Skia a90a553939 Some fixes on SAS upload form 2017-01-05 10:05:27 +01:00
Skia 72685618a6 Many right fix on counters 2017-01-04 19:39:37 +01:00
Skia 114272df2f Add simple club stats 2017-01-04 17:38:54 +01:00
Skia c48449cd50 Add barman stats 2017-01-04 17:38:09 +01:00
Skia dcd0c1fe75 Allow more than one bar if someone can connect to the counter 2017-01-04 16:14:17 +01:00
Skia 52a0913993 Tiny fix in the counter 2017-01-03 16:42:45 +01:00
Skia b347b87433 Many typo fixes and some updates in the TW report 2017-01-02 16:46:46 +01:00
Skia 0a9eb2fd33 Fix club tests 2016-12-29 01:30:37 +01:00
Skia fbb41c3cd5 Improve UX for accounting linked operation 2016-12-29 01:08:08 +01:00
Skia 17b4e24aaa Small club update 2016-12-29 00:42:26 +01:00
Antoine Bartuccio 2f2d5292de Some permissions fixs and security for atomic vote 2016-12-26 23:30:13 +01:00
Skia 729659e358 Don't ignore */static 2016-12-26 01:59:54 +01:00
Skia c6422fdd30 Add SYNTAX.md 2016-12-26 01:42:45 +01:00
Skia 1dd28672b0 Add Markdown test to populate 2016-12-26 01:36:07 +01:00
Skia f77856852d Working file:// link 2016-12-26 01:34:44 +01:00
Skia 323b946e1f First dfile:// parsing, not working into links, need to investigate 2016-12-26 01:34:44 +01:00
Skia 15e52d1ae8 Reset election migrations 2016-12-26 00:56:22 +01:00
Skia 78e00c3bd4 Merge branch 'Elections' into 'master'
Election app

See merge request !27
2016-12-26 00:45:40 +01:00
Antoine Bartuccio 3609952db5 Some translation fixs 2016-12-26 00:37:32 +01:00
Skia bf4d0693c6 Reformat templates to fit with the rest of the Sith 2016-12-26 00:10:41 +01:00
Antoine Bartuccio 61e67898e1 Coherent create/edit/delete templates for elections 2016-12-25 23:49:02 +01:00
Antoine Bartuccio cd97901db1 Some date fix 2016-12-25 23:37:42 +01:00
Antoine Bartuccio 772a3b5827 Squashmigrations for elections 2016-12-25 22:09:59 +01:00
Antoine Bartuccio 5449a4fca2 Little permission fix 2016-12-25 22:04:31 +01:00
Antoine Bartuccio e17fd22a37 Fix populate after rebase 2016-12-25 20:24:18 +01:00
Antoine Bartuccio 4d067165aa Election's trad 2016-12-25 20:09:18 +01:00
Antoine Bartuccio c07f49305b Full CRUD for elections 2016-12-25 19:54:10 +01:00
Antoine Bartuccio 4f62863599 Pimp role and list forms and add edit for election 2016-12-25 19:54:10 +01:00
Antoine Bartuccio d7387005c0 Better role creation 2016-12-25 19:54:10 +01:00
Antoine Bartuccio 02913d91e6 Refactors Candidate form 2016-12-25 19:54:10 +01:00
Antoine Bartuccio 9d9c86ea0f Refactored has_voted 2016-12-25 19:54:10 +01:00
Antoine Bartuccio 37decde04d Adds an S in electionS 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet da77c18871 Really display results when election is finished. 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet 64f5fef89f Display results only when the polls close 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet 1c761f9db2 Added results when the user is not voting 2016-12-25 19:54:10 +01:00
Antoine Bartuccio e8d54764bd Add election results 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet baf39d8f3b Hide input if user can not vote 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet 9bb5951dac Removed request.user as user bc it already exists 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet 1a34dcdafe Changed plain form action to reversed URL. 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet fa9e4e5dc6 Tweaked Election view and added request.user as user 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet a9d154506f Added js validation for max_choice 2016-12-25 19:54:10 +01:00
Antoine Bartuccio 33d8c14da5 can_vote in Election 2016-12-25 19:54:10 +01:00
Antoine Bartuccio 2c76784007 Fixed Election.has_voted 2016-12-25 19:54:10 +01:00