2504 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Skia	52832eed4d	Merge branch 'skia' into 'master' ... core/models: make some tools to repair the SithFiles FS regarding the DB See merge request ae/Sith!144	2018-04-18 22:19:17 +02:00
Skia	b2306b62d6	core/models: better handle broken files ... Signed-off-by: Skia <skia@libskia.so>	2018-04-16 18:35:00 +02:00
Skia	c7b918115d	core/models: change thumbnails and compressed SithFile directories ... Signed-off-by: Skia <skia@libskia.so>	2018-04-16 18:35:00 +02:00
Skia	0d3c34c155	core/models: refactor SithFile moving and add methods to manage filesystem ... Signed-off-by: Skia <skia@libskia.so>	2018-04-16 18:35:00 +02:00
Skia	e9e51d34d3	subscription: fix compute_start	2018-04-16 14:54:47 +02:00
Skia	d619e0cd9b	Merge branch 'weekmail' into 'master' ... Weekmail images and colors See merge request ae/Sith!143	2018-03-26 10:12:14 +02:00
Skia	847b8823af	weekmail: reduce image weight	2018-03-26 09:57:50 +02:00
Soldat	a84d54accb	Change weekmail images and colors	2018-03-26 09:57:40 +02:00
Sli	41c83b17df	Merge branch 'nabos' into 'master' ... Changed default display time for posters and permissions on it See merge request ae/Sith!142	2018-03-18 22:45:11 +01:00
klmp200	cbd333eb47	Changed default display time for posters and permissions on it	2018-03-18 22:28:25 +01:00
Skia	d83bb20547	core: small update on footnotes style ... Signed-off-by: Skia <skia@libskia.so>	2018-02-22 22:56:15 +01:00
Skia	606f1af4d5	forum: add favorite topics ... Signed-off-by: Skia <skia@libskia.so>	2018-02-22 22:28:28 +01:00
Skia	f47f846d26	forum: add button CSS class ... Signed-off-by: Skia <skia@libskia.so>	2018-02-22 22:15:10 +01:00
Sli	80bffd00d1	Merge branch 'bugfix' into 'master' ... Bugfix for mailing list and posters See merge request ae/Sith!141	2017-12-22 12:59:51 +01:00
klmp200	43b4579a98	Fix datetime forms for posters	2017-12-22 12:53:43 +01:00
klmp200	c014a6e379	Fix translations	2017-12-22 12:22:37 +01:00
klmp200	b7483513be	Fix for mailing lists	2017-12-22 12:06:23 +01:00
Skia	10dfb2c122	Merge branch 'nabos' into 'master' ... Communication screens See merge request ae/Sith!116	2017-12-21 18:25:56 +01:00
Skia	a2ee017668	club/views: fix call to parent's get_context_data in PosterListView	2017-12-21 18:16:32 +01:00
gnikwo	22e277d4f7	merged migrations	2017-12-21 16:15:11 +01:00
gnikwo	903f07ecbd	Added screen list on poster + Added unmoderated poster artefact + discussions fixes	2017-12-21 12:25:07 +01:00
klmp200	72d2862e3e	Posters now working + notifications for com admin	2017-12-16 20:48:36 +01:00
Sli	5132eb49e4	Merge branch 'elections' into 'master' ... It's better to delete an object in delete See merge request ae/Sith!140	2017-12-12 14:58:02 +01:00
klmp200	5915de9603	It's better to delete an object in delete	2017-12-12 14:52:08 +01:00
Krophil	73bd8b0fd3	Merge branch 'revert-3c2f48b7' into 'master' ... Revert "Merge branch 'pere200' into 'master'" See merge request ae/Sith!139	2017-12-12 13:12:10 +01:00
Krophil	d2c278ba0e	Revert "Merge branch 'pere200' into 'master'" ... This reverts merge request !138	2017-12-12 13:01:09 +01:00
Krophil	3c2f48b750	Merge branch 'pere200' into 'master' ... Pere200 See merge request ae/Sith!138	2017-12-11 05:19:30 +01:00
Krophil	93f430ac38	PERE 200	2017-12-11 05:11:23 +01:00
Sli	6335d60ad6	Merge branch 'quickux' into 'master' ... Better ui for group selection on election and wiki See merge request ae/Sith!137	2017-12-10 21:43:54 +01:00
klmp200	d49f7858d3	Better ui for group selection on election and wiki	2017-12-10 21:37:50 +01:00
klmp200	cc99cecaa0	Fix tab mixin on clubs	2017-12-05 15:53:36 +01:00
gnikwo	91d3e9e4dc	Delete function + club tabs	2017-12-05 15:24:46 +01:00
Sli	c8fae39ff0	Merge branch 'elections' into 'master' ... Avoid moving role order in election by reloading page See merge request ae/Sith!136	2017-12-05 14:30:52 +01:00
klmp200	4217b92941	Avoid moving role order in election by reloading page	2017-12-05 14:22:59 +01:00
Sli	bc7cfc2dba	Merge branch 'elections' into 'master' ... Election improvements See merge request ae/Sith!135	2017-12-04 13:36:25 +01:00
klmp200	2f3b481037	Improve deletion and add ordering on roles	2017-12-02 19:05:48 +01:00
klmp200	625b5132c4	Election list deletion and ux improvements	2017-12-01 19:45:28 +01:00
Skia	9ca82af219	Merge branch 'counter' into 'master' ... fix can_buy in customer See merge request ae/Sith!134	2017-12-01 16:03:16 +01:00
Krophil	4af3239f4c	fix can_buy in customer	2017-12-01 01:44:38 +01:00
gnikwo	88d68ea510	Ready for review	2017-11-28 15:12:25 +01:00
gnikwo	5cd031f579	Ready for review	2017-11-28 15:12:25 +01:00
gnikwo	21b24f2891	Club views and discussions fixes	2017-11-28 15:12:04 +01:00
gnikwo	693c3ed27e	Moved club field + migrations	2017-11-28 15:09:21 +01:00
gnikwo	17d3860ec5	Fix bad merge	2017-11-28 15:09:20 +01:00
gnikwo	8d1c648032	Communication screen - without club tool	2017-11-28 15:09:05 +01:00
Skia	23d86464c8	Merge branch 'admin_area' into 'master' ... Search field in Subscription admin area See merge request ae/Sith!133	2017-11-17 12:02:31 +01:00
Krophil	bb47ad97a3	Search field in Subscription admin area	2017-11-17 11:48:16 +01:00
Skia	64c479a02e	Merge branch 'bugfix' into 'master' ... Bugfix See merge request ae/Sith!132	2017-11-16 15:43:54 +01:00
Krophil	33964e0bab	Better way to check if a user is subscriber	2017-11-16 13:50:34 +01:00
Sli	42f8ee3518	Merge branch 'teeshirt' into 'master' ... Fix translations error for gifts See merge request ae/Sith!131	2017-11-14 10:23:32 +01:00