Commit Graph

1302 Commits

Author SHA1 Message Date
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
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
4527407b93 final correction 2016-11-07 01:53:32 +01:00
9d8d86dd47 Correction on graphs 2016-11-07 01:53:32 +01:00
66b4f06c34 graphs corrected 2016-11-07 01:53:32 +01:00
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
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
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
d0cd8a8997 Fix the contributing fix 2016-11-04 00:45:10 +01:00
b6966c9502 Add number of places on ebticket 2016-11-04 00:43:28 +01:00
ea0eb89410 Edit CONTRIBUTING instructions 2016-11-04 00:38:49 +01:00
c0c8b295ba Update CONTRIBUTING.md 2016-11-03 19:58:58 +01:00
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
Skia
6251e38668 Tiny translation fix 2016-10-26 20:01:05 +02:00
Skia
7fe0964ae1 Merge branch 'sli' into 'master'
Add automatic mail when an eticket has been bought

See merge request !19
2016-10-26 19:03:05 +02:00
677c50a4b1 Add unknown event translation 2016-10-25 21:53:40 +02:00
bafa9ac10c Small fix for auto-mail about eticket 2016-10-25 18:25:59 +02:00
b00fc23fc4 Add automatic mail when an eticket has been bought 2016-10-21 17:47:56 +02:00
Skia
3e99f97b7a Merge branch 'sli' into 'master'
Add ban for alcohol



See merge request !17
2016-10-21 11:00:40 +02:00
Skia
933afd4fb7 Update eboutic main template 2016-10-19 21:30:41 +02:00
224374f5e8 More readable user_account 2016-10-19 01:57:54 +02:00
029bc7cc7c Add link to create club in rootplace 2016-10-18 23:36:26 +02:00
c40171fe86 Clean permission check for alcohol and counter ban 2016-10-18 23:02:53 +02:00
Skia
47c01d6d10 Fix request in cash summary list 2016-10-18 14:48:47 +02:00
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +02:00
132bae72a7 Fix club account name display for clubs 2016-10-16 00:23:13 +02:00
c9005e2c31 Fix for etickets 2016-10-15 19:58:51 +02:00
ba86219b74 Translations for alcool ban 2016-10-15 19:58:32 +02:00
257cb9cfe7 Add ban for alcohol 2016-10-15 02:33:38 +02:00
Skia
a0319887c8 Merge branch 'sli' into 'master'
Deny date of birth, first and last name modification for non board or root user



See merge request !16
2016-10-13 23:24:12 +02:00
178a4af196 Add lazy way to make an user property editable once only 2016-10-13 22:58:26 +02:00
579c25d63a Deny date of birth, first and last name modification for non board or root user 2016-10-13 22:32:13 +02:00
Skia
5931351c0a Another tiny template improvement 2016-10-12 12:32:04 +02:00