Commit Graph

867 Commits

Author SHA1 Message Date
d79416f80a fix date format in Trombi model 2017-05-11 13:25:51 +02:00
Skia
47a96829d0 Reset trombi's migrations 2017-05-10 23:33:24 +02:00
Skia
d913b8b64f Some more pimp in Trombi + translations 2017-05-10 23:30:20 +02:00
Skia
35f983131f Improve Trombi again with pictures, notifs, and style! 2017-05-10 23:05:05 +02:00
Skia
f2b2ff533d Rename Matmat to Trombi 2017-05-10 22:17:05 +02:00
Skia
dec1a2cdd7 Add profile form in matmat 2017-05-10 21:59:22 +02:00
Skia
e00c948da9 Improve Matmat, still needs a profile form 2017-05-10 19:19:33 +02:00
Skia
b3bc33a319 Add first Matmat' app 2017-05-10 19:19:33 +02:00
Skia
5060114305 Add missing forum migration (and tiny translation fix) 2017-05-10 19:18:33 +02:00
Skia
319bb0c2d1 Fix important rights problem in clubs 2017-05-10 19:16:18 +02:00
Skia
bf38de2db8 Merge branch 'tempcss' into 'master'
Few modifications in accordance with com

See merge request !74
2017-05-10 16:19:33 +02:00
05d1f43b55 Few modifications in accordance with com 2017-05-10 15:32:50 +02:00
Skia
a0f47cac80 Merge branch 'tempcss' into 'master'
[style|design].[sass|css]

See merge request !69
2017-05-10 11:20:30 +02:00
e59d769dac Doc for scss 2017-05-10 11:13:49 +02:00
200af57971 Put scss in renderer 2017-05-10 10:49:34 +02:00
f87ec1e395 Better lisibility for scss 2017-05-10 10:49:34 +02:00
d083a67725 Change year of license on some files 2017-05-10 10:49:34 +02:00
acef5be8b3 New lite home made scss processor 2017-05-10 10:49:34 +02:00
630fdf93a4 Refactoring for compilestatic 2017-05-10 10:49:34 +02:00
79c769351d Add simple way to compile scss files 2017-05-10 10:49:34 +02:00
b23d322a29 Instruction for prod with scss 2017-05-10 10:49:34 +02:00
ee7fd1c423 Rename temporary_design 2017-05-10 10:49:34 +02:00
2048f27d58 New temporary design 2017-05-10 10:49:34 +02:00
Skia
b401efc6a5 Merge branch 'krophil' into 'master'
Add small explanation in subscriptions

See merge request !67
2017-05-10 10:42:32 +02:00
95d5907a3e Add translation 2017-05-10 10:37:49 +02:00
87c457498c Add small explanation in subscriptions 2017-05-10 10:32:30 +02:00
Skia
5920e0e52a Merge branch 'bugfix' into 'master'
Fix crash when no target_type specified on accounting

Il y a aussi d'autres commit que j'ai oublié de faire merge

See merge request !71
2017-05-07 19:43:55 +02:00
2ef3c0260a Fix error on accounting when no target_type specified 2017-05-06 21:15:44 +02:00
7cb9ea40ac Anonymous users can't edit weekmail 2017-05-06 20:48:48 +02:00
5a7b743c83 Try fix right issues in counter admin 2017-05-06 20:48:48 +02:00
Skia
7c069bb3ee Merge branch 'weekmail' into 'master'
color to hexa and change email for weekmail

See merge request !70
2017-05-05 15:33:13 +02:00
635702b58f color to hexa and change email for weekmail 2017-05-05 15:28:53 +02:00
Skia
ca4152aaf2 Reset right public key for Eboutic 2017-05-04 23:25:58 +02:00
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
Sli
0b81d6a4c6 Merge branch 'weekmail' into 'master'
New css for weekmail

See merge request !68
2017-05-01 13:17:58 +02:00
d7305488b6 Add new banner 2017-04-28 13:59:10 +02:00
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
f2aadae8e8 Fix errors on election tests 2017-04-25 15:30:57 +02:00
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