Commit Graph

  • cb58b00b6e All: Apply Black coding rules klmp200 2018-10-04 21:29:19 +02:00
  • 0581c667de Club: blackify view file klmp200 2018-10-05 21:51:54 +02:00
  • 88d6f8dc8a CI: introduce black klmp200 2018-10-04 21:16:02 +02:00
  • d1d1ba4aff Merge branch 'clubs' into 'master' Soldat 2018-10-05 21:41:21 +02:00
  • 5a6c7aaadf clubs: un champ plus joli pour la short_description, crack vas être content klmp200 2018-10-04 00:15:47 +02:00
  • 9a9eb52768 Merge branch 'cotiz' into 'master' Soldat 2018-09-20 19:28:04 +02:00
  • cd7672f08c Change local for one day cotiz Soldat 2018-09-20 14:48:40 +02:00
  • 2fca548e15 Add 1 day cotiz Soldat 2018-09-20 14:30:35 +02:00
  • be36b7f38a com: fix birthdays query Skia 2018-09-19 11:37:16 +02:00
  • 09bde1bfdf Merge branch 'cotiz' into 'master' Krophil 2018-09-01 18:42:13 +02:00
  • 7a1b9bd412 compute_end count day by day now (not month by month like before) to allow 6 weeks cotiz Soldat 2018-09-01 17:45:13 +02:00
  • f78d8e1d95 change sub 2 month free to 6 weeks free Soldat 2018-08-31 18:41:06 +02:00
  • bef10c0fe3 Merge branch 'sli' into 'master' Sli 2018-07-07 00:19:22 +02:00
  • e3cb6d41f9 Add subscription for 2018 Euroks klmp200 2018-07-07 00:13:21 +02:00
  • 290f6ca883 Merge branch 'feature/captcha' into 'master' Skia 2018-07-06 11:35:03 +02:00
  • afe78ea634 Add captcha to registration form Grégoire Duvauchelle 2018-07-06 11:35:02 +02:00
  • b2abc78694 Merge branch 'new_django' into 'master' Sli 2018-06-12 15:07:09 +02:00
  • f1e8d55b41 Fix subscription bug for old subscribers on subscription page klmp200 2018-06-12 15:00:51 +02:00
  • 7322882002 Merge branch 'new_django' into 'master' Sli 2018-06-10 18:49:44 +02:00
  • 5c4a16d14c Fix user pictures display klmp200 2018-06-10 18:43:39 +02:00
  • 1cfc4f8092 Merge branch 'new_django' into 'master' Sli 2018-06-10 16:37:57 +02:00
  • 08de5dfe6a Migration to django 1.11 klmp200 2018-04-19 01:13:05 +02:00
  • 39119f586a Merge branch 'sli' into 'master' Sli 2018-06-10 16:16:37 +02:00
  • a0a86ef8e1 Allow BDF's members to see subscriptions on users klmp200 2018-06-10 16:09:21 +02:00
  • 90e1e7c1bb Add promo logo klmp200 2018-06-10 16:09:04 +02:00
  • c5be9b5597 Add promo 19's logo klmp200 2018-06-10 15:49:53 +02:00
  • f2106a37a3 counter: fix tests Skia 2018-06-07 19:57:56 +02:00
  • eae7825260 core/static: fix Matmat results with long names Skia 2018-06-07 00:10:33 +02:00
  • 61d34b3a09 core, matmat: fix search form Skia 2018-06-06 00:25:27 +02:00
  • fecb1ae902 core/static: fix Markdown code vertical-align Skia 2018-06-05 00:49:43 +02:00
  • be1dc62848 core: make a nice user profile Skia 2018-06-05 00:18:07 +02:00
  • 9146251642 Prevent generation of useless migrations upon settings change Skia 2018-04-26 20:18:24 +02:00
  • 01240ce75e Merge branch 'bugfix' into 'master' Sli 2018-04-29 14:12:22 +02:00
  • 3fe4e64098 Small modification in hope to fix communication screen deformations gnikwo 2018-04-29 13:53:55 +02:00
  • 23291ac60e Merge branch 'bugfix' into 'master' Skia 2018-04-26 19:50:49 +02:00
  • 83f38e617b Forum Form optimisation klmp200 2018-04-26 19:38:39 +02:00
  • 443616a762 Forum permission fix and form display klmp200 2018-04-26 15:20:45 +02:00
  • afa9bd8735 Fix Poster form klmp200 2018-04-26 14:48:29 +02:00
  • 0cc3707059 subscription/tests: remove silly print Skia 2018-04-19 01:10:06 +02:00
  • bf57329bd8 sas/templates: Improve generation time display Skia 2018-04-18 23:49:12 +02:00
  • 4d36a961db core/models: improve repair_fs output Skia 2018-04-18 23:02:19 +02:00
  • 874dfa6cc3 sas/views: change categories ordering Skia 2018-04-18 22:58:03 +02:00
  • b5aee62558 core/models: don't always repair every single file Skia 2018-04-18 22:54:30 +02:00
  • 52832eed4d Merge branch 'skia' into 'master' Skia 2018-04-18 22:19:17 +02:00
  • b2306b62d6 core/models: better handle broken files Skia 2018-04-05 21:16:01 +02:00
  • c7b918115d core/models: change thumbnails and compressed SithFile directories Skia 2018-04-05 20:51:05 +02:00
  • 0d3c34c155 core/models: refactor SithFile moving and add methods to manage filesystem Skia 2018-03-20 22:09:27 +01:00
  • e9e51d34d3 subscription: fix compute_start Skia 2018-04-16 14:46:13 +02:00
  • d619e0cd9b Merge branch 'weekmail' into 'master' Skia 2018-03-26 10:12:14 +02:00
  • 847b8823af weekmail: reduce image weight Skia 2018-03-26 09:56:48 +02:00
  • a84d54accb Change weekmail images and colors Soldat 2018-03-23 22:44:18 +01:00
  • 41c83b17df Merge branch 'nabos' into 'master' Sli 2018-03-18 22:45:11 +01:00
  • cbd333eb47 Changed default display time for posters and permissions on it klmp200 2018-03-18 22:28:25 +01:00
  • d83bb20547 core: small update on footnotes style Skia 2018-02-22 22:56:15 +01:00
  • 606f1af4d5 forum: add favorite topics Skia 2018-02-22 22:19:17 +01:00
  • f47f846d26 forum: add button CSS class Skia 2018-02-22 22:14:26 +01:00
  • 80bffd00d1 Merge branch 'bugfix' into 'master' Sli 2017-12-22 12:59:51 +01:00
  • 43b4579a98 Fix datetime forms for posters klmp200 2017-12-22 12:53:43 +01:00
  • c014a6e379 Fix translations klmp200 2017-12-22 12:22:37 +01:00
  • b7483513be Fix for mailing lists klmp200 2017-12-22 12:06:23 +01:00
  • 10dfb2c122 Merge branch 'nabos' into 'master' Skia 2017-12-21 18:25:56 +01:00
  • a2ee017668 club/views: fix call to parent's get_context_data in PosterListView Skia 2017-12-21 18:02:08 +01:00
  • 22e277d4f7 merged migrations gnikwo 2017-12-21 16:15:11 +01:00
  • 903f07ecbd Added screen list on poster + Added unmoderated poster artefact + discussions fixes gnikwo 2017-12-21 12:25:07 +01:00
  • 72d2862e3e Posters now working + notifications for com admin klmp200 2017-12-16 20:48:18 +01:00
  • 5132eb49e4 Merge branch 'elections' into 'master' Sli 2017-12-12 14:58:02 +01:00
  • 5915de9603 It's better to delete an object in delete klmp200 2017-12-12 14:52:08 +01:00
  • 73bd8b0fd3 Merge branch 'revert-3c2f48b7' into 'master' Krophil 2017-12-12 13:12:10 +01:00
  • d2c278ba0e Revert "Merge branch 'pere200' into 'master'" Krophil 2017-12-12 13:01:09 +01:00
  • 3c2f48b750 Merge branch 'pere200' into 'master' Krophil 2017-12-11 05:19:30 +01:00
  • 93f430ac38 PERE 200 Krophil 2017-12-11 05:11:18 +01:00
  • 6335d60ad6 Merge branch 'quickux' into 'master' Sli 2017-12-10 21:43:54 +01:00
  • d49f7858d3 Better ui for group selection on election and wiki klmp200 2017-12-10 21:37:50 +01:00
  • cc99cecaa0 Fix tab mixin on clubs klmp200 2017-12-05 15:53:36 +01:00
  • 91d3e9e4dc Delete function + club tabs gnikwo 2017-12-05 15:24:46 +01:00
  • c8fae39ff0 Merge branch 'elections' into 'master' Sli 2017-12-05 14:30:52 +01:00
  • 4217b92941 Avoid moving role order in election by reloading page klmp200 2017-12-05 14:22:59 +01:00
  • bc7cfc2dba Merge branch 'elections' into 'master' Sli 2017-12-04 13:36:25 +01:00
  • 2f3b481037 Improve deletion and add ordering on roles klmp200 2017-12-02 19:02:05 +01:00
  • 625b5132c4 Election list deletion and ux improvements klmp200 2017-12-01 19:45:28 +01:00
  • 9ca82af219 Merge branch 'counter' into 'master' Skia 2017-12-01 16:03:16 +01:00
  • 4af3239f4c fix can_buy in customer Krophil 2017-12-01 01:13:02 +01:00
  • 88d68ea510 Ready for review gnikwo 2017-11-28 15:02:46 +01:00
  • 5cd031f579 Ready for review gnikwo 2017-11-28 14:43:05 +01:00
  • 21b24f2891 Club views and discussions fixes gnikwo 2017-11-01 18:12:33 +01:00
  • 693c3ed27e Moved club field + migrations gnikwo 2017-10-23 09:30:26 +02:00
  • 17d3860ec5 Fix bad merge gnikwo 2017-10-22 19:12:28 +02:00
  • 8d1c648032 Communication screen - without club tool gnikwo 2017-10-17 15:13:29 +02:00
  • 23d86464c8 Merge branch 'admin_area' into 'master' Skia 2017-11-17 12:02:31 +01:00
  • bb47ad97a3 Search field in Subscription admin area Krophil 2017-11-17 11:48:16 +01:00
  • 64c479a02e Merge branch 'bugfix' into 'master' Skia 2017-11-16 15:43:54 +01:00
  • 33964e0bab Better way to check if a user is subscriber Krophil 2017-11-15 16:46:43 +01:00
  • 42f8ee3518 Merge branch 'teeshirt' into 'master' Sli 2017-11-14 10:23:32 +01:00
  • eb485215d9 Fix translations error for gifts klmp200 2017-11-13 18:30:05 +01:00
  • 6ee1ee365b Merge branch 'bugfix' into 'master' Skia 2017-11-09 15:22:06 +01:00
  • 0ba69da3b6 Fix AGAIN subscription display Krophil 2017-11-08 02:03:43 +01:00
  • 3793321c37 Update README and Markdown test assets Skia 2017-11-09 14:37:14 +01:00
  • 4bf805e2f5 Merge branch 'krophil' into 'master' Skia 2017-11-07 12:10:49 +01:00
  • 846be54431 Merge branch 'teeshirt' into 'master' Krophil 2017-11-06 00:55:28 +01:00
  • c6847ebc47 Translations for gifts klmp200 2017-11-06 00:44:18 +01:00