klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-05 13:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,882 Commits 18 Branches 0 Tags 103 MiB
55e0eecc0b
Commit Graph

1882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Krophil
9447de4468 fix merging 2017-06-13 10:49:11 +02:00
Krophil
69c95cfd37 Format trombi 2017-06-13 10:22:41 +02:00
Krophil
113c9e696b Format subscription 2017-06-13 10:07:57 +02:00
Krophil
cd46e099b6 Format sith 2017-06-13 10:04:13 +02:00
Krophil
e2311dcb71 Format sas 2017-06-13 10:04:13 +02:00
Krophil
13ec91e7e5 Format launderette 2017-06-13 10:04:13 +02:00
Krophil
6a43c2cef6 Format forum 2017-06-13 10:04:13 +02:00
Krophil
b3466237ca Format settings 2017-06-13 10:04:13 +02:00
Krophil
4395d62cd8 Format eboutic 2017-06-13 10:04:13 +02:00
Krophil
d722efc40f Format counter 2017-06-13 10:04:13 +02:00
Krophil
e7de8b2aec Format core 2017-06-13 10:04:13 +02:00
Krophil
4f4ea5dde9 Format com 2017-06-13 09:48:24 +02:00
Krophil
73b2c9d4c5 Format club 2017-06-13 09:48:24 +02:00
Krophil
544ff630a5 Format accounting 2017-06-13 09:48:24 +02:00
Skia
38026025af trombi: add safeguard on user deletion 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-13 00:35:49 +02:00
Skia
f85ce96225 trombi: Many UI/UX improvements 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-13 00:23:56 +02:00
Skia
f26f2f4229 trombi: add custom club memberships 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 23:52:59 +02:00
Skia
5df9be9188 Move computing of start of semester to core/utils 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 22:53:25 +02:00
Skia
a96efafc8e Merge branch 'counter' into 'master' 
Fix operation form

See merge request !82
 2017-06-12 22:38:21 +02:00
Skia
8ca455a398 Epic fix 
Signed-off-by: Skia <skia@libskia.so>
 2017-06-12 22:35:22 +02:00