346 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Skia	9e4e9597d1	Add the merge user function	2016-09-21 14:09:26 +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
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	d88da0abd8	Make translations for godfathers	2016-09-19 20:32:30 +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	95b22cafe0	Template fixes	2016-09-15 11:51:05 +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	3d9dfbc43a	Fix gitignore	2016-09-14 13:46:43 +02:00
Skia	f29e5ecabb	Fix static files for dev	2016-09-14 13:46:17 +02:00
Skia	64761a83ed	Don't come with MySQL by default	2016-09-14 13:19:56 +02:00
Skia	6cf253365b	Add cash register summary view	2016-09-13 02:04:49 +02:00
Skia	b0ce448ec7	Add missing translation	2016-09-12 17:38:35 +02:00
Skia	09f61eb61c	Only root can create a new launderette	2016-09-12 17:35:25 +02:00
Skia	6cacfb8d8d	Add counter activity	2016-09-12 17:34:33 +02:00
Skia	c748bb8450	Fix slow selling page in clubs	2016-09-12 17:34:17 +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	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
Skia	4c2bf9cbf9	Launderette and product list fixes	2016-09-08 02:09:17 +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	d23e07363d	Fix settings	2016-09-04 19:26:50 +02:00
Skia	b1f6754e6e	Refactor lots of tabed templates, and create TabedViewMixin	2016-09-04 19:25:03 +02:00
Skia	976ae09e55	Fix subscriptions with Sith account	2016-09-04 18:35:20 +02:00
Skia	4503fae287	Merge branch 'sli' into 'master' ... Fixed get_age See merge request !3	2016-09-04 16:54:30 +02:00
klmp200	80549c7a33	Fixed get_age	2016-09-04 16:26:02 +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	c62d3f4f4a	Add old membership views	2016-09-02 21:21:57 +02:00
Skia	c5fd9d0076	Small template fixes	2016-09-02 19:31:47 +02:00
Skia	a0b1fa32e7	Fix subscription form	2016-09-02 12:29:50 +02:00
Skia	bae34c4b1c	Fix double user creation	2016-09-02 09:47:33 +02:00
Skia	29f565f514	Improve club templates	2016-09-02 09:23:21 +02:00