1041 Commits

Author	SHA1	Message	Date
Bartuccio Antoine	9e8f633037	core: fix footer block	2019-04-30 18:47:59 +02:00
Bartuccio Antoine	7bd44159de	core: update navbar and fix some translations	2019-04-28 16:21:00 +02:00
Bartuccio Antoine	2ae10ee2fb	core: add macro that selects/unselect all checkbox	2019-04-22 22:55:55 +02:00
Bartuccio Antoine	96e33815f5	Group: simplify GroupTemplateView and better group display	2019-04-22 22:55:55 +02:00
Bartuccio Antoine	3d344b483d	Group: improve group list display	2019-04-22 22:55:55 +02:00
Bartuccio Antoine	ee89327742	Group: add translations	2019-04-22 22:55:55 +02:00
Bartuccio Antoine	b693ee32f2	Group: add a label on users to delete	2019-04-22 22:55:54 +02:00
Bartuccio Antoine	08d03087a4	core: create a DetailFormView	2019-04-22 22:55:54 +02:00
Bartuccio Antoine	34459f83ec	Group: Groups: allow bulk removing of users from a group	2019-04-22 22:55:54 +02:00
Bartuccio Antoine	5cc0760e2c	Groups: allow bulk import of users on a group	2019-04-22 22:55:54 +02:00
klmp200	f6553a8f52	Group management enhacement	2019-04-22 22:55:53 +02:00
Bartuccio Antoine	2ee50c0fbd	rootplace: add tool to delete all forum messages from a specified user	2019-03-17 18:07:57 +01:00
Bartuccio Antoine	d2c5908c89	core: workaround for crsf token in production for MarkdownInput ... See https://docs.djangoproject.com/en/2.0/ref/csrf/#acquiring-the-token-if-csrf-use-sessions-is-true	2018-12-20 18:19:50 +01:00
Bartuccio Antoine	d53d725415	core: fix validation error on generic create view with MarkdownInput	2018-12-20 15:03:41 +01:00
Bartuccio Antoine	f6ab993b8d	wiki: remove old markdown preview	2018-12-20 14:32:52 +01:00
Bartuccio Antoine	fdfe33dedc	core: remove old markdown editor	2018-12-20 14:20:58 +01:00
Bartuccio Antoine	8111ae107a	core: move centralized custom scripts on top of base.jinja and move getCookie inside	2018-12-20 14:15:57 +01:00
Bartuccio Antoine	97b06b160b	core: add delay on live preview for MarkdownInput to avoid making too much request to the API	2018-12-20 14:06:30 +01:00
Bartuccio Antoine	19c1361e47	core: fix heading in MarkdownInput	2018-12-19 14:10:39 +01:00
Bartuccio Antoine	542a2ede32	core: translations for MarkdownInupt	2018-12-19 14:02:45 +01:00
Bartuccio Antoine	ea538dbab3	core: handle all basic editing actions in MarkdownInput	2018-12-19 12:25:59 +01:00
Bartuccio Antoine	55ff492ec8	core: edit buttons on MarkdownInupt	2018-12-18 14:39:05 +01:00
Bartuccio Antoine	3b08603635	core: avoid inserting automatic whitespace in MarkdownInput	2018-12-18 14:13:15 +01:00
Bartuccio Antoine	4d866843e1	core: move jquery to header section	2018-12-18 13:54:53 +01:00
Bartuccio Antoine	4afd7a0023	core: avoid blinking in MarkdownInput preview	2018-12-14 18:02:01 +01:00
Bartuccio Antoine	d6f08d3706	core: use pure js to get cookie in markdown input	2018-12-14 17:53:25 +01:00
Bartuccio Antoine	775f456c40	core: introduce new markdown input ... To fix * Avoid blinking in preview * Don't insert stupid space on empty textarea	2018-12-14 16:24:11 +01:00
Skia	82df424146	core: put User.group's names in cache	2018-12-13 20:36:21 +01:00
Bartuccio Antoine	6891174935	forum: implement order by date for search	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	e421a2b4cd	forum: increase search speed by optimizing permission filter	2018-12-13 20:33:34 +01:00
Soldat	a9bae46f45	changed design	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	57454bffa0	forum: workaround size error while building index, handle malformed utf8	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	641d564ec6	forum: add trigger to update index on ForumMessage update	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	ee99ec1aed	forum: workaround for building index with safety margin	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	269242601a	forum: workaround for error while indexing badly encoded text (legacy)	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	545671bec3	forum: workaround for building index	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	347caa3b6a	forum and core: fix error 500 when query is empty on search	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	65a0b7b2d4	forum: better display of search results	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	884855c178	forum and core: remove CanViewSearchMixin and use specialized view instead	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	1de77f2fdd	core: fix typo	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	076b10e325	forum and core: add a dedicated mixin to exclude unauthorized search results	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	3fdb83c1c2	forum and core: add access rights on search query	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	404b825de4	forum: make search fuzzy	2018-12-13 20:33:34 +01:00
Bartuccio Antoine	286ba91c75	Adapt forum search to xapian and improve query	2018-12-13 20:33:34 +01:00
Grégoire Duvauchelle	9b8a881914	Add haystack index, and a view for forum search (WIP)	2018-12-13 20:33:34 +01:00
Skia	aba4207423	core: improve search index with 'autocomplete'	2018-12-05 14:59:14 +01:00
Skia	65e0b15b31	Update Haystack indexer to use Xapian	2018-11-26 21:25:02 +01:00
klmp200	2c61e797c6	Navbar translation improvements	2018-11-08 00:27:50 +01:00
Soldat	2707b5b1f2	changed color adn local	2018-11-06 00:56:16 +01:00
Soldat	b5b36e5d1c	Changed local	2018-11-06 00:14:40 +01:00
Soldat	6baac88e63	format css correctly	2018-11-05 23:57:37 +01:00
Soldat	49d3123ad8	Changed tab v2	2018-11-05 23:57:37 +01:00
Soldat	29935cb5a8	Add dropdown in navtab	2018-11-05 23:57:37 +01:00
Soldat	3dc73ebb9a	Change nav tab	2018-11-05 23:57:37 +01:00
Soldat	bf321aaac3	Message change color when unread	2018-10-16 21:08:47 +02:00
Bartuccio Antoine	4d3ff3e9dc	user: allow subscription history to be visible when subscription is expired	2018-10-16 15:28:45 +02:00
Bartuccio Antoine	72a4bde6a2	user: fix populate for dev and use native django function to fetch payment_method	2018-10-16 14:52:47 +02:00
klmp200	f6968facbe	user: add subscription history	2018-10-16 00:17:19 +02:00
Sli	b2b03e530a	Merge branch 'sentry' into 'master' ... senrty: fix SENTRY_DSN in error page See merge request ae/Sith!166	2018-10-10 16:40:57 +02:00
Bartuccio Antoine	f91ba25b25	senrty: fix SENTRY_DSN in error page	2018-10-10 16:33:12 +02:00
Sli	6fd34bcaa0	Merge branch 'sentry' into 'master' ... Intégration d'une page d'incident automatique See merge request ae/Sith!165	2018-10-10 16:23:05 +02:00
Bartuccio Antoine	f4122bbc37	sentry: deal with sentry's js as external resource	2018-10-10 15:27:21 +02:00
klmp200	bdd8427758	sentry: integration with error 500 page	2018-10-10 02:18:19 +02:00
Soldat	87b70d4597	Changed color	2018-10-09 22:04:17 +02:00
Soldat	20b513a381	Decrease nav and agenda border radius, change shadow, change tool bar border and margin	2018-10-09 22:04:17 +02:00
Soldat	680d29a2b4	Darker nav color	2018-10-09 22:04:17 +02:00
Soldat	cce33d13b3	Change hex to hsl	2018-10-07 21:48:03 +02:00
Soldat	a78f1101c3	Changed site design v1	2018-10-07 21:48:03 +02:00
Soldat	3a778e2105	First commit and fix overlapping text and logo	2018-10-07 14:59:04 +02:00
klmp200	cb58b00b6e	All: Apply Black coding rules	2018-10-05 21:52:55 +02:00
Grégoire Duvauchelle	afe78ea634	Add captcha to registration form	2018-07-06 11:35:02 +02:00
klmp200	5c4a16d14c	Fix user pictures display	2018-06-10 18:43:39 +02:00
klmp200	08de5dfe6a	Migration to django 1.11	2018-06-10 16:31:58 +02:00
klmp200	a0a86ef8e1	Allow BDF's members to see subscriptions on users	2018-06-10 16:09:21 +02:00
klmp200	90e1e7c1bb	Add promo logo	2018-06-10 16:09:04 +02:00
klmp200	c5be9b5597	Add promo 19's logo	2018-06-10 15:49:53 +02:00
Skia	eae7825260	core/static: fix Matmat results with long names	2018-06-07 00:10:33 +02:00
Skia	61d34b3a09	core, matmat: fix search form	2018-06-06 00:25:27 +02:00
Skia	fecb1ae902	core/static: fix Markdown code vertical-align	2018-06-05 00:49:43 +02:00
Skia	be1dc62848	core: make a nice user profile	2018-06-05 00:28:43 +02:00
Skia	9146251642	Prevent generation of useless migrations upon settings change	2018-05-08 18:51:29 +02:00
gnikwo	3fe4e64098	Small modification in hope to fix communication screen deformations	2018-04-29 13:53:55 +02:00
Skia	4d36a961db	core/models: improve repair_fs output	2018-04-18 23:02:19 +02:00
Skia	b5aee62558	core/models: don't always repair every single file	2018-04-18 22:54:30 +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	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
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
Skia	10dfb2c122	Merge branch 'nabos' into 'master' ... Communication screens See merge request ae/Sith!116	2017-12-21 18:25:56 +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
Krophil	d2c278ba0e	Revert "Merge branch 'pere200' into 'master'" ... This reverts merge request !138	2017-12-12 13:01:09 +01:00
Krophil	93f430ac38	PERE 200	2017-12-11 05:11:23 +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
klmp200	625b5132c4	Election list deletion and ux improvements	2017-12-01 19:45:28 +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	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	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
klmp200	eb485215d9	Fix translations error for gifts	2017-11-13 18:30:05 +01:00
Krophil	0ba69da3b6	Fix AGAIN subscription display	2017-11-09 14:49:07 +01:00
klmp200	e3fd3b81ab	Add gift function	2017-11-06 00:30:37 +01:00
Krophil	f1a9344524	Fix external ressources	2017-11-05 13:27:58 +01:00
Krophil	2bb510932b	Fix date displaying in user_detail	2017-10-24 13:08:18 +02:00
Krophil	6c957e3ce4	Integrate external_res variable	2017-10-18 14:44:47 +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	7879b6dd6b	core: add family graphs ... Signed-off-by: Skia <skia@libskia.so>	2017-10-11 12:30:33 +02:00
Krophil	3994a58a2f	Add search form in admin	2017-10-11 00:01:24 +02:00
Krophil	3104270675	Few changes in accounting design	2017-10-09 16:24:34 +02:00
Sli	8492903a39	Merge branch 'clubs' into 'master' ... Found a way to avoid strange error for club page See merge request ae/Sith!122	2017-10-06 17:50:59 +02:00
klmp200	4369d9f593	Found a way to avoid strange error for club page	2017-10-06 17:44:41 +02:00
Skia	a09c634ac6	core: add phonenumber template filter ... Signed-off-by: Skia <skia@libskia.so>	2017-10-06 17:28:51 +02:00
Skia	fae2a572b1	Merge branch 'fontawesome' into 'master' ... Few changes in design See merge request ae/Sith!119	2017-10-06 15:30:30 +02:00
Krophil	be958bca7e	Small fix for logo in news	2017-10-06 12:00:12 +02:00
Krophil	c8c60b8b7d	Few changes in design	2017-10-06 11:58:51 +02:00
klmp200	30f7835cef	Operations documentation	2017-10-06 11:09:31 +02:00
klmp200	8146186447	Fix some bugs in mailings with new club tools	2017-10-06 11:09:31 +02:00
klmp200	baa7be69e4	Better integration of wiki pages on clubs	2017-10-06 11:09:31 +02:00
klmp200	2c1cf2d7af	Fix for club tools	2017-10-06 11:09:31 +02:00
klmp200	4026d076b3	Forgoten migration from skia and fixed migration	2017-10-06 11:09:30 +02:00
klmp200	db509bf060	Nice club presentation	2017-10-06 11:09:30 +02:00
klmp200	790d723d08	Fix page creation method for clubs	2017-10-06 11:09:30 +02:00
klmp200	12c49b285a	Fix page permissions and fix migration when on sqlite backend	2017-10-06 11:09:30 +02:00
klmp200	aa49b2d4ce	Fix regex for pages	2017-10-06 11:09:30 +02:00
klmp200	939146bddd	Sync pages with club unix_name	2017-10-06 11:09:29 +02:00
klmp200	fe69cbcee1	Add page for clubs and inactive clubs	2017-10-06 11:09:29 +02:00
Krophil	3089b484d3	Enhanced news	2017-10-02 14:29:36 +02:00
Krophil	acbeb3d3c8	add font-awesome	2017-09-29 14:35:06 +02:00
Skia	13a2cc22dd	core: fix some CSS ... Signed-off-by: Skia <skia@libskia.so>	2017-09-26 14:05:19 +02:00
Skia	b87990e3db	com: add birthdays block ... Signed-off-by: Skia <skia@libskia.so>	2017-09-26 13:45:40 +02:00
Skia	cda89d66cd	com: improve news page ... Signed-off-by: Skia <skia@libskia.so>	2017-09-26 12:13:23 +02:00
Skia	f0c34fe70c	sas: add permanent notification for SAS moderation ... Signed-off-by: Skia <skia@libskia.so>	2017-09-25 12:35:56 +02:00
Skia	3e769195e3	Merge branch 'facebook-button' into 'master' ... Add facebook button See merge request !112	2017-09-17 15:18:07 +02:00
klmp200	b1c3ea9e2c	Logo for 18	2017-09-13 18:28:18 +02:00
Krophil	d888a6b68a	Add Twitter button	2017-09-12 19:20:12 +02:00
Krophil	a40c48a792	Add facebook button	2017-09-12 19:04:37 +02:00
Krophil	2f912a197c	Allow to subscribe before subscription end	2017-09-06 19:55:14 +02:00
Skia	0184b9c29b	core, com: make permanent notifications for news to moderate ... This needs to be made for other stuff, like the SAS or the files... Signed-off-by: Skia <skia@libskia.so>	2017-09-06 13:17:23 +02:00
Skia	dd5926b404	core: fix notif ordering ... Signed-off-by: Skia <skia@libskia.so>	2017-09-06 13:05:51 +02:00
Skia	6456d18fc4	core, com: tool bar and agenda design updates ... Signed-off-by: Skia <skia@libskia.so>	2017-09-03 19:05:45 +02:00
Krophil	97cdf0e9d8	Link to old site updated	2017-09-03 18:04:05 +02:00
Skia	caa0c2099b	core: fix notifications colors ... Signed-off-by: Skia <skia@libskia.so>	2017-09-03 12:01:52 +02:00
Skia	283e128e93	core: jQuery UI widget theme overrides ... Signed-off-by: Skia <skia@libskia.so>	2017-09-02 22:33:13 +02:00
Skia	f5abfc3c12	core: still some design improvements ... Signed-off-by: Skia <skia@libskia.so>	2017-09-02 20:59:45 +02:00
Skia	9f259b35bd	core, counter: add preferences for counter notifications ... Signed-off-by: Skia <skia@libskia.so>	2017-09-02 12:42:07 +02:00
Skia	8b9c3fb5c6	core: improve notification box ... Signed-off-by: Skia <skia@libskia.so>	2017-09-02 02:19:34 +02:00
Skia	4ca3aebc77	core: improve alert and info boxes ... Signed-off-by: Skia <skia@libskia.so>	2017-09-02 02:06:22 +02:00
Skia	5c709a5416	core: great rework of the header bar ... Signed-off-by: Skia <skia@libskia.so>	2017-09-01 18:31:48 +02:00
Skia	22151ef3b3	core: display news page in place of index for logged in users ... Signed-off-by: Skia <skia@libskia.so>	2017-09-01 12:33:23 +02:00
Skia	4edb9a78c6	com: add agenda on news page ... Signed-off-by: Skia <skia@libskia.so>	2017-09-01 12:22:38 +02:00
Krophil	2bd1927e39	New Sponsors page	2017-08-31 14:11:18 +02:00
Skia	5504142efa	core, templates: fix logo link ... Signed-off-by: Skia <skia@libskia.so>	2017-08-25 14:28:17 +02:00
Skia	0d5595c683	core: add test for Markdown syntax ... Signed-off-by: Skia <skia@libskia.so>	2017-08-24 16:30:46 +02:00
Skia	30f650ecce	core: use more AJAX forms in admin UI ... Signed-off-by: Skia <skia@libskia.so>	2017-08-24 15:35:17 +02:00
Sli	c0b3024cc2	Merge branch 'mailing' into 'master' ... Fix permission for club in user profile See merge request !102	2017-08-24 14:49:04 +02:00
klmp200	b0ce8b1b83	Fix permission for club in user profile	2017-08-24 14:42:57 +02:00
Sli	8e166b75e4	Merge branch 'nintendo_switch' into 'master' ... Changing urls See merge request !99	2017-08-22 23:53:56 +02:00
Krophil	b74600b3f3	Changing urls	2017-08-22 23:47:55 +02:00
klmp200	4f6109e27c	Refactor mailings email	2017-08-22 22:39:12 +02:00
klmp200	d179a0a6d0	Fix typo and merge migrations	2017-08-22 15:36:39 +02:00
klmp200	ce9e17ea24	Some mailing list fixs	2017-08-22 15:36:39 +02:00
klmp200	76efb91e40	Move mailing list admin to com	2017-08-22 15:36:39 +02:00
klmp200	3a6f7009fd	Fix display rights in user profile for mailing	2017-08-22 15:36:39 +02:00
klmp200	9cb88a878d	Even better mailing	2017-08-22 15:36:39 +02:00
klmp200	a9e23920ee	Matmat renames	2017-08-15 18:05:07 +02:00
klmp200	9ff8f02a45	Form remember last entered values	2017-08-15 18:05:07 +02:00
klmp200	b7c382a1a8	Basic search structure	2017-08-15 18:05:07 +02:00
klmp200	748e3ae326	Refactor and migration corrections	2017-08-15 13:57:49 +02:00
klmp200	d60e14a303	Migration from old database	2017-08-15 13:57:49 +02:00
klmp200	40927fa13d	Add limit for ecocup recording	2017-08-15 13:57:49 +02:00
klmp200	22407e2f85	Bottom links migrations to internal wiki	2017-08-15 03:30:39 +02:00
Skia	6f79c6c590	core: fix paragraph annoying scroll bar ... Signed-off-by: Skia <skia@libskia.so>	2017-08-09 22:02:41 +02:00
Skia	d3796479ee	core: put the AE logo in the CSS ... Signed-off-by: Skia <skia@libskia.so>	2017-08-09 16:40:03 +02:00
Skia	61d2765510	core: refactor user picture page algorithm ... Signed-off-by: Skia <skia@libskia.so>	2017-08-02 20:12:41 +02:00
Skia	e4e4eae11b	Merge branch 'subscriptions' into 'master' ... Some selected club members can now make people subscribe and fix major security … Le bdf m'as demandé si c'était possible pour eux de faire des cotisations pour les nouveaux Je retire WIP quand j'ai la confirmation du bureau que je peux faire ça Par contre il j'y ai patché une grosse faille de sécurité : se mettre curieux à l'AE suffit à avoir tous les droits de board_member See merge request !91	2017-07-26 20:48:01 +02:00
klmp200	c56094eaaf	Some selected club members can now make people subscribe and fix major security hole in board_member verification	2017-07-26 20:31:29 +02:00
Skia	b99bbc385a	css: fix overflow problem ... Signed-off-by: Skia <skia@libskia.so>	2017-07-26 18:41:21 +02:00
Krophil	2ae4e36eea	Add a nice favicon	2017-07-06 14:04:24 +02:00
Krophil	e7de8b2aec	Format core	2017-06-13 10:04:13 +02:00
Skia	f26f2f4229	trombi: add custom club memberships ... Signed-off-by: Skia <skia@libskia.so>	2017-06-12 23:52:59 +02:00
Skia	5df9be9188	Move computing of start of semester to core/utils ... Signed-off-by: Skia <skia@libskia.so>	2017-06-12 22:53:25 +02:00
Skia	8ca455a398	Epic fix ... Signed-off-by: Skia <skia@libskia.so>	2017-06-12 22:35:22 +02:00
Skia	37a5db537b	Re-fix AnonymousUser ... Signed-off-by: Skia <skia@libskia.so>	2017-06-12 14:01:28 +02:00
Skia	b06f270ea5	Revert "Fix AnonymousUser" ... This reverts commit e7f7c57558.	2017-06-12 13:57:08 +02:00
Skia	b4be40a3a7	Change the Markdown super and sub texts not to break the Ragots ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 21:39:56 +02:00
Skia	58beb551e8	Fix unread messages in topic ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 21:05:36 +02:00
Skia	a89fb23d33	That's just a ridiculous little fix ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 20:03:37 +02:00
Skia	ce46a9d9da	Some small clean up and refactoring ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 19:56:47 +02:00
Skia	2925cde8ab	Add a MarkdownInput widget, and make use of it ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 19:40:47 +02:00
Skia	4b9fa0cd57	Fix some Markdown and add basic textarea helper ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 19:14:58 +02:00
Skia	457fc36e16	Fix markdown rendering on some pages, and add a link to the syntax help ... Signed-off-by: Skia <skia@libskia.so>	2017-06-10 16:54:19 +02:00
Skia	1bcde80a28	Fix cache clearing ... Signed-off-by: Skia <skia@libskia.so>	2017-06-07 22:51:17 +02:00
Skia	23293ea88e	Small style update to improve Markdown rendering ... Signed-off-by: Skia <skia@libskia.so>	2017-06-07 22:49:59 +02:00
Skia	10ee5e1708	Merge branch 'counter' into 'master' ... Tests for counter See merge request !77	2017-06-07 19:45:05 +02:00
klmp200	c4389bb9cd	Add a way for admin to delete elections and add archive system	2017-06-07 18:42:16 +02:00
klmp200	0076c9cdb4	Macro for pagination	2017-06-07 18:39:42 +02:00
Krophil	0af72500c6	Add some tests on counter	2017-06-07 18:36:26 +02:00
Skia	63acf588ca	Add basic unfinished counter test	2017-06-07 18:36:26 +02:00
klmp200	22945483d6	Add some graphics for subscriptions stats	2017-06-07 14:12:03 +02:00
klmp200	1c05671784	Added forgotten column and a link in tools	2017-06-06 22:03:56 +02:00
Skia	e7f7c57558	Fix AnonymousUser ... Signed-off-by: Skia <skia@libskia.so>	2017-06-06 19:37:45 +02:00
Skia	f3c1ab4ae4	forum: use short names ... Signed-off-by: Skia <skia@libskia.so>	2017-05-31 23:56:47 +02:00
Skia	978b891137	Add a cache clearing mechanism to fix rights update problems ... Signed-off-by: Skia <skia@libskia.so>	2017-05-31 21:49:54 +02:00
Skia	e5ce9658ee	Fix images and links parsing in doku_to_markdown ... Signed-off-by: Skia <skia@libskia.so>	2017-05-31 19:13:43 +02:00
Skia	136d0f3fa0	Add basic BBcode translator ... Signed-off-by: Skia <skia@libskia.so>	2017-05-30 23:40:01 +02:00
Skia	ba65dc5d46	Fix doku_to_markdown ... Signed-off-by: Skia <skia@libskia.so>	2017-05-30 19:33:09 +02:00
Skia	d7135e4d27	Make a lot of pimp in the Forum	2017-05-30 19:33:09 +02:00
Skia	cf062a35d3	Add query reductions in core	2017-05-30 19:33:09 +02:00
Skia	862a4619b3	Add doku_to_markdown function	2017-05-14 03:17:42 +02:00
Skia	8c151fa498	Add support for image sizing in Markdown	2017-05-14 01:03:50 +02:00
Skia	231cb236dc	Add moderation tool to Trombi	2017-05-12 18:42:52 +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	b3bc33a319	Add first Matmat' app	2017-05-10 19:19:33 +02:00
Krophil	05d1f43b55	Few modifications in accordance with com	2017-05-10 15:32:50 +02:00
klmp200	e59d769dac	Doc for scss	2017-05-10 11:13:49 +02:00
klmp200	200af57971	Put scss in renderer	2017-05-10 10:49:34 +02:00
klmp200	f87ec1e395	Better lisibility for scss	2017-05-10 10:49:34 +02:00
klmp200	d083a67725	Change year of license on some files	2017-05-10 10:49:34 +02:00
klmp200	acef5be8b3	New lite home made scss processor	2017-05-10 10:49:34 +02:00
klmp200	630fdf93a4	Refactoring for compilestatic	2017-05-10 10:49:34 +02:00
klmp200	79c769351d	Add simple way to compile scss files	2017-05-10 10:49:34 +02:00
klmp200	ee7fd1c423	Rename temporary_design	2017-05-10 10:49:34 +02:00
Krophil	2048f27d58	New temporary design	2017-05-10 10:49:34 +02:00
Skia	a12b772587	Add some Eboutic tests	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
Krophil	d7305488b6	Add new banner	2017-04-28 13:59:10 +02:00
Krophil	7815796d8b	New css for weekmail	2017-04-27 15:31:18 +02:00
klmp200	b5363c2987	Firsts tests for elections	2017-04-25 15:30:57 +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	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	231922cbaa	Merge branch 'sas' into 'master' ... Fixed some issues with filepaths and see the future with some preload See merge request !59	2017-03-31 11:34:10 +02:00
klmp200	60e2e0d4f9	Better to use os.path.join for paths	2017-03-30 19:13:47 +02:00
klmp200	8787e5e708	Better protection for stats	2017-03-28 15:00:09 +02:00
klmp200	63506b1506	Protect stats from other users	2017-03-28 01:03:31 +02:00
klmp200	5eb1e609cc	Fixed tests issues	2017-03-27 22:47:24 +02:00
Skia	50413abf76	Fix a weekmail deleteview, and make some translate fix	2017-03-27 15:16:01 +02:00
Skia	b28ce200e6	Fix some translations	2017-03-27 14:31:58 +02:00
Skia	39b32d456c	Some com templates improvments and reordering some models	2017-03-24 09:19:15 +01:00
Skia	d2da5716ba	Automodere profile files	2017-03-24 08:43:13 +01:00
Skia	e56b2476b7	Fix notifications local time	2017-03-17 18:11:30 +01:00
Krophil	95775d3b9b	adaptations for settings and deletion checked	2017-03-11 11:57:37 +01:00
Krophil	554929b4ec	small fix in canViewList	2017-03-11 11:57:37 +01:00
klmp200	95f984824a	Fix accents in wiki page name and allow to delete a page	2017-03-08 14:11:56 +01:00
klmp200	86c74b22de	Fix sas rights	2017-02-26 17:35:01 +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	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	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	a4abf50d18	Allow former subscribers to see user profiles	2017-02-24 01:52:26 +01:00
Skia	1e95fb6873	Make use of cached_property in User model	2017-02-24 01:50:14 +01:00
Skia	6764224856	Fix quote answer and unread messages display	2017-02-24 01:49:48 +01:00
Skia	318c9ff9ad	Add trigger to update Whoosh index on User update	2017-02-15 22:01:33 +01:00
Skia	52a671583e	Fix blockquote	2017-02-07 00:10:00 +01:00
Skia	ecbfe0822f	Another version of the indice/exposants	2017-02-06 20:21:34 +01:00
Skia	579a68362d	Add some rules	2017-02-06 20:21:34 +01:00
Skia	254126fd79	Add last unread function	2017-02-06 20:20:39 +01:00
Skia	bf8a2a03ff	Allow former subscribers to lookup people	2017-02-02 22:56:05 +01:00
Skia	653d9d4707	Some other great forum improvements	2017-01-21 22:47:30 +01:00
Skia	93f5096140	Improve forum style and templates	2017-01-21 12:28:32 +01:00
Skia	ff77df3646	Add basic right management to forum. Need to test it!	2017-01-21 04:51:37 +01:00
Skia	ea52462217	Add Forum	2017-01-21 03:42:06 +01:00
Skia	ae0b7699f3	Finish weekmail, and fix preferences page	2017-01-15 23:02:03 +01:00
Skia	147809bb5d	Some great weekmail improvements	2017-01-15 22:58:38 +01:00
Skia	83555a3640	Add preferences and improve weekmail	2017-01-15 22:58:38 +01:00
Skia	176b1bf588	Fix QuickNotifMixin	2017-01-15 22:58:37 +01:00
Skia	0aef7656b8	Add quick notifications prototype	2017-01-15 22:58:37 +01:00
Skia	9d1eaed625	Make some weekmail views	2017-01-15 22:58:37 +01:00
Skia	93e51776c1	Merge branch 'eticketUpdate' into 'master' ... partners banner added See merge request !33	2017-01-13 08:58:15 +01:00
Skia	5a305354cb	Add recursive option to file props form	2017-01-12 20:55:47 +01:00
Krophil	4a5d789d9f	partners banner added	2017-01-07 17:39:21 +01:00
Skia	d400995e9d	Update setup command to ease development	2017-01-07 10:36:54 +01:00
guillaume-renaud	0660ea5e64	MAJ translations ; stock acces addition in user tool	2017-01-05 11:15:04 +01:00
Skia	114272df2f	Add simple club stats	2017-01-04 17:38:54 +01:00
Skia	c48449cd50	Add barman stats	2017-01-04 17:38:09 +01:00
Skia	c6422fdd30	Add SYNTAX.md	2016-12-26 01:42:45 +01:00
Skia	1dd28672b0	Add Markdown test to populate	2016-12-26 01:36:07 +01:00
Skia	f77856852d	Working file:// link	2016-12-26 01:34:44 +01:00
Skia	323b946e1f	First dfile:// parsing, not working into links, need to investigate	2016-12-26 01:34:44 +01:00
klmp200	3609952db5	Some translation fixs	2016-12-26 00:37:32 +01:00
klmp200	e17fd22a37	Fix populate after rebase	2016-12-25 20:24:18 +01:00
klmp200	4f62863599	Pimp role and list forms and add edit for election	2016-12-25 19:54:10 +01:00
klmp200	97f835eb4e	Convert indent with space, fix populate and add an s	2016-12-25 19:54:10 +01:00
klmp200	1f60fbd484	Uses election_detail for vote form	2016-12-25 19:54:10 +01:00
Skia	177e39bd6e	Fix RuntimeWarning in populate	2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet	94d15684b7	Added profile pictures for users	2016-12-25 19:53:04 +01:00
klmp200	e8ead338d0	Removed useless widget added previously + began voteform	2016-12-25 19:52:14 +01:00
klmp200	d72d8366cf	Add new widget (not tested) and new bdd scheme for elections	2016-12-25 19:52:14 +01:00
klmp200	7956067686	Election right update	2016-12-25 19:52:14 +01:00
klmp200	2764f6d2d2	Refactor List Model	2016-12-25 19:52:14 +01:00
klmp200	c604282b77	Nice display for elections	2016-12-25 19:52:14 +01:00
klmp200	52e69b0ac1	Refactor elections	2016-12-25 19:52:14 +01:00
klmp200	a284637190	Normally fixs tests	2016-12-25 19:52:14 +01:00
klmp200	fd3309fc5f	Refactor election bdd	2016-12-25 19:52:14 +01:00
klmp200	d685e9ba29	Election bdd + first view	2016-12-25 19:52:14 +01:00
Krophil	f7b4258f20	populate updated	2016-12-24 16:16:14 +01:00
Krophil	418537bc8e	tests for accounting added	2016-12-24 16:16:14 +01:00
Skia	df7b0a5ffe	Clean migrations for news system	2016-12-24 02:12:46 +01:00
Skia	1dc1a0a42c	Add news moderation tool	2016-12-23 18:40:37 +01:00
Krophil	93211d8ada	operations added in populate	2016-12-21 05:19:16 +01:00
Skia	168622a04d	Add com app with first parametric texts	2016-12-21 02:38:21 +01:00
Skia	4edd535460	Change DateField to DateTimeField to improve indexing efficency	2016-12-20 16:28:30 +01:00
Skia	bdd29a4d65	Allow quick index updates	2016-12-20 15:19:11 +01:00
Skia	e66b274f0e	Add index to search function	2016-12-20 14:46:08 +01:00
Skia	5b95299bde	Add Whoosh index	2016-12-20 14:46:08 +01:00
Krophil	c372b22197	Management for companies added	2016-12-20 12:29:13 +01:00
Skia	68517a5d33	Merge branch 'Tresorerie' into 'master' ... Separate counter for account refounding See merge request !28	2016-12-19 16:50:44 +01:00
Skia	352b8f0b4f	Add recursive option to apply rights in the SAS	2016-12-18 19:08:25 +01:00
Skia	94e740fb04	Small improvement in file prop view	2016-12-18 17:59:08 +01:00
Skia	4a7df31f5e	Some other performance improvements	2016-12-18 11:55:45 +01:00
Skia	bf6483039d	Fix performance issue in rights check	2016-12-18 11:55:03 +01:00
Skia	8de0d54940	Allow to delete a launderette slot	2016-12-15 16:11:43 +01:00
klmp200	7227a5d6f9	Refactor refounding function	2016-12-15 12:17:19 +01:00
klmp200	e231c612c6	Separate counter for account refounding	2016-12-15 11:46:36 +01:00
Skia	39b7349034	Add CSS to the notifications	2016-12-14 19:15:53 +01:00
Skia	81e11b4c33	Refactor Can*Mixin	2016-12-14 18:05:30 +01:00
Skia	642249e7fb	Notification fix	2016-12-14 09:11:26 +01:00
Skia	97f7214f01	Small right fix	2016-12-14 09:10:41 +01:00
Skia	e3c86c1d05	Add "Mark all as read"	2016-12-13 17:53:44 +01:00
Skia	bf9aa29a54	Add clipboard to SAS	2016-12-13 17:17:58 +01:00
Skia	f594a99751	Clean up, fix, and improve templates around clipboard	2016-12-13 01:24:23 +01:00
Skia	0859648bd4	Add cut/paste function in files	2016-12-13 00:45:38 +01:00
Skia	8b63fa9aea	Store file moderator	2016-12-12 17:23:06 +01:00
Skia	2919f3a133	Allow former subscribers to see pictures	2016-12-12 16:35:52 +01:00
Skia	7be4f00440	Fix is_in_group	2016-12-11 17:51:44 +01:00
Skia	28431ec9be	Big refactor: remove Subscriber class	2016-12-10 01:58:30 +01:00
Skia	0d4b697079	Refactor group settings	2016-12-10 01:29:56 +01:00
Skia	1649d14518	Fix migration scripts	2016-12-10 00:30:52 +01:00
Skia	d92a706920	Refactor notifications	2016-12-10 00:06:17 +01:00
Skia	b53531c391	Add another method to moderate pictures in SAS	2016-12-09 19:35:23 +01:00
Skia	66d73d69ec	Improve SAS moderation page	2016-12-09 18:42:02 +01:00
Skia	4542753812	Add two tests for file upload	2016-12-09 15:48:17 +01:00
Skia	80fa99d2ac	Add notification	2016-12-08 19:47:28 +01:00
Skia	c1397ef5a5	Small fix, episode two	2016-12-08 15:30:41 +01:00
Skia	b7b9820d70	Revert "Père 200, Père 200, tralalalalère!!!!" ... This reverts commit edaa1b0082.	2016-12-06 12:37:25 +01:00
Skia	edaa1b0082	Père 200, Père 200, tralalalalère!!!!	2016-12-05 02:58:53 +01:00
Skia	3970965781	Merge branch 'Tresorerie' into 'master' ... Refound Account See merge request !26	2016-11-30 15:44:43 +01:00
Skia	8771cc9b86	Enhance user picture view	2016-11-30 12:59:03 +01:00
Skia	7453b857fb	Add thumbnails to albums	2016-11-30 09:28:54 +01:00
klmp200	3c8a4f068e	Refound Account	2016-11-30 08:19:52 +01:00
Krophil	0b4f826594	Add PDF operations generation	2016-11-29 12:35:37 +01:00
Skia	a60063f009	Oops, syntax error + styling footer	2016-11-29 11:49:41 +01:00
Skia	c1861755bc	Translation update	2016-11-29 11:26:18 +01:00
juste	ff9ed9002e	a simple footer + traductions	2016-11-28 11:26:06 +01:00
Skia	064abe0741	UTF-8 fix	2016-11-25 18:59:22 +01:00
Skia	cfbb6f4e1f	Lot of small improvement in SAS	2016-11-25 13:47:09 +01:00
Skia	0b23d39e15	Fix migrations after rebase	2016-11-23 11:55:10 +01:00
Skia	da35292cd5	Add is_in_sas field, to perform queries on it	2016-11-23 11:46:45 +01:00
Skia	0e0e57458f	Improve SAS UX	2016-11-23 11:46:45 +01:00
Skia	815ef03860	Better handle rotations	2016-11-23 11:46:45 +01:00
Skia	869634d6e1	Add thumbnail generation	2016-11-23 11:46:45 +01:00
Skia	71d22e367b	Add picture view to users	2016-11-23 11:46:45 +01:00
Skia	22ab21e4e1	Add picture-people relation and ask for removal thing	2016-11-23 11:46:45 +01:00
Skia	b619619b85	Improve moderation tool in SAS	2016-11-23 11:46:45 +01:00
Skia	157b1e4c78	Add file moderation tool	2016-11-23 11:46:45 +01:00
Skia	585ba55e5e	Continue SAS	2016-11-23 11:46:40 +01:00
Skia	d554a5ee8d	Begin SAS	2016-11-23 11:38:01 +01:00
Skia	0b068d3e92	Improve file moderation	2016-11-23 11:30:57 +01:00
Skia	9e32840549	Add file moderation tool	2016-11-23 00:51:20 +01:00
Skia	cfbd610305	Revert "Merge branch 'fond-gala' into 'master'" ... This reverts merge request !25	2016-11-21 14:10:29 +01:00
klmp200	d418da679b	Add background for gala 2016	2016-11-13 22:55:32 +01:00
Skia	e98ffb5cd5	Fix unappropriate behavior when delete selling	2016-11-10 13:51:56 +01:00
guillaume-renaud	63f10c13d4	Add inactive state for counters	2016-11-08 18:42:12 +01:00
Skia	54d3ca8e65	Merge branch 'sli' into 'master' ... Edit CONTRIBUTING instructions See merge request !20	2016-11-06 23:27:00 +01:00
klmp200	160c7806df	Fix contributing.md and fix quantity display on eticket	2016-11-06 23:15:43 +01:00
Skia	20ff409547	Fix tests	2016-11-06 11:36:54 +01:00
Skia	59f5917b8c	Fix Page locking	2016-11-05 13:37:39 +01:00
Skia	9cfc029fb2	Permission fix	2016-10-27 18:39:40 +02:00
klmp200	b00fc23fc4	Add automatic mail when an eticket has been bought	2016-10-21 17:47:56 +02:00
klmp200	224374f5e8	More readable user_account	2016-10-19 01:57:54 +02:00
klmp200	029bc7cc7c	Add link to create club in rootplace	2016-10-18 23:36:26 +02:00
klmp200	c40171fe86	Clean permission check for alcohol and counter ban	2016-10-18 23:02:53 +02:00
klmp200	2daaf992f2	Add groups, allow to ban users from counters and from buying alcohol	2016-10-16 03:45:06 +02:00
klmp200	1c97c8a74f	Swag dropdown on user account + autofocus for refillings on counters	2016-10-16 02:47:21 +02:00
klmp200	257cb9cfe7	Add ban for alcohol	2016-10-15 02:33:38 +02:00
klmp200	178a4af196	Add lazy way to make an user property editable once only	2016-10-13 22:58:26 +02:00
klmp200	579c25d63a	Deny date of birth, first and last name modification for non board or root user	2016-10-13 22:32:13 +02:00
Skia	5931351c0a	Another tiny template improvement	2016-10-12 12:32:04 +02:00
klmp200	d285fbe04a	Add account number and suscription on counter	2016-10-08 23:07:10 +02:00
guillaume-renaud	5b50cc9598	Traduction's addition for user_clubs templates	2016-10-07 13:17:43 +02:00
guillaume-renaud	760b33728b	Addition of the user's club tab as table	2016-10-06 11:08:32 +02:00
guillaume-renaud	1b63d58586	Addition of the user's club tab	2016-10-06 11:08:32 +02:00
Skia	63217b2ead	Improve product display	2016-10-05 15:57:04 +02:00
Skia	64b4484620	Some templating	2016-10-04 00:41:08 +02:00
Skia	cd23fdf3ef	Add missing eticket banner	2016-10-03 19:43:22 +02:00
Skia	d6138a7a0c	Make the etickets	2016-10-03 19:30:05 +02:00
Skia	52184c4012	Merge branch 'sli' into 'master' ... Godfathers deletion See merge request !11	2016-09-29 15:12:19 +02:00
klmp200	2c6f17063a	Can delete Godfathers	2016-09-29 15:06:39 +02:00
klmp200	a008f34288	Fix bug where slots appears when slot expired	2016-09-28 17:22:34 +02:00
Skia	2e7e78b8ce	Add last ops view to the bars	2016-09-28 11:09:54 +02:00
klmp200	8ef45bf03c	Rename is_token to check_token	2016-09-28 10:53:27 +02:00
klmp200	17b098ca2a	Fixed lookup for loged barmen	2016-09-27 22:57:06 +02:00
Skia	f152791d90	Merge branch 'sli' into 'master' ... Only club members can view counter's stats N'importe qui peut accéder aux tops 100, c'est pas très cool de voir ce que dépensent les autres… See merge request !9	2016-09-27 20:12:57 +02:00
klmp200	3c408551aa	Remove nested exception for stats and added property on AnonymusUser	2016-09-27 16:56:30 +02:00
Skia	a4ad7f0e85	Add token to counter to see pictures and to prevend misuses	2016-09-26 11:17:56 +02:00
Skia	37072e1640	Clean up some useless prints	2016-09-26 11:17:55 +02:00
Skia	7a2985b186	Add product top 10	2016-09-26 11:17:55 +02:00
Skia	24d744ee9c	Merge branch 'krophil' into 'master' ... Krophil Few changes in css See merge request !7	2016-09-26 09:25:13 +02:00
Skia	4749c45c97	Merge branch 'sli' into 'master' ... Hided launderette slots and tokens for non authorized users and added is_office and is_launderette See merge request !8	2016-09-26 09:23:35 +02:00
klmp200	380f41445a	Modify property names	2016-09-22 13:07:22 +02:00
klmp200	e250acf82d	Used settings for office and launderette	2016-09-22 13:00:00 +02:00
Skia	ffd4dac2e2	Allow club staff to delete their sellings	2016-09-22 12:52:15 +02:00
Skia	ae6a613f9a	Add promo_17.png	2016-09-21 15:41:12 +02:00
Skia	9e4e9597d1	Add the merge user function	2016-09-21 14:09:26 +02:00
klmp200	748ad1c5c2	Fixed some mistakes	2016-09-21 14:01:44 +02:00
klmp200	2d16b9c296	Hided launderette slots and tokens for non authorized users and added is_office and is_launderette	2016-09-21 13:33:02 +02:00
Skia	f1e54439e1	Small stats fix	2016-09-21 12:19:34 +02:00
Skia	324bd69312	Small templates fixes	2016-09-20 20:38:12 +02:00
Krophil	1d9c058132	Revert "radius removed" ... This reverts commit 26a1300417.	2016-09-20 17:12:09 +02:00
Krophil	62c4036dee	radius removed	2016-09-20 13:22:05 +02:00
Krophil	b11c5bbd1d	Merging	2016-09-20 13:19:44 +02:00
Skia	1e0904b48e	Merge branch 'sli' into 'master' ... Quick fix to hide account number in profile page when not owner user or root Faut vite cacher les numéros de compte des gens à qui ils n'apartiennent pas, sinon c'est la faille de sécu D: See merge request !6	2016-09-19 20:43:33 +02:00
Skia	5b83aff351	Small UI fix	2016-09-19 20:40:38 +02:00
Skia	5ba2ab925d	Add godfathers	2016-09-19 20:29:43 +02:00
klmp200	584025acf0	Quick fix to hide account number in profile page when not owner user or root	2016-09-18 22:50:10 +02:00
Skia	35d811317c	Add top 100 to counters	2016-09-15 11:07:03 +02:00
Skia	6aaeb7cdc9	Rename membership to memberships	2016-09-15 11:06:51 +02:00
Skia	6cf253365b	Add cash register summary view	2016-09-13 02:04:49 +02:00
Skia	6cacfb8d8d	Add counter activity	2016-09-12 17:34:33 +02:00
Skia	54444b31ba	Some template improvements	2016-09-11 19:00:12 +02:00
Skia	7aec32cef0	Some quick improvement on account view	2016-09-09 20:38:27 +02:00
Skia	5e26e5bde7	Merge branch 'sli'	2016-09-09 19:56:48 +02:00
Skia	5b5006892d	Make sellings for clubs	2016-09-09 16:23:35 +02:00
Skia	90e47c9d7d	Add a restriction on the counter login view to authorize only the sellers	2016-09-09 01:54:26 +02:00
klmp200	2f7dc9ec19	Used lambda function in user detail	2016-09-08 04:15:34 +02:00
klmp200	41d5a02d77	Fixed account order and detail account view	2016-09-08 03:38:28 +02:00
klmp200	8d060af46c	Removed wierd hack	2016-09-08 03:21:39 +02:00
klmp200	bca8dc039a	Added macros for slots and tokens display	2016-09-07 23:06:38 +02:00
klmp200	61c77a7877	Added address on profile	2016-09-07 02:07:01 +02:00
klmp200	c0296b9ada	Added slots on user profile	2016-09-07 01:51:34 +02:00