2081 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
klmp200	eb485215d9	Fix translations error for gifts	2017-11-13 18:30:05 +01:00
Skia	6ee1ee365b	Merge branch 'bugfix' into 'master' ... Fix AGAIN subscription display See merge request ae/Sith!130	2017-11-09 15:22:06 +01:00
Krophil	0ba69da3b6	Fix AGAIN subscription display	2017-11-09 14:49:07 +01:00
Skia	3793321c37	Update README and Markdown test assets ... Signed-off-by: Skia <skia@libskia.so>	2017-11-09 14:37:29 +01:00
Skia	4bf805e2f5	Merge branch 'krophil' into 'master' ... Add comment in product type See merge request ae/Sith!126	2017-11-07 12:10:49 +01:00
Krophil	846be54431	Merge branch 'teeshirt' into 'master' ... Add gift function See merge request ae/Sith!129	2017-11-06 00:55:28 +01:00
klmp200	c6847ebc47	Translations for gifts	2017-11-06 00:44:18 +01:00
klmp200	e3fd3b81ab	Add gift function	2017-11-06 00:30:37 +01:00
Sli	9ab7cb98dc	Merge branch 'bugfix' into 'master' ... Fix external ressources See merge request ae/Sith!128	2017-11-05 23:31:29 +01:00
Krophil	f1a9344524	Fix external ressources	2017-11-05 13:27:58 +01:00
Skia	6ebdd53d98	club: make clubs viewable by old subscribers ... Signed-off-by: Skia <skia@libskia.so>	2017-11-01 14:51:55 +01:00
Krophil	6113de33ec	Add comment in product type	2017-10-25 23:02:46 +02:00
Skia	4810934a10	Merge branch 'bugfix' into 'master' ... Fix date displaying in user_detail See merge request ae/Sith!127	2017-10-25 20:23:43 +02:00
Skia	bc24baef09	Merge branch 'Tresorerie' into 'master' ... Add possibility to not link an operation See merge request ae/Sith!125	2017-10-25 20:20:08 +02:00
Krophil	2bb510932b	Fix date displaying in user_detail	2017-10-24 13:08:18 +02:00
Krophil	5fb57e97f7	Add possibility to not link an operation	2017-10-22 22:29:36 +02:00
Skia	cd4b0d8e0c	Merge branch 'external_option' into 'master' ... Integrate external_res variable See merge request ae/Sith!120	2017-10-18 15:32:06 +02:00
Krophil	6c957e3ce4	Integrate external_res variable	2017-10-18 14:44:47 +02:00
Skia	578fa1495d	sas: fix notification callback ... Signed-off-by: Skia <skia@libskia.so>	2017-10-15 12:00:33 +02:00
Skia	d5c6695f80	core: improve notification callback system ... Signed-off-by: Skia <skia@libskia.so>	2017-10-15 12:00:33 +02:00
Skia	9b0b381fa3	core: make populate command more predictable (should fix the random failing test) ... Signed-off-by: Skia <skia@libskia.so>	2017-10-14 13:51:50 +02:00
Skia	69c7036089	Merge branch 'krophil' into 'master' ... Add search form in admin See merge request ae/Sith!124	2017-10-12 09:29:02 +02:00
Skia	56a1e09a28	Fix requirements.txt: keep django-rest-framework <3.7 ... Signed-off-by: Skia <skia@libskia.so>	2017-10-11 12:45:57 +02:00