Commit Graph

867 Commits

Author SHA1 Message Date
Skia
3fd4d4b04b Merge branch 'Tresorerie' into 'master'
Tresorerie

Many modifications linked to the issue #23

See merge request !48
2017-03-12 23:05:44 +01:00
Skia
729a3608ba Add some pagination on forum topics 2017-03-12 20:40:37 +01:00
5932aad9fa Improve journal removing 2017-03-12 20:33:17 +01:00
5f9ec9a2ab Merge branch 'Tresorerie' of https://ae-dev.utbm.fr/ae/Sith into Tresorerie 2017-03-12 20:22:52 +01:00
Skia
65e2514df2 Small template fixes in forum 2017-03-12 18:31:35 +01:00
Skia
a56d3a3088 Add a help_text to Weekmail edit form 2017-03-12 18:13:04 +01:00
Skia
73cbfd3e82 Add Forum ordering number 2017-03-12 18:06:01 +01:00
0bf457de50 Hiding some already forbidden stuff 2017-03-11 11:57:37 +01:00
8329a19cc2 fix permissions 2017-03-11 11:57:37 +01:00
95775d3b9b adaptations for settings and deletion checked 2017-03-11 11:57:37 +01:00
6c8671c160 Better club roles in settings 2017-03-11 11:57:37 +01:00
1acac17d7e Several modifications in accounting 2017-03-11 11:57:37 +01:00
8133db804e fix permission for companies 2017-03-11 11:57:37 +01:00
554929b4ec small fix in canViewList 2017-03-11 11:57:37 +01:00
Skia
ffbad7e2e7 Merge branch 'wiki' into 'master'
Fix accents in wiki page name and allow to delete a page

See merge request !52
2017-03-08 14:37:59 +01:00
95f984824a Fix accents in wiki page name and allow to delete a page 2017-03-08 14:11:56 +01:00
Skia
b90d930594 Merge branch 'bugfix' into 'master'
No negative values for cash summary

See merge request !51
2017-03-03 00:04:47 +01:00
158a140aa4 No negative values for cash summary 2017-03-01 10:21:57 +01:00
Skia
39b102d8aa README: add counting lines of code 2017-02-27 15:41:25 +01:00
ebe76c83c7 fix permissions 2017-02-27 01:10:01 +01:00
9152688efd adaptations for settings and deletion checked 2017-02-26 18:04:58 +01:00
92bc6cf96f Better club roles in settings 2017-02-26 18:04:58 +01:00
c19e2d1cb0 Several modifications in accounting 2017-02-26 18:04:58 +01:00
346e07f0a8 fix permission for companies 2017-02-26 18:04:58 +01:00
b3c2c79975 small fix in canViewList 2017-02-26 18:04:58 +01:00
Sli
fa1a4599b6 Merge branch 'sas_right_fix' into 'master'
Sas right fix

See merge request !50
2017-02-26 17:38:20 +01:00
86c74b22de Fix sas rights 2017-02-26 17:35:01 +01:00
b02d72eab4 Fix debug-toolbar with jinja 2017-02-26 17:00:09 +01:00
Skia
7d99f02a4d forum: reply page, CSS, and first_unread fix 2017-02-25 14:38:10 +01:00
Skia
777fdd7bd5 Again, lot of forum improvements 2017-02-24 17:22:13 +01:00
Skia
fe07ee0963 Still lot of forum improvements, both rights and cosmetic 2017-02-24 15:55:50 +01:00
Skia
10d96de385 Translations 2017-02-24 04:37:14 +01:00
Skia
f262014f9b Some various forum fixes and improvements 2017-02-24 04:37:01 +01:00
Skia
d6b5db4a4b Sanitize page name 2017-02-24 04:36:36 +01:00
Skia
4d6c4314e2 Bugfix with property/callable 2017-02-24 04:36:10 +01:00
Skia
801f6ec786 Translations and small fix in the forum 2017-02-24 03:28:44 +01:00
Skia
aa07749a47 Reset forum migrations 2017-02-24 03:16:21 +01:00
Skia
59dfcbd567 Merge branch 'forum' into 'master'
Forum

See merge request !49
2017-02-24 03:08:07 +01:00
Skia
dea234f98a Change is_subscriber and was_subscriber to cached_properties 2017-02-24 02:59:59 +01:00
Skia
11e05050f7 Fix tests and force Markdown renderer to escape HTML 2017-02-24 02:45:37 +01:00
Skia
daee59f772 Change spans to sub and sup markups 2017-02-24 02:04:39 +01:00
Skia
5f1e4ebede Merge branch 'markdown' into forum 2017-02-24 02:02:59 +01:00
Skia
5897318cc6 Fix user picture view with Jinja update 2017-02-24 01:52:26 +01:00
Skia
d3514e85f4 Fix settings to work with toolbar 2017-02-24 01:52:26 +01:00
Skia
a4abf50d18 Allow former subscribers to see user profiles 2017-02-24 01:52:26 +01:00
Skia
a4984317e9 Add Django debug toolbar 2017-02-24 01:52:22 +01:00
Skia
1e95fb6873 Make use of cached_property in User model 2017-02-24 01:50:14 +01:00
Skia
c66b9b0512 Lot of small improvement in the forum 2017-02-24 01:50:09 +01:00
Skia
3b16704227 Add basic moderation to forum 2017-02-24 01:50:05 +01:00
Skia
138711c70c Some tiny fixes in the forum 2017-02-24 01:50:00 +01:00