133 Commits

Author	SHA1	Message	Date
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	d6138a7a0c	Make the etickets	2016-10-03 19:30:05 +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	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
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