klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
834 Commits 20 Branches 0 Tags 110 MiB
Commit Graph

834 Commits

Author SHA1 Message Date
Skia 778b7b22f2 Add Eboutic user guides and reference examples 2017-05-02 18:23:46 +02:00
Skia a12b772587 Add some Eboutic tests 2017-05-01 19:39:28 +02:00
Skia c7f48bd5f7 Fix counter view with no stock 2017-05-01 19:39:28 +02:00
Skia 58fdb36911 Merge branch 'Elections' into 'master' 
Some tests for election

See merge request !47
 2017-05-01 15:58:49 +02:00
Skia 8b1a19e2ff Delete django.mo file that reappeared with the stock app 2017-05-01 15:10:18 +02:00
Antoine Bartuccio 0b81d6a4c6 Merge branch 'weekmail' into 'master' 
New css for weekmail

See merge request !68
 2017-05-01 13:17:58 +02:00
Pierre Brunet d7305488b6 Add new banner 2017-04-28 13:59:10 +02:00
Pierre Brunet 7815796d8b New css for weekmail 2017-04-27 15:31:18 +02:00
Skia c0531feb27 Merge branch 'stock' into 'master' 
Stock

See merge request !65
 2017-04-25 16:17:24 +02:00
Skia a99cb3e0db Add header to stock files 2017-04-25 16:17:04 +02:00
Antoine Bartuccio f2aadae8e8 Fix errors on election tests 2017-04-25 15:30:57 +02:00
Antoine Bartuccio b5363c2987 Firsts tests for elections 2017-04-25 15:30:57 +02:00
Skia e26ad85729 Reset stock migrations 2017-04-25 09:49:05 +02:00
Skia 116aa6b8b5 Update stock URLs 2017-04-25 09:45:13 +02:00
Skia 423313f008 Update stock translations 2017-04-25 09:41:05 +02:00
Skia df20bf6dde Reindent stock app 2017-04-25 08:57:07 +02:00
Skia 20deda8a8e Merge branch 'master' into stock 2017-04-24 18:07:25 +02:00
Skia 83deae5964 Apply GPLv3 to Sith, and add header to every concerned file 2017-04-24 17:51:12 +02:00
Skia 8c82c27483 Add helpers in CONTRIBUTING 2017-04-24 17:35:55 +02:00
Skia 16b6b137d7 Merge branch 'krophil' into 'master' 
Proposal for summary sending confirmation

See merge request !66
 2017-04-19 11:06:19 +02:00
Pierre Brunet 553b33c313 Proposal for summary sending confirmation 2017-04-19 11:01:56 +02:00
Skia 6a815e5a21 Small news improvement and bug fixes 2017-04-12 21:08:51 +02:00
Skia 44dacce9f2 Add forum signature 2017-04-12 19:38:54 +02:00
Skia 3aa5070a38 Add preview button in the Forum 2017-04-12 19:26:27 +02:00
Skia 830e94d73c Show that a message exists even if we can't see it 2017-04-10 23:27:34 +02:00
Skia 24c02f4638 Fix last message when the real last is deleted 2017-04-10 16:18:13 +02:00
Skia 9e61b11827 Mark all messages as read even if user can't see them 2017-04-10 15:33:49 +02:00
Skia cbfaf13536 Merge branch 'counter' into 'master' 
Add CB sums in invoice calls

See merge request !64
 2017-04-05 15:11:46 +02:00
Antoine Bartuccio edc438bc0e More readability for sum 2017-04-05 15:08:11 +02:00
Antoine Bartuccio 6ca183ad55 Better sum writing 2017-04-05 14:23:51 +02:00
Antoine Bartuccio 53a2a160be Add CB refills sum 2017-04-05 13:48:43 +02:00
Skia ec8ee15d0e Merge branch 'bugfix' into 'master' 
Serious counter fix

See merge request !62
 2017-04-04 15:48:59 +02:00
Antoine Bartuccio 34f3fadd3d Rename counter mixin 2017-04-04 15:45:02 +02:00
Antoine Bartuccio d4815df55f Better right counter management 2017-04-03 15:21:07 +02:00
Antoine Bartuccio 824411b13d Rights fix for counters 2017-04-03 13:50:28 +02:00
Antoine Bartuccio 1430479a1d Some rights fix 2017-04-03 11:57:28 +02:00
Antoine Bartuccio 5d89786c8f Serious counter fix 2017-04-03 10:46:53 +02:00
Skia a38d711c62 Merge branch 'bugfix' into 'master' 
Hide start_date for non root user from clubs

See merge request !61
 2017-04-03 09:47:48 +02:00
Antoine Bartuccio fb09719317 Hide start_date for non root user from clubs 2017-04-03 09:41:35 +02:00
Skia 41c9f6381a Merge branch 'bugfix' into 'master' 
Fix continuous tests

See merge request !60
 2017-03-31 11:35:12 +02:00
Skia 231922cbaa Merge branch 'sas' into 'master' 
Fixed some issues with filepaths and see the future with some preload

See merge request !59
 2017-03-31 11:34:10 +02:00
Antoine Bartuccio 9f2566a244 Fix continuous integration 2017-03-30 22:18:03 +02:00
Antoine Bartuccio 60e2e0d4f9 Better to use os.path.join for paths 2017-03-30 19:13:47 +02:00
Antoine Bartuccio 1f844da005 Preload on sas 2017-03-28 18:46:10 +02:00
Skia 33e4cd6ca4 Merge branch 'bugfix' into 'master' 
Better protection for stats

See merge request !58
 2017-03-28 15:58:30 +02:00
Antoine Bartuccio 8787e5e708 Better protection for stats 2017-03-28 15:00:09 +02:00
Skia a078bae260 Merge branch 'bugfix' into 'master' 
Fix broken accounting + security fixs

See merge request !57
 2017-03-28 08:11:02 +02:00
Antoine Bartuccio 63506b1506 Protect stats from other users 2017-03-28 01:03:31 +02:00
Antoine Bartuccio dfd465c7f9 Fix bug where customer can't buy an item when they have the just amount 2017-03-28 00:55:25 +02:00
Antoine Bartuccio 0d918d80d3 Avoid negative value in refilings 2017-03-28 00:34:58 +02:00