176 Commits

Author	SHA1	Message	Date
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
Skia	ffd4dac2e2	Allow club staff to delete their sellings	2016-09-22 12:52:15 +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	324bd69312	Small templates fixes	2016-09-20 20:38:12 +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	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
klmp200	41d5a02d77	Fixed account order and detail account view	2016-09-08 03:38:28 +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
klmp200	a64b10776e	Monthly user account	2016-09-06 22:13:48 +02:00
klmp200	78bf4b7b84	Fixed markdown api issue	2016-09-06 21:59:13 +02:00
Skia	b1f6754e6e	Refactor lots of tabed templates, and create TabedViewMixin	2016-09-04 19:25:03 +02:00
Skia	e1ce661a04	Improvements in counter admin templates	2016-09-04 15:50:43 +02:00
Skia	25dea832be	Display bar list with "openness"	2016-09-04 14:17:49 +02:00
Skia	c5fd9d0076	Small template fixes	2016-09-02 19:31:47 +02:00
Skia	d27f62dca9	Small fixes	2016-09-01 16:43:21 +02:00
Skia	1f31d3b56f	Send a mail when someone is subscribed	2016-08-31 18:40:17 +02:00
Skia	6af16cc893	Some basic templating	2016-08-31 17:18:21 +02:00
Skia	37d303634c	Fix form with files	2016-08-31 15:29:16 +02:00
Skia	0db7180d43	Do some user profile templating	2016-08-31 04:04:28 +02:00
Skia	4a29a431af	Display user amount without the account page	2016-08-31 03:25:26 +02:00
Skia	fe2438ef0c	Fix subscription right and typo	2016-08-29 19:48:29 +02:00
Skia	3667a12174	Fix webcam upload	2016-08-29 04:58:25 +02:00
Skia	f0499cdb26	Make a better index page	2016-08-29 03:25:47 +02:00
Skia	4215baec26	Make the bar menu	2016-08-29 03:14:53 +02:00
Skia	325da79e45	Add support for subscription typed products in eboutic	2016-08-29 03:02:13 +02:00
Skia	e61b5e7690	Small fixes	2016-08-29 01:31:58 +02:00
Skia	fb8e7ceb5b	Some templating and migration fix	2016-08-24 21:49:46 +02:00
Skia	078b63d970	Migrate accounting	2016-08-24 19:50:22 +02:00
Skia	a4df1ae9a5	Add language chooser	2016-08-24 19:11:09 +02:00
Skia	8e3eb1e2bf	Some templating and add webcam support for profile editing	2016-08-22 02:56:27 +02:00
Skia	dbf0653baf	Add support for product buying groups + many cosmetics and form pimping	2016-08-20 22:12:46 +02:00
Skia	62745e89fa	User profile template fix	2016-08-20 13:57:27 +02:00
Skia	84efcd87e7	Translate datepicker and add age limit to products	2016-08-20 02:55:48 +02:00
Skia	7e90e657a7	Add ajax-select app and improve some templates	2016-08-19 23:24:23 +02:00
Skia	f1105d704e	Add basic search bar	2016-08-19 02:53:44 +02:00
Skia	0689f864d2	Migrate permanencies and add user stats view	2016-08-18 21:32:18 +02:00
Skia	b69c3a6792	Improve and fix user accounts	2016-08-18 21:06:10 +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	d4f87e7581	Improve file popup	2016-08-15 21:04:06 +02:00
Skia	66fdf6cbf7	Migrate and improve subscriptions	2016-08-14 19:28:14 +02:00
Skia	e1474c7a74	Add is_root property to user	2016-08-14 04:35:08 +02:00
Skia	792563999b	Allow root to reset user password	2016-08-13 17:15:45 +02:00
Skia	a033c4dfd2	Improve launderette rights to match with launderette club	2016-08-13 16:39:09 +02:00
Skia	c0a66f9a38	Finish profile of users	2016-08-13 05:33:09 +02:00
Skia	5113d8fda5	Small user profile fix	2016-08-11 04:57:07 +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	830c15a585	Better right handling in files	2016-08-10 14:48:18 +02:00
Skia	792d66da33	Add nice whole file support	2016-08-10 05:48:06 +02:00
Skia	ad36c1c6f6	Better handle 403 with next argument	2016-08-07 20:36:06 +02:00
Skia	31ecb50c1d	Move user account view into core	2016-08-05 09:52:19 +02:00
Skia	db712c86b8	Fix tests	2016-08-02 22:20:06 +02:00
Skia	7002139176	Finish the launderette click view	2016-08-02 00:32:55 +02:00
Skia	2cf39671e2	Make some more validation on the token click form	2016-08-01 19:59:22 +02:00
Skia	ba48adab6d	Improve launderette plannings and admin part	2016-07-29 13:00:32 +02:00
Skia	a01fc63a82	Begin launderette	2016-07-28 20:05:56 +02:00
Skia	80f72df1de	Add product type management views	2016-07-27 20:05:45 +02:00
Skia	f230fbc135	Add product management views	2016-07-27 17:23:02 +02:00
Skia	4e6b592911	Fix eboutic	2016-07-26 19:58:36 +02:00
Skia	a0322fa931	Templating pages	2016-07-22 02:05:29 +02:00
Skia	1f3e186e27	Update counters and some views	2016-07-21 20:03:56 +02:00
Skia	724f3d8d6f	Templates and views	2016-07-21 12:09:57 +02:00
Skia	97ff4341a7	Translate most of the Sith	2016-07-19 19:03:16 +02:00
Skia	593050d9e2	Improve greatly the counter right management	2016-07-18 00:47:56 +02:00
Skia	e92a73dfb1	Add basic account view for user and refactor user tool bar	2016-07-17 12:38:02 +02:00
Skia	14595936e2	Some design	2016-07-17 11:37:52 +02:00
Skia	f600e174b1	CSS and templating, Sith begins to look nice	2016-07-16 16:35:45 +02:00
Skia	1396f2ca84	Improve accounting ease of use	2016-06-24 19:59:49 +02:00
Skia	356a2d2683	Refactor page handling	2016-05-31 13:00:52 +02:00
Skia	e75da927c3	Improve group views	2016-05-31 13:00:52 +02:00
Skia	27805640a1	Improve right handling for accounting	2016-05-09 11:49:01 +02:00
Skia	6ef39257ee	Fix user template	2016-05-03 09:01:54 +02:00
Skia	6e05207e84	"Finish" the accounting views	2016-05-03 08:50:54 +02:00
Skia	52153438ac	Rename and refactor some settings	2016-03-31 10:36:00 +02:00
Skia	debba55350	Add MetaGroup system	2016-03-29 12:45:10 +02:00
Skia	5bcc94f992	Improve counters views	2016-03-29 10:30:48 +02:00
Skia	21f1393097	Add basic counter model	2016-03-28 14:54:35 +02:00
Skia	c3fb581f97	Refactor a bit right handling	2016-03-22 17:46:26 +01:00
Skia	2e84ee7d4f	Fix subscription and improve views	2016-03-22 11:42:00 +01:00
Skia	d51ab088d8	Add first club views, this still sucks, particularly on the right managment	2016-02-02 16:34:36 +01:00
Skia	afc87888a6	Finish the move to Jinja2	2016-02-02 11:00:08 +01:00
Skia	03bc0973fe	WIP: Move to Jinja2	2016-02-01 17:35:55 +01:00
Skia	1f4c49ac49	Make a previsualization button in page edit	2016-01-11 09:56:42 +01:00