klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-23 22:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,302 Commits 23 Branches 0 Tags 106 MiB
d295cc5223
Commit Graph

2302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skia
d511bdef03 Merge branch 'consignes' into 'master' 
Wtf forgot this little guy

See merge request !95
 2017-08-17 11:51:43 +02:00
klmp200
6cfdcb093f Wtf forgot this little guy 2017-08-17 00:10:12 +02:00
Skia
83b00450eb com: improve news admin view 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-16 15:37:35 +02:00
Sli
d864c00472 Merge branch 'matmatronch' into 'master' 
Translations fix for matmatronch

See merge request !94
 2017-08-15 19:11:12 +02:00
klmp200
f49f889d5b Translations fix 2017-08-15 18:57:50 +02:00
Skia
b5599db9bf Merge branch 'matmatronch' into 'master' 
Nouveau matmatronch

See merge request !92
 2017-08-15 18:13:11 +02:00
klmp200
0f408d9d89 Translations 2017-08-15 18:08:32 +02:00
klmp200
a9e23920ee Matmat renames 2017-08-15 18:05:07 +02:00
klmp200
dc571836ae Fixed issues with department and sex form 2017-08-15 18:05:07 +02:00
klmp200
86d62f12e7 Fully functionnal Matmatronch 2017-08-15 18:05:07 +02:00
klmp200
349475cd37 Functionnal search engine 2017-08-15 18:05:07 +02:00
klmp200
39616874a8 Fix broken pagination by remembering last search 2017-08-15 18:05:07 +02:00
klmp200
9ff8f02a45 Form remember last entered values 2017-08-15 18:05:07 +02:00
klmp200
b7c382a1a8 Basic search structure 2017-08-15 18:05:07 +02:00
Skia
0ffd7485e3 Merge branch 'consignes' into 'master' 
Add limit for ecocup recording

See merge request !90
 2017-08-15 18:03:51 +02:00
klmp200
3e950e1dd1 Migration fix 2017-08-15 17:37:25 +02:00
klmp200
de4521c192 Ecocup limit comments 2017-08-15 14:03:56 +02:00
klmp200
748e3ae326 Refactor and migration corrections 2017-08-15 13:57:49 +02:00
klmp200
240b68f98d Allow negative amount for customer 2017-08-15 13:57:49 +02:00
klmp200
d60e14a303 Migration from old database 2017-08-15 13:57:49 +02:00
klmp200
7588cc8f73 Hardcoding ecocup values 2017-08-15 13:57:49 +02:00
klmp200
40927fa13d Add limit for ecocup recording 2017-08-15 13:57:49 +02:00
Skia
2058d58db6 Merge branch 'bottomLinks' into 'master' 
Bottom links migrations to internal wiki

See merge request !93
 2017-08-15 12:00:19 +02:00
klmp200
22407e2f85 Bottom links migrations to internal wiki 2017-08-15 03:30:39 +02:00
Skia
6f79c6c590 core: fix paragraph annoying scroll bar 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-09 22:02:41 +02:00
Skia
d3796479ee core: put the AE logo in the CSS 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-09 16:40:03 +02:00
Skia
61d2765510 core: refactor user picture page algorithm 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-02 20:12:41 +02:00
Skia
3eea8ed4e3 trombi: make the export page 
Signed-off-by: Skia <skia@libskia.so>
 2017-08-01 13:54:35 +02:00
Skia
8bf72daa31 trombi: prevent double comment using "Precedent" browser button 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-30 11:52:10 +02:00
Skia
e4e4eae11b Merge branch 'subscriptions' into 'master' 
Some selected club members can now make people subscribe and fix major security …

Le bdf m'as demandé si c'était possible pour eux de faire des cotisations pour les nouveaux
Je retire WIP quand j'ai la confirmation du bureau que je peux faire ça
Par contre il j'y ai patché une grosse faille de sécurité : se mettre curieux à l'AE suffit à avoir tous les droits de board_member

See merge request !91
 2017-07-26 20:48:01 +02:00
klmp200
c56094eaaf Some selected club members can now make people subscribe and fix major security hole in board_member verification 2017-07-26 20:31:29 +02:00
Skia
b99bbc385a css: fix overflow problem 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-26 18:41:21 +02:00
Skia
e085556def sas: allow ancient subscriber to add people on pictures 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-26 16:55:00 +02:00
Skia
8501df0bef trombi: improve templates 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-26 16:53:40 +02:00
Skia
e80f5b6f0f Merge branch 'krophil' into 'master' 
Add a nice favicon

See merge request !88
 2017-07-06 14:14:09 +02:00
Krophil
2ae4e36eea Add a nice favicon 2017-07-06 14:04:24 +02:00
Skia
8a95f71596 trombi: add missing quick notif 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-05 21:54:32 +02:00
Skia
de96c07ba8 trombi: allow admins to manually add users 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-05 21:41:33 +02:00
Skia
a108291422 trombi: update people ordering 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-05 21:41:33 +02:00
Skia
282d9cd180 trombi: add TrombiUser to admin 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-05 21:41:33 +02:00
Skia
15a9eff599 forum: fix time localization 
Signed-off-by: Skia <skia@libskia.so>
 2017-07-05 21:41:33 +02:00
Skia
3c22db5bd2 Merge branch 'bugfix' into 'master' 
Small fix on accounting permissions

See merge request !87
 2017-06-26 11:23:07 +02:00
Krophil
f8e0147bf5 Small fix on accounting permissions 2017-06-26 11:17:30 +02:00
Skia
71f9e359c0 Merge branch 'forum' into 'master' 
Remove ambiguity for topic creation in a category

See merge request !85
 2017-06-14 08:35:17 +02:00
Krophil
7515e826f8 Remove ambiguity 2017-06-14 00:47:16 +02:00
Skia
58dc179163 Merge branch 'bugfix' into 'master' 
Fix import in trombi views

See merge request !84
 2017-06-13 11:57:04 +02:00
Krophil
e08a8c4927 Fix import in trombi views 2017-06-13 11:45:17 +02:00
Skia
fbcf525378 Merge branch 'pep8' into 'master' 
Pep8

See merge request !81
 2017-06-13 11:39:38 +02:00
Skia
753fe0d176 Merge branch 'bugfix' into 'master' 
Fix trombi creation

See merge request !83
 2017-06-13 11:39:17 +02:00
Krophil
890943ea48 Fix trombi creation 2017-06-13 10:55:12 +02:00