Ludovic Stephan
ef8c62835b
Migrations
2017-07-21 16:20:39 +02:00
Ludovic Stephan
8a587b3d56
Override attribution save() + stuff
2017-07-21 16:18:19 +02:00
Qwann
5d26f35f72
Merge branch 'master' into Qwann/Serializers
2017-07-20 15:29:32 +02:00
Qwann
228d16fbdd
Merge branch 'Aufinal/communication_models' into Qwann/Serializers
2017-07-20 15:27:07 +02:00
Ludovic Stephan
3439abe922
Merge branch 'master' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Aufinal/communication_models
2017-07-20 15:24:23 +02:00
Erkan Narmanli
bfa6e84b8d
Merge branch 'Qwann/venv' into 'master'
...
Qwann/venv
See merge request !14
2017-07-20 15:22:40 +02:00
Qwann
cd6348b26f
now Aufinal should be satistied
2017-07-20 15:22:42 +02:00
Qwann
c55996d7fc
gitignore improved
2017-07-20 15:21:07 +02:00
Qwann
bed9771e0f
venv works fine
2017-07-20 15:18:29 +02:00
Qwann
faafbf0630
serializers started
2017-07-20 15:08:19 +02:00
Ludovic Stephan
670a9d45da
Use EventSpecificMixin for event-specific models
2017-07-18 19:08:09 +02:00
Ludovic Stephan
53d9084d63
Correct Activity inheritance and get_herited()
2017-07-18 18:41:44 +02:00
Qwann
82d4067218
Merge branch 'Aufinal/communication_models' into Qwann/Serializers
2017-07-18 18:01:25 +02:00
Qwann
1924d9b81a
fogot a file
2017-07-18 17:48:59 +02:00
Qwann
c8483ca7fb
replace User by get_user_model
2017-07-18 17:46:00 +02:00
Qwann
81e9a4b8d2
allow local developement in venv
2017-07-18 17:44:43 +02:00
Ludovic Stephan
5b005571d5
Event ending_date no longer optional
2017-07-18 17:31:01 +02:00
Ludovic Stephan
da75dc7d9c
Test + small changes
2017-07-18 17:18:54 +02:00
Ludovic Stephan
270e31f12b
adapt migrations and tests
2017-07-18 15:37:13 +02:00
Ludovic Stephan
4e8873226f
Oops
2017-07-18 13:55:09 +02:00
Ludovic Stephan
19093d01f3
Small fixes
2017-07-18 13:54:11 +02:00
Ludovic Stephan
af75c90b84
Refactor communication models
...
We now use `django-notifications` and `django-contrib-comments` to manage notifications and comments.
Subscriptions are managed through the `SubscriptionMixin` model, and can correspond to unique
users and to group-like subscriptions.
2017-07-17 17:47:34 +02:00
Ludovic Stephan
6f158638bf
Various bugfixes
2017-07-15 21:22:15 +02:00
Ludovic Stephan
26c02df53d
All commentables are notifying
2017-07-15 18:37:47 +02:00
Ludovic Stephan
80be26c5b3
Minor changes
2017-07-15 18:14:26 +02:00
Ludovic Stephan
3bbea85b3a
Add commentable property to activities
2017-07-15 18:14:15 +02:00
Ludovic Stephan
a22ab92e87
Add comment and notification models
2017-07-15 18:13:45 +02:00
Ludovic Stephan
f1afadda76
Add possibility for endless events
2017-07-15 17:50:58 +02:00
Ludovic Stephan
1d07c5e8fd
Add amount field to EquipmentRemark
2017-07-15 17:50:15 +02:00
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
