thubrecht/poulpe
1
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Commit graph

  • 670a9d45da Use EventSpecificMixin for event-specific models Ludovic Stephan 2017-07-18 19:08:09 +02:00
  • 53d9084d63 Correct Activity inheritance and get_herited() Ludovic Stephan 2017-07-18 18:41:44 +02:00
  • 82d4067218 Merge branch 'Aufinal/communication_models' into Qwann/Serializers Qwann 2017-07-18 18:01:25 +02:00
  • 1924d9b81a fogot a file Qwann 2017-07-18 17:48:59 +02:00
  • c8483ca7fb replace User by get_user_model Qwann 2017-07-18 17:46:00 +02:00
  • 81e9a4b8d2 allow local developement in venv Qwann 2017-07-18 17:44:43 +02:00
  • 5b005571d5 Event ending_date no longer optional Ludovic Stephan 2017-07-18 17:31:01 +02:00
  • da75dc7d9c Test + small changes Ludovic Stephan 2017-07-18 17:18:54 +02:00
  • 270e31f12b adapt migrations and tests Ludovic Stephan 2017-07-18 15:37:13 +02:00
  • 4e8873226f Oops Ludovic Stephan 2017-07-18 13:55:09 +02:00
  • 19093d01f3 Small fixes Ludovic Stephan 2017-07-18 13:54:11 +02:00
  • af75c90b84 Refactor communication models Ludovic Stephan 2017-07-17 17:47:34 +02:00
  • 6f158638bf Various bugfixes Ludovic Stephan 2017-07-15 21:22:15 +02:00
  • 26c02df53d All commentables are notifying Ludovic Stephan 2017-07-15 18:37:47 +02:00
  • 80be26c5b3 Minor changes Ludovic Stephan 2017-07-15 18:14:26 +02:00
  • 3bbea85b3a Add commentable property to activities Ludovic Stephan 2017-07-15 18:14:15 +02:00
  • a22ab92e87 Add comment and notification models Ludovic Stephan 2017-07-15 18:13:45 +02:00
  • f1afadda76 Add possibility for endless events Ludovic Stephan 2017-07-15 17:50:58 +02:00
  • 1d07c5e8fd Add amount field to EquipmentRemark Ludovic Stephan 2017-07-15 17:50:15 +02:00
  • 350b0c58be Add begin/end date to activities Ludovic Stephan 2017-07-15 17:46:13 +02:00
  • 35e8585f4c Verbose names in lowercase Ludovic Stephan 2017-07-15 17:44:15 +02:00
  • 1ffbac92cb Merge branch 'Kerl/test_user_creation' Qwann 2017-05-18 18:47:55 +02:00
  • 8800838c32 Merge branch 'Kerl/test_user_creation' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Kerl/test_user_creation Qwann 2017-05-18 18:18:14 +02:00
  • 2b1a1c109a Merge branch 'Kerl/test_user_creation' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Kerl/test_user_creation Qwann 2017-05-18 18:17:46 +02:00
  • a53a9249ef typo Martin Pépin 2017-05-18 17:15:14 +01:00
  • f105b17e3f replace [0] by .get() for a more robust test Martin Pépin 2017-05-18 16:53:29 +01:00
  • a43b7ba914 Roll back to Debian8 for the vagrant VM Martin Pépin 2017-05-18 14:19:37 +01:00
  • 27fc356045 Add a test for the user creation view Martin Pépin 2017-05-17 17:19:42 +01:00
  • a35148f7be Restore the USER_CREATE_KEY Martin Pépin 2017-05-17 16:18:13 +01:00
  • 750f7937b0 Merge branch 'master' into Kerl/dev_env Martin Pépin 2017-05-17 10:33:05 +01:00
  • 21de45b42a Prevent secret.py from being removed by rsync Martin Pépin 2017-05-17 09:55:26 +01:00
  • f056e6940c Some docs about the dev environment in README.md Martin Pépin 2017-05-17 02:07:06 +01:00
  • 84bbf984d0 Avoid duplicate lines in .bash{rc,_profile} Martin Pépin 2017-05-16 22:00:00 +01:00
  • 5dc43b2ac6 Remove irrelevant environment variables Martin Pépin 2017-05-16 21:43:30 +01:00
  • e28b73a2ec Split the settings in two files, secrets system Martin Pépin 2017-05-16 19:52:59 +01:00
  • 5759cd47bb Merge branch 'qwann/models/lang_clean' into 'master' Martin Pepin 2017-05-16 20:22:50 +02:00
  • 0741d330d9 small i18n fixes Qwann 2017-05-16 20:20:38 +02:00
  • ba6bff5ec4 Merge branch 'qwann/move_user' into 'master' Martin Pepin 2017-05-16 19:13:49 +02:00
  • e64c3d0b37 Setup a production-like environment in vagrant Martin Pépin 2017-05-16 16:13:31 +01:00
  • 981c5cade5 Use the Debian Stretch box in Vagrant Martin Pépin 2017-05-16 11:43:40 +01:00
  • 0cfbf58cdb Upgrade to Django 1.11 Martin Pépin 2017-05-16 11:42:53 +01:00
  • 1df1c20998 Merge branch 'qwann/move_user' into qwann/models/lang_clean Qwann 2017-05-09 23:02:00 +02:00
  • e5bfb0bd0e Merge branch 'master' into qwann/move_user Qwann 2017-05-09 23:01:21 +02:00
  • 3ba5f894b8 hygiène + small fixes Qwann 2017-05-09 22:56:20 +02:00
  • 609d743154 fixing shared url Qwann 2017-05-09 22:39:45 +02:00
  • d168c8c8e6 translators added Qwann 2017-04-27 01:14:47 +02:00
  • 01d8f2bb74 Merge branch 'qwann/views/shared' into 'master' Martin Pepin 2017-04-26 21:37:32 +02:00
  • 704cd3e0fc PEP8 Martin Pépin 2017-04-26 20:36:22 +01:00
  • 6e733492ac Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-04-26 19:02:41 +02:00
  • 7a4a836d6e small fixes Qwann 2017-04-26 04:08:25 +02:00
  • eb2613fc7c Merge branch 'qwann/html/user' into 'master' Martin Pepin 2017-04-25 21:48:33 +02:00
  • 9f4ab91aad Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-04-06 00:46:29 +02:00
  • 03b1fc31b8 Merge branch 'qwann/html/user' into qwann/views/shared Qwann 2017-04-05 18:52:45 +02:00
  • 3729f3005d removing shared from STATICFILES_DIRS Qwann 2017-04-05 18:49:11 +02:00
  • 24a15e25c8 Merge branch 'qwann/html/base2' into 'master' Martin Pepin 2017-03-20 23:42:27 +01:00
  • 9c4e950593 Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-03-05 19:13:54 +01:00
  • afdc821c21 Merge branch 'qwann/html/user' into qwann/views/shared Qwann 2017-03-05 19:13:24 +01:00
  • f47608d246 Merge branch 'qwann/html/base2' into qwann/html/user Qwann 2017-03-05 19:12:56 +01:00
  • be1a89a467 small fixes Qwann 2017-03-05 19:10:19 +01:00
  • dd2f4d650f Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-03-05 13:28:19 +01:00
  • a11b84a398 Merge branch 'qwann/html/user' into qwann/views/shared Qwann 2017-03-05 13:27:34 +01:00
  • 25a936e10a Merge branch 'qwann/html/base2' into qwann/html/user Qwann 2017-03-05 13:26:44 +01:00
  • bbb5123051 Merge branch 'models' into 'master' Martin Pepin 2017-03-05 13:26:27 +01:00
  • b40713be49 Merge branch 'models' into qwann/html/base2 Qwann 2017-03-05 13:25:42 +01:00
  • 01014c68de test fixed Qwann 2017-03-05 13:25:04 +01:00
  • 37aa00e990 Merge branch 'qwann/html/user' into qwann/move_user Qwann 2017-02-21 21:22:47 +01:00
  • 8fcc198892 Merge branch 'qwann/html/user' into qwann/views/shared Qwann 2017-02-21 21:21:52 +01:00
  • cf8085952f Merge branch 'qwann/html/base2' into qwann/html/user Qwann 2017-02-21 21:21:24 +01:00
  • c3180281a4 forgotten include Qwann 2017-02-21 21:20:43 +01:00
  • c863fa30ce Merge branch 'qwann/html/base2' into qwann/html/user Qwann 2017-02-21 21:19:06 +01:00
  • 524876a03c Merge branch 'models' into qwann/html/base2 Qwann 2017-02-21 21:18:11 +01:00
  • e72969e99b initial migrations Qwann 2017-02-21 21:16:50 +01:00
  • 79770b0b9c Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-02-21 21:01:31 +01:00
  • 7f2f995efd wrong merge fixed Qwann 2017-02-21 21:01:05 +01:00
  • 0175db89bd Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-02-21 20:50:32 +01:00
  • 1a7df9dedb Merge branch 'qwann/html/user' into qwann/views/shared Qwann 2017-02-21 20:46:35 +01:00
  • 6d37019612 Merge branch 'qwann/html/base2' into qwann/html/user Qwann 2017-02-21 20:45:59 +01:00
  • fa7f046928 Merge branch 'models' into qwann/html/base2 Qwann 2017-02-21 20:45:20 +01:00
  • 5a38c67150 upgrading pip Qwann 2017-02-21 20:28:26 +01:00
  • a41d2b99b2 regexp urls Qwann 2017-02-21 19:12:18 +01:00
  • f33db473a5 typo + PEP8 Qwann 2017-02-21 17:48:56 +01:00
  • e79503430e Utilise une version à jour de Django Martin Pépin 2017-02-21 17:40:24 +01:00
  • 8055be4c20 fixes Qwann 2017-02-21 17:25:46 +01:00
  • c7db0c10b6 include forgotten Qwann 2017-02-21 17:17:09 +01:00
  • ff434bbe39 Merge branch 'qwann/views/shared' into qwann/move_user Qwann 2017-02-21 17:06:59 +01:00
  • d7049631d4 addng forgotten template cleaning shared/template/ Qwann 2017-02-21 17:00:43 +01:00
  • 1f8339b4db renaming user into users Qwann 2017-02-21 16:56:34 +01:00
  • 271fe8ecf1 defining default side nav Qwann 2017-02-21 16:27:29 +01:00
  • cdf5fbb285 specifying home as... home in urls Qwann 2017-02-21 16:02:23 +01:00
  • b042ec1478 Merge branch 'qwann/html/user' into qwann/views/shared Qwann 2017-02-21 15:40:11 +01:00
  • 886f71fb5c creating 'empty' home view Qwann 2017-02-21 15:32:03 +01:00
  • 18354872ab now main content is resizable Qwann 2017-02-21 14:51:42 +01:00
  • 2996924fe4 user urls included in global interface Qwann 2017-02-21 11:38:21 +01:00
  • 6be19a463c now shared components are in an application now var components are in shared installing widget_tweaks Qwann 2017-02-21 11:07:36 +01:00
  • d0620a6bf8 first modifs in user views Qwann 2017-02-20 18:42:37 +01:00
  • 840e9c2979 cleaning Qwann 2017-02-18 20:30:45 +01:00
  • 8c716c772a removing cheatsheets Qwann 2017-02-18 20:20:43 +01:00
  • b67a40bb51 Merge branch 'qwann/html/cheatsheets' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into qwann/html/cheatsheets Qwann 2017-02-18 20:15:31 +01:00
  • cc2d423f46 debug toolbar Qwann 2017-02-18 18:28:11 +01:00
  • 4030f89ada cheatsheets :) Qwann 2017-02-18 16:58:40 +01:00