Skia
|
e80f5b6f0f
|
Merge branch 'krophil' into 'master'
Add a nice favicon
See merge request !88
|
2017-07-06 14:14:09 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
890943ea48
|
Fix trombi creation
|
2017-06-13 10:55:12 +02:00 |
|
|
|
9447de4468
|
fix merging
|
2017-06-13 10:49:11 +02:00 |
|
|
|
69c95cfd37
|
Format trombi
|
2017-06-13 10:22:41 +02:00 |
|
|
|
113c9e696b
|
Format subscription
|
2017-06-13 10:07:57 +02:00 |
|
|
|
cd46e099b6
|
Format sith
|
2017-06-13 10:04:13 +02:00 |
|
|
|
e2311dcb71
|
Format sas
|
2017-06-13 10:04:13 +02:00 |
|
|
|
13ec91e7e5
|
Format launderette
|
2017-06-13 10:04:13 +02:00 |
|
|
|
6a43c2cef6
|
Format forum
|
2017-06-13 10:04:13 +02:00 |
|
|
|
b3466237ca
|
Format settings
|
2017-06-13 10:04:13 +02:00 |
|
|
|
4395d62cd8
|
Format eboutic
|
2017-06-13 10:04:13 +02:00 |
|
|
|
d722efc40f
|
Format counter
|
2017-06-13 10:04:13 +02:00 |
|
|
|
e7de8b2aec
|
Format core
|
2017-06-13 10:04:13 +02:00 |
|
|
|
4f4ea5dde9
|
Format com
|
2017-06-13 09:48:24 +02:00 |
|
|
|
73b2c9d4c5
|
Format club
|
2017-06-13 09:48:24 +02:00 |
|
|
|
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 |
|
|
|
43b1d1f3b5
|
Fix operation form
|
2017-06-12 19:29:47 +02:00 |
|
Skia
|
37a5db537b
|
Re-fix AnonymousUser
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-12 14:01:28 +02:00 |
|
Skia
|
b06f270ea5
|
Revert "Fix AnonymousUser"
This reverts commit e7f7c57558.
|
2017-06-12 13:57:08 +02:00 |
|
Skia
|
ecf5465716
|
Merge branch 'Tresorerie'
|
2017-06-12 08:13:05 +02:00 |
|
Skia
|
88d81df23d
|
Fix Trombi edit comment view
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-11 23:16:35 +02:00 |
|
Skia
|
b4be40a3a7
|
Change the Markdown super and sub texts not to break the Ragots
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 21:39:56 +02:00 |
|
Skia
|
58beb551e8
|
Fix unread messages in topic
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 21:05:36 +02:00 |
|
Skia
|
ca047d9655
|
Damn, I broke the tests!
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 20:28:01 +02:00 |
|
Skia
|
a89fb23d33
|
That's just a ridiculous little fix
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 20:03:37 +02:00 |
|
Skia
|
ce46a9d9da
|
Some small clean up and refactoring
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 19:56:47 +02:00 |
|
Skia
|
2925cde8ab
|
Add a MarkdownInput widget, and make use of it
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 19:40:47 +02:00 |
|
Skia
|
4b9fa0cd57
|
Fix some Markdown and add basic textarea helper
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 19:14:58 +02:00 |
|
Skia
|
457fc36e16
|
Fix markdown rendering on some pages, and add a link to the syntax help
Signed-off-by: Skia <skia@libskia.so>
|
2017-06-10 16:54:19 +02:00 |
|
|
|
8ba21b94dc
|
add translations
|
2017-06-09 16:39:38 +02:00 |
|
