Commit Graph

  • 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
  • 7aec32cef0 Some quick improvement on account view Skia 2016-09-09 20:38:27 +02:00
  • 5e26e5bde7 Merge branch 'sli' Skia 2016-09-09 19:56:48 +02:00
  • 5b5006892d Make sellings for clubs Skia 2016-09-08 03:29:49 +02:00
  • 90e47c9d7d Add a restriction on the counter login view to authorize only the sellers Skia 2016-09-09 01:54:26 +02:00
  • 2f7dc9ec19 Used lambda function in user detail klmp200 2016-09-08 04:15:34 +02:00
  • 41d5a02d77 Fixed account order and detail account view klmp200 2016-09-08 03:38:28 +02:00
  • 8d060af46c Removed wierd hack klmp200 2016-09-08 03:21:39 +02:00
  • 4c2bf9cbf9 Launderette and product list fixes Skia 2016-09-08 02:09:17 +02:00
  • bca8dc039a Added macros for slots and tokens display klmp200 2016-09-07 23:06:38 +02:00
  • 61c77a7877 Added address on profile klmp200 2016-09-07 02:07:01 +02:00
  • c0296b9ada Added slots on user profile klmp200 2016-09-07 01:51:34 +02:00
  • a64b10776e Monthly user account klmp200 2016-09-06 21:47:15 +02:00
  • 78bf4b7b84 Fixed markdown api issue klmp200 2016-09-06 18:43:39 +02:00
  • d23e07363d Fix settings Skia 2016-09-04 19:26:50 +02:00
  • b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin Skia 2016-09-04 19:24:53 +02:00
  • 976ae09e55 Fix subscriptions with Sith account Skia 2016-09-04 18:34:34 +02:00
  • 4503fae287 Merge branch 'sli' into 'master' Skia 2016-09-04 16:54:30 +02:00
  • 80549c7a33 Fixed get_age klmp200 2016-09-04 16:24:31 +02:00
  • e1ce661a04 Improvements in counter admin templates Skia 2016-09-04 15:49:25 +02:00
  • d93dda1c0e Merge branch 'sli' into 'master' Skia 2016-09-04 15:00:16 +02:00
  • b0215e7445 Organized settings klmp200 2016-09-04 14:56:47 +02:00
  • 5ca8a22123 Fixed Settings klmp200 2016-09-04 14:19:56 +02:00
  • 25dea832be Display bar list with "openness" Skia 2016-09-04 14:17:49 +02:00
  • 8328e668bd Fixed old database bug in dev env klmp200 2016-09-02 21:24:10 +02:00
  • c62d3f4f4a Add old membership views Skia 2016-09-02 21:21:57 +02:00
  • c5fd9d0076 Small template fixes Skia 2016-09-02 19:31:47 +02:00
  • a0b1fa32e7 Fix subscription form Skia 2016-09-02 12:29:50 +02:00
  • bae34c4b1c Fix double user creation Skia 2016-09-02 09:47:33 +02:00
  • 29f565f514 Improve club templates Skia 2016-09-02 09:23:21 +02:00
  • b2df8fbf18 Fix LoginForm Skia 2016-09-01 17:50:13 +02:00
  • 3239a2e481 Fix counter if no date of birth Skia 2016-09-01 16:55:43 +02:00
  • d27f62dca9 Small fixes Skia 2016-09-01 16:43:21 +02:00
  • f7e3251ae5 Right fix and translation Skia 2016-09-01 11:27:00 +02:00
  • a4c5d48159 Some bug fixes Skia 2016-09-01 10:00:31 +02:00
  • 1f31d3b56f Send a mail when someone is subscribed Skia 2016-08-31 18:40:17 +02:00
  • 6af16cc893 Some basic templating Skia 2016-08-31 17:18:21 +02:00
  • 37d303634c Fix form with files Skia 2016-08-31 15:29:16 +02:00
  • a47cca1b1e Very small CSS improvement Skia 2016-08-31 04:08:28 +02:00
  • 0db7180d43 Do some user profile templating Skia 2016-08-31 04:04:28 +02:00
  • 55ea2ac763 Change link color Skia 2016-08-31 03:32:55 +02:00
  • 4a29a431af Display user amount without the account page Skia 2016-08-31 03:25:26 +02:00
  • f66b999f24 Improve login form Skia 2016-08-31 02:43:49 +02:00
  • fcfbfb3a0b Small file fix Skia 2016-08-31 02:05:04 +02:00
  • cb90ab8e57 Fix link to old site Skia 2016-08-30 17:41:42 +02:00
  • b21d9f6ff2 Add price for subscriptions Skia 2016-08-30 17:33:45 +02:00
  • 9cfdf4798d Fix OperationEditView Skia 2016-08-29 20:13:53 +02:00
  • e8713b3c22 Merge remote-tracking branch 'origin/api' Skia 2016-08-29 19:50:38 +02:00
  • fe2438ef0c Fix subscription right and typo Skia 2016-08-29 19:48:29 +02:00