Commit Graph

2695 Commits

Author SHA1 Message Date
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
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
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
edc438bc0e More readability for sum 2017-04-05 15:08:11 +02:00
6ca183ad55 Better sum writing 2017-04-05 14:23:51 +02:00
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
34f3fadd3d Rename counter mixin 2017-04-04 15:45:02 +02:00
d4815df55f Better right counter management 2017-04-03 15:21:07 +02:00
824411b13d Rights fix for counters 2017-04-03 13:50:28 +02:00
1430479a1d Some rights fix 2017-04-03 11:57:28 +02:00
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
fb09719317 Hide start_date for non root user from clubs 2017-04-03 09:41:35 +02:00