Commit Graph

  • 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
  • e3fd3b81ab
    Add gift function klmp200 2017-11-06 00:22:25 +01:00
  • 9ab7cb98dc Merge branch 'bugfix' into 'master' Sli 2017-11-05 23:31:29 +01:00
  • f1a9344524 Fix external ressources Krophil 2017-11-05 13:27:53 +01:00
  • 6ebdd53d98 club: make clubs viewable by old subscribers Skia 2017-11-01 14:51:32 +01:00
  • 6113de33ec Add comment in product type Krophil 2017-10-22 21:10:02 +02:00
  • 4810934a10 Merge branch 'bugfix' into 'master' Skia 2017-10-25 20:23:43 +02:00
  • bc24baef09 Merge branch 'Tresorerie' into 'master' Skia 2017-10-25 20:20:08 +02:00
  • 2bb510932b Fix date displaying in user_detail Krophil 2017-10-24 13:08:18 +02:00
  • 5fb57e97f7 Add possibility to not link an operation Krophil 2017-10-22 16:18:31 +02:00
  • cd4b0d8e0c Merge branch 'external_option' into 'master' Skia 2017-10-18 15:32:06 +02:00
  • 6c957e3ce4 Integrate external_res variable Krophil 2017-10-04 22:46:52 +02:00
  • 578fa1495d sas: fix notification callback Skia 2017-10-15 11:59:54 +02:00
  • d5c6695f80 core: improve notification callback system Skia 2017-10-15 11:59:41 +02:00
  • 9b0b381fa3 core: make populate command more predictable (should fix the random failing test) Skia 2017-10-14 13:51:50 +02:00
  • 69c7036089 Merge branch 'krophil' into 'master' Skia 2017-10-12 09:29:02 +02:00
  • 56a1e09a28 Fix requirements.txt: keep django-rest-framework <3.7 Skia 2017-10-11 12:45:57 +02:00
  • 3c50aa554a Add pygraphviz to requirements Skia 2017-10-11 12:31:17 +02:00
  • 7879b6dd6b core: add family graphs Skia 2017-10-11 12:30:33 +02:00
  • 3994a58a2f Add search form in admin Krophil 2017-10-10 23:33:15 +02:00
  • 47bace2057 Merge branch 'Tresorerie' into 'master' Skia 2017-10-09 17:21:37 +02:00
  • 7c2e562c1e locale: fix translation Skia 2017-10-09 17:15:46 +02:00
  • 3104270675 Few changes in accounting design Krophil 2017-10-09 13:58:18 +02:00
  • 43f51813e0 sas: fix album preview Skia 2017-10-06 17:57:35 +02:00
  • 8492903a39 Merge branch 'clubs' into 'master' Sli 2017-10-06 17:50:59 +02:00
  • 4369d9f593
    Found a way to avoid strange error for club page klmp200 2017-10-06 17:44:41 +02:00
  • 87abdf7e68 trombi: update export page again Skia 2017-10-06 17:29:23 +02:00
  • a09c634ac6 core: add phonenumber template filter Skia 2017-10-06 17:28:51 +02:00
  • 8a58055d06 trombi: update export page Skia 2017-10-06 16:38:36 +02:00
  • fae2a572b1 Merge branch 'fontawesome' into 'master' Skia 2017-10-06 15:30:30 +02:00
  • e0517c5f4f Merge branch 'facebook-button' into 'master' Skia 2017-10-06 15:09:50 +02:00
  • be958bca7e Small fix for logo in news Krophil 2017-10-06 02:46:11 +02:00
  • c8c60b8b7d Few changes in design Krophil 2017-10-06 02:42:33 +02:00
  • 0bef8d33d3 Merge branch 'clubs' into 'master' Skia 2017-10-06 11:48:02 +02:00
  • cec3ec8164
    Club tools translations klmp200 2017-10-06 11:24:48 +02:00
  • 30f7835cef
    Operations documentation klmp200 2017-10-04 11:26:40 +02:00
  • 8146186447
    Fix some bugs in mailings with new club tools klmp200 2017-10-02 13:16:43 +02:00
  • 4800db3c2c
    Add auto generation for mailing lists klmp200 2017-10-02 00:10:52 +02:00
  • 4310441269
    Redirect directly on member page when adding a new member. Still has a bug : an user already member always show when success klmp200 2017-10-01 23:14:47 +02:00
  • baa7be69e4
    Better integration of wiki pages on clubs klmp200 2017-10-01 20:52:29 +02:00
  • 2c1cf2d7af
    Fix for club tools klmp200 2017-09-27 14:42:04 +02:00
  • 4026d076b3
    Forgoten migration from skia and fixed migration klmp200 2017-09-26 16:07:49 +02:00
  • db509bf060
    Nice club presentation klmp200 2017-09-19 16:27:48 +02:00
  • 790d723d08
    Fix page creation method for clubs klmp200 2017-09-19 14:48:56 +02:00
  • f4bc1b140c
    Fix is_active migration klmp200 2017-09-17 18:09:16 +02:00
  • 12c49b285a
    Fix page permissions and fix migration when on sqlite backend klmp200 2017-09-17 17:35:47 +02:00
  • aa49b2d4ce
    Fix regex for pages klmp200 2017-09-17 14:59:50 +02:00
  • e2078a8c15
    Sync club pages with club tree klmp200 2017-09-13 16:51:34 +02:00
  • 939146bddd
    Sync pages with club unix_name klmp200 2017-09-13 11:20:55 +02:00
  • fe69cbcee1
    Add page for clubs and inactive clubs klmp200 2017-09-12 21:10:32 +02:00
  • 13620de754 Merge branch 'facebook-button' into 'master' Skia 2017-10-05 19:29:36 +02:00
  • 3089b484d3 Enhanced news Krophil 2017-09-29 17:18:06 +02:00
  • aab589b5d1 Merge branch 'fontawesome' into 'master' Sli 2017-09-29 14:55:25 +02:00
  • acbeb3d3c8 add font-awesome Krophil 2017-09-29 14:35:06 +02:00
  • 13a2cc22dd core: fix some CSS Skia 2017-09-26 14:05:19 +02:00
  • b87990e3db com: add birthdays block Skia 2017-09-26 13:45:14 +02:00
  • 7b48156259 locale: update translation Skia 2017-09-25 20:14:35 +02:00
  • cda89d66cd com: improve news page Skia 2017-09-25 20:14:20 +02:00
  • a2dc00f4e5 club: add club logo Skia 2017-09-25 20:13:35 +02:00
  • 49b77480e6 sas: clean up old notif trigger Skia 2017-09-25 12:49:46 +02:00
  • 144a56570b locale: update translations Skia 2017-09-25 12:40:39 +02:00
  • f0c34fe70c sas: add permanent notification for SAS moderation Skia 2017-09-25 12:35:56 +02:00
  • 469304585c sas: update models managers Skia 2017-09-25 12:34:05 +02:00
  • 3a16c7aab4 trombi: change comments format in export Skia 2017-09-25 11:08:20 +02:00