Ludovic Stephan
350b0c58be
Add begin/end date to activities
2017-07-15 17:46:13 +02:00
Ludovic Stephan
35e8585f4c
Verbose names in lowercase
2017-07-15 17:44:15 +02:00
Qwann
1ffbac92cb
Merge branch 'Kerl/test_user_creation'
2017-05-18 18:47:55 +02:00
Qwann
8800838c32
Merge branch 'Kerl/test_user_creation' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Kerl/test_user_creation
2017-05-18 18:18:14 +02:00
Qwann
2b1a1c109a
Merge branch 'Kerl/test_user_creation' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Kerl/test_user_creation
2017-05-18 18:17:46 +02:00
Martin Pépin
a53a9249ef
typo
2017-05-18 17:15:14 +01:00
Martin Pépin
f105b17e3f
replace [0] by .get() for a more robust test
2017-05-18 16:53:29 +01:00
Martin Pépin
a43b7ba914
Roll back to Debian8 for the vagrant VM
2017-05-18 14:19:37 +01:00
Martin Pépin
27fc356045
Add a test for the user creation view
2017-05-17 17:19:42 +01:00
Martin Pépin
a35148f7be
Restore the USER_CREATE_KEY
2017-05-17 16:18:13 +01:00
Martin Pépin
750f7937b0
Merge branch 'master' into Kerl/dev_env
2017-05-17 10:33:05 +01:00
Martin Pépin
21de45b42a
Prevent secret.py from being removed by rsync
2017-05-17 09:55:26 +01:00
Martin Pépin
f056e6940c
Some docs about the dev environment in README.md
2017-05-17 02:07:06 +01:00
Martin Pépin
84bbf984d0
Avoid duplicate lines in .bash{rc,_profile}
2017-05-16 22:00:00 +01:00
Martin Pépin
5dc43b2ac6
Remove irrelevant environment variables
2017-05-16 21:43:30 +01:00
Martin Pépin
e28b73a2ec
Split the settings in two files, secrets system
2017-05-16 19:52:59 +01:00
Martin Pepin
5759cd47bb
Merge branch 'qwann/models/lang_clean' into 'master'
...
Qwann/models/lang clean
See merge request !10
2017-05-16 20:22:50 +02:00
Qwann
0741d330d9
small i18n fixes
2017-05-16 20:20:38 +02:00
Martin Pepin
ba6bff5ec4
Merge branch 'qwann/move_user' into 'master'
...
Qwann/move user
See merge request !8
2017-05-16 19:13:49 +02:00
Martin Pépin
e64c3d0b37
Setup a production-like environment in vagrant
...
- We already use Daphne and channels to prepare the future use of
websockets.
- The app is served behind an nginx reverse-proxy
- The services we need are managed by systemctl
The production-like running instance of GestionÉvénementiel can be
accessed on localhost:8080 outside vagrant.
2017-05-16 16:13:31 +01:00
Martin Pépin
981c5cade5
Use the Debian Stretch box in Vagrant
2017-05-16 11:53:47 +01:00
Martin Pépin
0cfbf58cdb
Upgrade to Django 1.11
2017-05-16 11:53:43 +01:00
Qwann
1df1c20998
Merge branch 'qwann/move_user' into qwann/models/lang_clean
2017-05-09 23:02:00 +02:00
Qwann
e5bfb0bd0e
Merge branch 'master' into qwann/move_user
2017-05-09 23:01:21 +02:00
Qwann
3ba5f894b8
hygiène + small fixes
2017-05-09 22:56:20 +02:00
Qwann
609d743154
fixing shared url
2017-05-09 22:39:45 +02:00
Qwann
d168c8c8e6
translators added
2017-04-27 02:12:41 +02:00
Martin Pepin
01d8f2bb74
Merge branch 'qwann/views/shared' into 'master'
...
Qwann/views/shared
See merge request !7
2017-04-26 21:37:32 +02:00
Martin Pépin
704cd3e0fc
PEP8
2017-04-26 20:36:22 +01:00
Qwann
6e733492ac
Merge branch 'qwann/views/shared' into qwann/move_user
2017-04-26 19:02:41 +02:00
Qwann
7a4a836d6e
small fixes
2017-04-26 04:08:25 +02:00
Martin Pepin
eb2613fc7c
Merge branch 'qwann/html/user' into 'master'
...
Qwann/html/user
See merge request !6
2017-04-25 21:48:33 +02:00
Qwann
9f4ab91aad
Merge branch 'qwann/views/shared' into qwann/move_user
2017-04-06 00:46:29 +02:00
Qwann
03b1fc31b8
Merge branch 'qwann/html/user' into qwann/views/shared
2017-04-05 18:52:45 +02:00
Qwann
3729f3005d
removing shared from STATICFILES_DIRS
2017-04-05 18:49:11 +02:00
Martin Pepin
24a15e25c8
Merge branch 'qwann/html/base2' into 'master'
...
Qwann/html/base2
See merge request !5
2017-03-20 23:42:27 +01:00
Qwann
9c4e950593
Merge branch 'qwann/views/shared' into qwann/move_user
2017-03-05 19:13:54 +01:00
Qwann
afdc821c21
Merge branch 'qwann/html/user' into qwann/views/shared
2017-03-05 19:13:24 +01:00
Qwann
f47608d246
Merge branch 'qwann/html/base2' into qwann/html/user
2017-03-05 19:12:56 +01:00
Qwann
be1a89a467
small fixes
2017-03-05 19:10:19 +01:00
Qwann
dd2f4d650f
Merge branch 'qwann/views/shared' into qwann/move_user
2017-03-05 13:28:19 +01:00
Qwann
a11b84a398
Merge branch 'qwann/html/user' into qwann/views/shared
2017-03-05 13:27:34 +01:00
Qwann
25a936e10a
Merge branch 'qwann/html/base2' into qwann/html/user
2017-03-05 13:26:44 +01:00
Martin Pepin
bbb5123051
Merge branch 'models' into 'master'
...
Models
models et tests de event terminés
See merge request !3
2017-03-05 13:26:27 +01:00
Qwann
b40713be49
Merge branch 'models' into qwann/html/base2
2017-03-05 13:25:42 +01:00
Qwann
01014c68de
test fixed
2017-03-05 13:25:04 +01:00
Qwann
37aa00e990
Merge branch 'qwann/html/user' into qwann/move_user
2017-02-21 21:22:47 +01:00
Qwann
8fcc198892
Merge branch 'qwann/html/user' into qwann/views/shared
2017-02-21 21:21:52 +01:00
Qwann
cf8085952f
Merge branch 'qwann/html/base2' into qwann/html/user
2017-02-21 21:21:24 +01:00
Qwann
c3180281a4
forgotten include
2017-02-21 21:20:43 +01:00
