167 Commits

Author	SHA1	Message	Date
Krophil	2048f27d58	New temporary design	2017-05-10 10:49:34 +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
Krophil	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	a12b772587	Add some Eboutic tests	2017-05-01 19:39:28 +02:00
Skia	423313f008	Update stock translations	2017-04-25 09:41:05 +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
klmp200	9f2566a244	Fix continuous integration	2017-03-30 22:18:03 +02:00
klmp200	493d48bcca	Pagination length in settings	2017-03-13 23:33:43 +01:00
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
klmp200	92bc6cf96f	Better club roles in settings	2017-02-26 18:04:58 +01:00
klmp200	b02d72eab4	Fix debug-toolbar with jinja	2017-02-26 17:00:09 +01:00
Skia	59dfcbd567	Merge branch 'forum' into 'master' ... Forum See merge request !49	2017-02-24 03:08:07 +01:00
Skia	d3514e85f4	Fix settings to work with toolbar	2017-02-24 01:52:26 +01:00
Skia	a4984317e9	Add Django debug toolbar	2017-02-24 01:52:22 +01:00
Skia	318c9ff9ad	Add trigger to update Whoosh index on User update	2017-02-15 22:01:33 +01:00
Skia	4cc57c183e	Add some better right management to forum	2017-01-28 20:58:54 +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	147809bb5d	Some great weekmail improvements	2017-01-15 22:58:38 +01:00
Skia	0aef7656b8	Add quick notifications prototype	2017-01-15 22:58:37 +01:00
Skia	a826fd40a3	Small update on last operations view	2017-01-13 13:13:31 +01:00
guillaume-renaud	29fb0af893	Addition of the stock parameter to the counter admin list	2017-01-05 11:00:08 +01:00
guillaume-renaud	33c7e7db9f	addition of Stock app, model, templates, urls	2017-01-05 11:00:08 +01:00
Skia	114272df2f	Add simple club stats	2017-01-04 17:38:54 +01:00
klmp200	d685e9ba29	Election bdd + first view	2016-12-25 19:52:14 +01:00
Skia	b79c77f268	Add notification with a fresh new	2016-12-23 20:11:27 +01:00
Skia	168622a04d	Add com app with first parametric texts	2016-12-21 02:38:21 +01:00
Skia	13785fd520	Prevent users that have never subscribed to subscribe on Eboutic	2016-12-20 23:27:54 +01:00
Skia	5b95299bde	Add Whoosh index	2016-12-20 14:46:08 +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	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	d92a706920	Refactor notifications	2016-12-10 00:06:17 +01:00
Skia	80fa99d2ac	Add notification	2016-12-08 19:47:28 +01:00
Skia	e681cc65fe	Add SAS 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
guillaume-renaud	57b663c4c5	counter inactive state with settings variable, traduction file problem fixed	2016-11-08 18:48:27 +01:00
Skia	59f5917b8c	Fix Page locking	2016-11-05 13:37:39 +01:00
klmp200	2daaf992f2	Add groups, allow to ban users from counters and from buying alcohol	2016-10-16 03:45:06 +02:00
Skia	2e7e78b8ce	Add last ops view to the bars	2016-09-28 11:09:54 +02:00
Skia	9e4e9597d1	Add the merge user function	2016-09-21 14:09:26 +02:00
Skia	f29e5ecabb	Fix static files for dev	2016-09-14 13:46:17 +02:00
Skia	6cf253365b	Add cash register summary view	2016-09-13 02:04:49 +02:00
Skia	b63923d956	Refactor settings	2016-09-12 14:04:50 +02:00
Skia	54444b31ba	Some template improvements	2016-09-11 19:00:12 +02:00
Skia	5b5006892d	Make sellings for clubs	2016-09-09 16:23:35 +02:00
Skia	d23e07363d	Fix settings	2016-09-04 19:26:50 +02:00
Skia	e1ce661a04	Improvements in counter admin templates	2016-09-04 15:50:43 +02:00
Skia	d93dda1c0e	Merge branch 'sli' into 'master' ... Fixed old database bug in dev env See merge request !2	2016-09-04 15:00:16 +02:00
klmp200	b0215e7445	Organized settings	2016-09-04 14:56:47 +02:00
klmp200	5ca8a22123	Fixed Settings	2016-09-04 14:19:56 +02:00
Skia	25dea832be	Display bar list with "openness"	2016-09-04 14:17:49 +02:00
klmp200	8328e668bd	Fixed old database bug in dev env	2016-09-02 21:24:10 +02:00
Skia	c4b1494eee	Update settings	2016-08-29 03:34:43 +02:00
Skia	325da79e45	Add support for subscription typed products in eboutic	2016-08-29 03:02:13 +02:00
Skia	dfb13c37f2	Add INSERT to old DB for subscriptions and users	2016-08-29 02:19:29 +02:00
Skia	a4df1ae9a5	Add language chooser	2016-08-24 19:11:09 +02:00
Skia	7e90e657a7	Add ajax-select app and improve some templates	2016-08-19 23:24:23 +02:00
Skia	05bd177a9d	Migrate invoices and lot of eboutic improvements	2016-08-18 19:52:20 +02:00
Skia	84364d9018	Improve counter app and migrate products/producttypes/refillings/sellings	2016-08-18 03:04:50 +02:00
Skia	66fdf6cbf7	Migrate and improve subscriptions	2016-08-14 19:28:14 +02:00
Skia	a033c4dfd2	Improve launderette rights to match with launderette club	2016-08-13 16:39:09 +02:00
Skia	43b709bfd5	Make file modale chooser and complete user profile	2016-08-11 04:30:24 +02:00
Skia	a8858fa781	Add home for users and clubs	2016-08-10 16:23:12 +02:00
Skia	792d66da33	Add nice whole file support	2016-08-10 05:48:06 +02:00
Skia	6fbf607492	Fix settings	2016-08-08 00:35:35 +02:00
klmp200	c2ccf63021	Added counters in api	2016-08-07 20:45:06 +02:00
klmp200	feb7b4689b	First steps with the api	2016-08-07 20:45:06 +02:00
Skia	d824d0d928	Uppercase some choices in settings	2016-08-07 20:06:47 +02:00
Skia	1529af32c5	Add token handling form in launderette	2016-08-06 15:20:38 +02:00
Skia	aa17c44bcc	Add location when subscribing	2016-08-05 00:51:04 +02:00
Skia	44a6621aac	Update settings	2016-08-04 13:36:33 +02:00
Skia	70e723337d	Update settings	2016-08-02 22:32:13 +02:00
Skia	a01fc63a82	Begin launderette	2016-07-28 20:05:56 +02:00
Skia	4c62816816	Add rights to Product and Product Type views	2016-07-28 16:11:18 +02:00
Skia	c099f1c5d7	Make eboutic working	2016-07-26 18:28:36 +02:00
Skia	d837b624e2	Implement parts of the ET API	2016-07-24 18:26:03 +02:00
Skia	1f3e186e27	Update counters and some views	2016-07-21 20:03:56 +02:00
Skia	28aa143f39	Improve Operation numbering in accounting	2016-07-20 18:48:18 +02:00
Skia	1b4324f38f	Add french translation file	2016-07-18 17:47:43 +02:00
Skia	593050d9e2	Improve greatly the counter right management	2016-07-18 00:47:56 +02:00
Skia	c099cc489b	Improve refilling form to handle the checks and the banks	2016-07-17 11:38:19 +02:00
Skia	171303cfcc	Delete settings.py	2016-07-14 17:55:02 +02:00
Skia	e29e94711a	Move settings to settings_sample	2016-07-14 16:15:38 +02:00
Skia	109e23cee0	Update report, again	2016-06-20 00:01:26 +02:00
Skia	6c48b7c718	Add Selling and Refilling classes	2016-05-31 19:32:15 +02:00
Skia	6e05207e84	"Finish" the accounting views	2016-05-03 08:50:54 +02:00
Skia	5fcb3e1412	Add basic accounting views	2016-04-20 03:01:14 +02:00
Skia	c6a3559bf5	Improve accounting model according to current site's one	2016-04-20 02:07:01 +02:00
Skia	9a135ade50	Refactor counters view a bit, and protect ClickView if no barman is logged	2016-04-19 19:58:57 +02:00
Skia	25c1e6dc58	Add the basket handling in the click view of the counter ... Now there is still to handle the validation by generating the appropriate invoice(s)	2016-04-19 01:54:55 +02:00
Skia	c1a151d754	Add timeout for barmen	2016-04-12 13:08:37 +02:00
Skia	52153438ac	Rename and refactor some settings	2016-03-31 10:36:00 +02:00
Skia	5bcc94f992	Improve counters views	2016-03-29 10:30:48 +02:00