Commit Graph

  • ea85d26cdd Almost revert "Add link to create club in rootplace" Skia 2016-11-03 11:52:04 +01:00
  • 9cfc029fb2 Permission fix Skia 2016-10-27 18:39:40 +02:00
  • 6251e38668 Tiny translation fix Skia 2016-10-26 20:01:05 +02:00
  • 7fe0964ae1 Merge branch 'sli' into 'master' Skia 2016-10-26 19:03:05 +02:00
  • 677c50a4b1 Add unknown event translation klmp200 2016-10-25 21:53:40 +02:00
  • bafa9ac10c Small fix for auto-mail about eticket klmp200 2016-10-25 18:25:59 +02:00
  • b00fc23fc4 Add automatic mail when an eticket has been bought klmp200 2016-10-21 13:09:46 +02:00
  • 3e99f97b7a Merge branch 'sli' into 'master' Skia 2016-10-21 11:00:40 +02:00
  • 933afd4fb7 Update eboutic main template Skia 2016-10-19 21:30:41 +02:00
  • 224374f5e8 More readable user_account klmp200 2016-10-19 01:57:54 +02:00
  • 029bc7cc7c Add link to create club in rootplace klmp200 2016-10-18 23:36:26 +02:00
  • c40171fe86 Clean permission check for alcohol and counter ban klmp200 2016-10-18 23:02:53 +02:00
  • 47c01d6d10 Fix request in cash summary list Skia 2016-10-18 14:48:47 +02:00
  • 2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol klmp200 2016-10-16 03:45:06 +02:00
  • 1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters klmp200 2016-10-16 02:47:21 +02:00
  • 132bae72a7 Fix club account name display for clubs klmp200 2016-10-16 00:23:13 +02:00
  • c9005e2c31 Fix for etickets klmp200 2016-10-15 19:58:51 +02:00
  • ba86219b74 Translations for alcool ban klmp200 2016-10-15 19:58:32 +02:00
  • 257cb9cfe7 Add ban for alcohol klmp200 2016-10-15 02:33:38 +02:00
  • a0319887c8 Merge branch 'sli' into 'master' Skia 2016-10-13 23:24:12 +02:00
  • 178a4af196 Add lazy way to make an user property editable once only klmp200 2016-10-13 22:58:26 +02:00
  • 579c25d63a Deny date of birth, first and last name modification for non board or root user klmp200 2016-10-13 22:32:13 +02:00
  • 5931351c0a Another tiny template improvement Skia 2016-10-12 12:32:04 +02:00
  • 0d8bebcd80 Tiny template update Skia 2016-10-10 18:43:40 +02:00
  • 13265e6a0d Allow more control on the dates for cash summaries sums Skia 2016-10-10 18:29:13 +02:00
  • 31d62532be Merge branch 'sli' into 'master' Skia 2016-10-09 16:08:48 +02:00
  • d285fbe04a Add account number and suscription on counter klmp200 2016-10-08 23:07:10 +02:00
  • c66d61ee85 Merge branch 'LoJ' into 'master' Skia 2016-10-07 13:36:35 +02:00
  • 5b50cc9598 Traduction's addition for user_clubs templates guillaume-renaud 2016-10-07 13:17:43 +02:00
  • 760b33728b Addition of the user's club tab as table guillaume-renaud 2016-10-05 20:06:16 +02:00
  • 1b63d58586 Addition of the user's club tab guillaume-renaud 2016-10-05 13:08:51 +02:00
  • 0acc97fa90 Fix operation create view Skia 2016-10-05 20:17:37 +02:00
  • 63217b2ead Improve product display Skia 2016-10-04 16:40:43 +02:00
  • 7fdcb0c815 Finish labels in accounting Skia 2016-10-05 15:54:00 +02:00
  • e169e4ff6f Update .gitlab-ci.yml, try to fix CI Skia 2016-10-04 11:26:20 +02:00
  • 64b4484620 Some templating Skia 2016-10-04 00:41:08 +02:00
  • deeb2b5b6f Migrate and fix etickets Skia 2016-10-04 00:32:07 +02:00
  • cd23fdf3ef Add missing eticket banner Skia 2016-10-03 19:43:22 +02:00
  • d6138a7a0c Make the etickets Skia 2016-10-03 19:30:05 +02:00
  • a12f9dd53e Fix club sellings Skia 2016-10-03 13:55:20 +02:00
  • 2ef5a4d37b Runtime error fix Skia 2016-09-30 18:43:53 +02:00
  • ca3b7fda5a Improve invoice call template Skia 2016-09-29 18:34:58 +02:00
  • 51f342a7d3 Add invoices calls Skia 2016-09-29 18:17:44 +02:00
  • ddceb82abf Display uncategorized products Skia 2016-09-29 16:19:05 +02:00
  • 52184c4012 Merge branch 'sli' into 'master' Skia 2016-09-29 15:12:19 +02:00
  • 2c6f17063a Can delete Godfathers klmp200 2016-09-29 15:04:43 +02:00
  • db07b54ed1 Allow the counter admin to edit cash registers summaries Skia 2016-09-29 14:54:03 +02:00
  • c2276dab2b Remove useless mixin Skia 2016-09-29 12:53:09 +02:00
  • a008f34288 Fix bug where slots appears when slot expired klmp200 2016-09-28 17:22:34 +02:00
  • 2e7e78b8ce Add last ops view to the bars Skia 2016-09-28 11:07:32 +02:00
  • fd482195f8 Merge branch 'sli' into 'master' Skia 2016-09-28 10:59:13 +02:00
  • 8ef45bf03c Rename is_token to check_token klmp200 2016-09-28 10:53:27 +02:00
  • 1c6df0909b Fixes double check on board member in club view klmp200 2016-09-28 10:46:06 +02:00
  • 17b098ca2a Fixed lookup for loged barmen klmp200 2016-09-27 22:57:06 +02:00
  • 17b483bd21 AutoCompleteSelectField on clubs klmp200 2016-09-27 21:05:57 +02:00
  • f152791d90 Merge branch 'sli' into 'master' Skia 2016-09-27 20:12:57 +02:00
  • 3c408551aa Remove nested exception for stats and added property on AnonymusUser klmp200 2016-09-27 16:56:30 +02:00
  • f7722ed564 Fixed permissions on stats klmp200 2016-09-27 16:44:12 +02:00
  • f22f2cbde6 Only club members can view counter's stats klmp200 2016-09-26 23:56:24 +02:00
  • 303db0bc7d Translation and explicit string Skia 2016-09-26 11:31:45 +02:00
  • a4ad7f0e85 Add token to counter to see pictures and to prevend misuses Skia 2016-09-26 11:17:00 +02:00
  • 37072e1640 Clean up some useless prints Skia 2016-09-26 11:16:14 +02:00
  • 7a2985b186 Add product top 10 Skia 2016-09-22 11:09:15 +02:00
  • 24d744ee9c Merge branch 'krophil' into 'master' Skia 2016-09-26 09:25:13 +02:00
  • 4749c45c97 Merge branch 'sli' into 'master' Skia 2016-09-26 09:23:35 +02:00
  • 380f41445a Modify property names klmp200 2016-09-22 13:07:22 +02:00
  • e250acf82d Used settings for office and launderette klmp200 2016-09-22 13:00:00 +02:00
  • ffd4dac2e2 Allow club staff to delete their sellings Skia 2016-09-22 12:52:15 +02:00
  • ae6a613f9a Add promo_17.png Skia 2016-09-21 15:40:56 +02:00
  • 9e4e9597d1 Add the merge user function Skia 2016-09-21 14:09:16 +02:00
  • 748ad1c5c2 Fixed some mistakes klmp200 2016-09-21 14:01:44 +02:00
  • 2d16b9c296 Hided launderette slots and tokens for non authorized users and added is_office and is_launderette klmp200 2016-09-21 13:33:02 +02:00
  • f1e54439e1 Small stats fix Skia 2016-09-21 12:19:34 +02:00
  • 324bd69312 Small templates fixes Skia 2016-09-20 20:38:12 +02:00
  • 1d9c058132 Revert "radius removed" Krophil 2016-09-20 17:12:09 +02:00
  • 521c2f2afb Merge branch 'krophil' of https://ae-dev.utbm.fr/ae/Sith into krophil Krophil 2016-09-20 13:23:36 +02:00
  • 62c4036dee radius removed Krophil 2016-09-19 11:20:37 +02:00
  • b11c5bbd1d Merging Krophil 2016-09-20 13:19:44 +02:00
  • 4ee858c130 README updated Krophil 2016-09-07 21:15:12 +02:00
  • 1e0904b48e Merge branch 'sli' into 'master' Skia 2016-09-19 20:43:33 +02:00
  • 5b83aff351 Small UI fix Skia 2016-09-19 20:35:43 +02:00
  • d88da0abd8 Make translations for godfathers Skia 2016-09-19 20:32:30 +02:00
  • 5ba2ab925d Add godfathers Skia 2016-09-19 20:29:43 +02:00
  • 26a1300417 radius removed Krophil 2016-09-19 11:20:37 +02:00
  • 584025acf0 Quick fix to hide account number in profile page when not owner user or root klmp200 2016-09-18 22:50:10 +02:00
  • 95b22cafe0 Template fixes Skia 2016-09-15 11:51:05 +02:00
  • 35d811317c Add top 100 to counters Skia 2016-09-15 11:07:03 +02:00
  • 6aaeb7cdc9 Rename membership to memberships Skia 2016-09-15 11:06:51 +02:00
  • 3d9dfbc43a Fix gitignore Skia 2016-09-14 13:46:43 +02:00
  • f29e5ecabb Fix static files for dev Skia 2016-09-14 13:46:17 +02:00
  • 64761a83ed Don't come with MySQL by default Skia 2016-09-14 13:19:56 +02:00
  • 6cf253365b Add cash register summary view Skia 2016-09-13 02:04:49 +02:00
  • b0ce448ec7 Add missing translation Skia 2016-09-12 17:38:35 +02:00
  • 09f61eb61c Only root can create a new launderette Skia 2016-09-12 17:35:25 +02:00
  • 6cacfb8d8d Add counter activity Skia 2016-09-12 17:34:33 +02:00
  • c748bb8450 Fix slow selling page in clubs Skia 2016-09-12 17:34:17 +02:00
  • b63923d956 Refactor settings Skia 2016-09-12 14:03:03 +02:00
  • 54444b31ba Some template improvements Skia 2016-09-11 19:00:12 +02:00
  • 07363c607b Few proposals in CSS Krophil 2016-09-08 00:10:36 +02:00
  • 1b728e3a8b README updated Krophil 2016-09-07 21:15:12 +02:00