473 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Skia	0e788dd876	Small refactoring	2016-11-23 11:46:45 +01:00
Skia	0e0e57458f	Improve SAS UX	2016-11-23 11:46:45 +01:00
Skia	7dff98d853	Small template improvements	2016-11-23 11:46:45 +01:00
Skia	f900db0dd2	Make SAS translations	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	e681cc65fe	Add SAS moderation tool	2016-11-23 11:46:45 +01:00
Skia	157b1e4c78	Add file moderation tool	2016-11-23 11:46:45 +01:00
Skia	5ea41de91d	WIP SAS	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	02be5e1629	Protect query on Eboutic to prevend double basket validation	2016-11-22 17:04:12 +01:00
Skia	cfbd610305	Revert "Merge branch 'fond-gala' into 'master'" ... This reverts merge request !25	2016-11-21 14:10:29 +01:00
Skia	98d47727e0	Merge branch 'fond-gala' into 'master' ... Add background for gala 2016 See merge request !25	2016-11-13 23:38:13 +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
Skia	11c263b6e7	Hotfix: better handle atomicity in eboutic basket validation	2016-11-10 00:35:13 +01:00
Skia	9f4f3bf436	Fix CI	2016-11-08 19:27:04 +01:00
Skia	e9c19438d4	Fix tests and CI	2016-11-08 19:07:25 +01:00
Skia	321dead0de	Translation updates, and make the binary compiled translation file ignored	2016-11-08 18:56:57 +01:00
guillaume-renaud	57b663c4c5	counter inactive state with settings variable, traduction file problem fixed	2016-11-08 18:48:27 +01:00
guillaume-renaud	7f6424d51e	Fix the number of minutes for a counter to be inactive to 10	2016-11-08 18:47:50 +01:00
guillaume-renaud	0d6b93d085	Add inactive state for counters	2016-11-08 18:47:40 +01:00
guillaume-renaud	be7e0401dd	Fix the number of minutes for a counter to be inactive to 10	2016-11-08 18:42:31 +01:00
guillaume-renaud	63f10c13d4	Add inactive state for counters	2016-11-08 18:42:12 +01:00
Skia	ba6e2c3712	Merge branch 'sli' into 'master' ... Download sellings as csv See merge request !24	2016-11-08 15:00:58 +01:00
klmp200	2dd2189314	Download sellings as csv	2016-11-08 14:57:09 +01:00
Skia	fa57d6cd63	Merge branch 'diagramUpdate' into 'master' ... Diagram update See merge request !23	2016-11-07 23:23:14 +01:00
Krophil	4527407b93	final correction	2016-11-07 01:53:32 +01:00
Krophil	9d8d86dd47	Correction on graphs	2016-11-07 01:53:32 +01:00
Krophil	66b4f06c34	graphs corrected	2016-11-07 01:53:32 +01:00
Krophil	fa98339bcd	new diagrams added	2016-11-07 01:53:32 +01:00
Skia	7e71ffcb75	Merge branch 'sli' into 'master' ... Fix company display for operation creation See merge request !22	2016-11-06 23:38:42 +01:00
klmp200	5d5f2522c4	Fix company display for operation creation	2016-11-06 23:34:38 +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
klmp200	d0cd8a8997	Fix the contributing fix	2016-11-04 00:45:10 +01:00
klmp200	b6966c9502	Add number of places on ebticket	2016-11-04 00:43:28 +01:00
klmp200	ea0eb89410	Edit CONTRIBUTING instructions	2016-11-04 00:38:49 +01:00
Krophil	c0c8b295ba	Update CONTRIBUTING.md	2016-11-03 19:58:58 +01:00
Krophil	2f8b069118	Update CONTRIBUTING.md	2016-11-03 19:57:41 +01:00
Skia	ea85d26cdd	Almost revert "Add link to create club in rootplace" ... Keep the links, but revert and fix the translation file This reverts commit 029bc7cc7c.	2016-11-03 11:52:04 +01:00
Skia	9cfc029fb2	Permission fix	2016-10-27 18:39:40 +02:00