Commit Graph

1375 Commits

Author SHA1 Message Date
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
Skia
0d8bebcd80 Tiny template update 2016-10-10 18:43:40 +02:00
Skia
13265e6a0d Allow more control on the dates for cash summaries sums 2016-10-10 18:29:13 +02:00
Skia
31d62532be Merge branch 'sli' into 'master'
Add account number and suscription on counter



See merge request !15
2016-10-09 16:08:48 +02:00
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
Skia
c66d61ee85 Merge branch 'LoJ' into 'master'
Lo j : Addition of the user's club page

When a user check his profile, he can access a new tab "Clubs" to see his currents and olds Clubs

See merge request !14
2016-10-07 13:36:35 +02:00
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
0acc97fa90 Fix operation create view 2016-10-05 20:17:37 +02:00
Skia
63217b2ead Improve product display 2016-10-05 15:57:04 +02:00
Skia
7fdcb0c815 Finish labels in accounting 2016-10-05 15:54:11 +02:00
Skia
e169e4ff6f Update .gitlab-ci.yml, try to fix CI 2016-10-04 11:26:20 +02:00
Skia
64b4484620 Some templating 2016-10-04 00:41:08 +02:00
Skia
deeb2b5b6f Migrate and fix etickets 2016-10-04 00:32:07 +02:00
Skia
cd23fdf3ef Add missing eticket banner 2016-10-03 19:43:22 +02:00
Skia
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
Skia
a12f9dd53e Fix club sellings 2016-10-03 13:55:20 +02:00
Skia
2ef5a4d37b Runtime error fix 2016-09-30 18:43:53 +02:00
Skia
ca3b7fda5a Improve invoice call template 2016-09-29 18:34:58 +02:00
Skia
51f342a7d3 Add invoices calls 2016-09-29 18:19:58 +02:00
Skia
ddceb82abf Display uncategorized products 2016-09-29 16:19:05 +02:00
Skia
52184c4012 Merge branch 'sli' into 'master'
Godfathers deletion



See merge request !11
2016-09-29 15:12:19 +02:00
2c6f17063a Can delete Godfathers 2016-09-29 15:06:39 +02:00
Skia
db07b54ed1 Allow the counter admin to edit cash registers summaries 2016-09-29 14:54:03 +02:00
Skia
c2276dab2b Remove useless mixin 2016-09-29 12:53:09 +02:00
a008f34288 Fix bug where slots appears when slot expired 2016-09-28 17:22:34 +02:00
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00