Qwann
5694e4b9bc
migrations merged
2017-03-09 11:11:31 +01:00
Qwann
ce96bc4b67
Status added on home page
2017-03-07 17:31:43 +01:00
Qwann
f8e09cf257
unknow status updated every 30s
2017-03-07 14:12:23 +01:00
Qwann
0f96d3bc46
moving kfet_open url
2017-03-07 14:02:08 +01:00
Qwann
392338eddd
indent
2017-03-06 09:30:58 +01:00
Qwann
b7040d5867
adding KFET_FORCE_CLOSE in cache
2017-03-06 02:25:18 +01:00
Qwann
8e462134c7
home base html
2017-03-06 02:08:33 +01:00
Qwann
964dd716c6
Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
2017-03-06 02:04:11 +01:00
Qwann
ca17e36b5a
clean display for is_sold
2017-03-06 02:03:19 +01:00
Qwann
dcc19bd9e8
article.hidden in article & article_read
2017-03-06 01:58:33 +01:00
Aurélien Delobelle
fbd0d760b6
Merge branch 'Aufinal/command_interface' into 'k-fet'
...
Interfaces de commandes et d'inventaires
- Modifie la présentation de ces interfaces.
- Ajout de tooltips d'aide sur les colonnes.
fixes #140
See merge request !170
2017-03-06 01:40:40 +01:00
Ludovic Stephan
8e31fae340
last tweaks
2017-03-05 21:29:20 -03:00
Ludovic Stephan
61e2fedb08
Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/command_interface
2017-03-05 21:12:53 -03:00
Qwann
624707570e
Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
2017-03-05 20:06:37 +01:00
Qwann
197da29366
css include added...
2017-03-05 20:05:35 +01:00
Qwann
15b8900d43
fixes dumb merge
2017-03-05 19:56:56 +01:00
Qwann
a828ecbcf0
Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open
2017-03-05 19:51:51 +01:00
Qwann
b0b2210e93
Merge branch 'qwann/k-fet/home' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/home
2017-03-05 19:44:08 +01:00
Qwann
9f94262b82
removing inapropriate message
2017-03-05 19:43:26 +01:00
Qwann
f52aba8ca6
Merge branch 'k-fet' into qwann/k-fet/home
2017-03-05 19:21:20 +01:00
Aurélien Delobelle
95b129e396
resolved merge conflict in kfet views imports
2017-02-25 02:00:56 +01:00
Aurélien Delobelle
e2c4214efc
fix history kpsul view
2017-02-25 01:36:53 +01:00
Aurélien Delobelle
a98c6b233e
fix checkout data error on k-psul
2017-02-25 01:30:26 +01:00
Qwann
e1713a1d4f
Merge branch 'Kerl/datetime_warnings' into supportBDS
2017-02-24 15:02:27 +01:00
Qwann
9c6f5533ec
Merge branch 'supportBDS' of git.eleves.ens.fr:cof-geek/gestioCOF into supportBDS
2017-02-23 19:00:58 +01:00
Qwann
486d3c4ced
Merge branch 'Kerl/fix_autocomplete' into supportBDS
2017-02-23 18:53:55 +01:00
Martin Pépin
80f1514d39
handle timezones in petits_cours_views
2017-02-23 18:35:38 +01:00
Martin Pépin
1663a03a33
Use timezones everywhere in migrations
2017-02-23 18:33:44 +01:00
Martin Pepin
0e4cfc5121
Merge branch 'Kerl/django111-packages' into 'supportBDS'
...
Upgrade to Django 1.11
- We upgrade our django packages to 1.11 (beta 1)
- We apply some necessary changes in the settings file
- We prepare to upgrade Django-autocomplete-light
- We upgrade some other packages
See merge request !179
2017-02-23 17:58:28 +01:00
Martin Pépin
856faf2b73
Merge branch 'supportBDS' into Kerl/django111-packages
2017-02-23 17:56:12 +01:00
Martin Pepin
646b213d97
Merge branch 'Kerl/django111-urls' into 'supportBDS'
...
Write modern-style urls
- Proper use of include
- Defining namespaces (I do not use them for now because many urls are
going to change)
- Do not try to reverse with old-style references: 'cof.views.XXX'
See merge request !178
2017-02-23 17:32:05 +01:00
Martin Pepin
cc25685aa3
Merge branch 'Kerl/bds_groups' into 'supportBDS'
...
BDS groups and permissions
Creates groups and permissions for the BDS members and staff.
Fixes #136
See merge request !176
2017-02-23 12:58:44 +01:00
Martin Pépin
5ce4809f06
Merge branch 'supportBDS' into Kerl/bds_groups
2017-02-23 12:58:10 +01:00
Martin Pepin
4d825b485d
Merge branch 'Kerl/clubs_support' into 'supportBDS'
...
Kerl/clubs support
- Add the club-related models
- Register them into the admin site in order to be able to play with them
See #133
See merge request !175
2017-02-23 12:46:27 +01:00
Martin Pépin
7988fb24a0
Merge branch 'supportBDS' into Kerl/clubs_support
2017-02-23 12:35:37 +01:00
Martin Pepin
4b4d570e07
Merge branch 'Kerl/fix_generic_team_ath' into 'supportBDS'
...
Change CofProfile to Profile in kfet/backends.py
- K-Fêt accounts are now linked to profiles
- There is no need to perform the `get_or_create` as long as the profile
creation has been automated.
- This file is now PEP8 compliant
See merge request !180
2017-02-23 12:31:55 +01:00
Martin Pépin
83e73376ad
Change CofProfile to Profile in kfet/backends.py
...
- K-Fêt accounts are now linked to profiles
- There is no need to perform the `get_or_create` as long as the profile
creation has been automated.
- This file is now PEP8 compliant
2017-02-23 12:04:33 +01:00
Martin Pépin
7742ad999f
Typo in url reverse name
...
`liste_bda_diff` -> `liste_bdadiff`
2017-02-23 11:05:53 +01:00
Martin Pepin
6444ae3b92
Merge branch 'Kerl/django111-models' into 'supportBDS'
...
Specify `on_delete`
Two kind of files are affected:
- Models
- Migrations
You can use the `-Wall` flag to check that the warning `RemovedInDjango20Warning: on_delete…` is not raised:
python -Wall manage.py runserver 0.0.0.0:8000
See merge request !177
2017-02-23 11:04:26 +01:00
Martin Pépin
213c11721e
Prevent petits cours demandes deletion
2017-02-23 11:03:28 +01:00
Martin Pépin
7d1c1fc868
Specify the on_delete strategy
...
- Remove an absurd debug line in the migration
- Specify the on_delete strategy for the club-related models
2017-02-23 10:56:36 +01:00
Martin Pépin
6c34742cc4
Remove an erroneous RegistrationUserForm
...
This form appeared twice in `cof/forms.py` and the second occurrence
(which was used by the views) was erroneous.
2017-02-23 10:36:25 +01:00
Martin Pépin
7abcf28666
Move the registration_form template
2017-02-23 10:35:46 +01:00
Martin Pépin
3f52af8ca0
Upgrade requirements
...
- Upgrade some dependencies
- We do not specify the version for some packages: we use them in a very
simple way so we may not be affected by upgrades.
2017-02-23 02:03:15 +01:00
Martin Pépin
6bf16441e6
Drop old context processors
...
Some context processors disappear in Django 1.11, we have to drop them
2017-02-23 02:02:22 +01:00
Martin Pépin
69f748acbd
Django1.11-style MiddleWares
...
The design of middlewares has changed in Django 1.11
2017-02-23 02:00:34 +01:00
Martin Pépin
8b905f66dc
Remove dependencies of an old version of dal
...
Django-autocomplete-light does not support the `modelform_factory`
anymore in recent versions. We are actually using an old version of dal
because of this.
This had to be dropped at some point… So now is a good time
2017-02-23 01:57:50 +01:00
Martin Pépin
e1bab7e4ed
Use the AppConfig class
2017-02-23 01:56:59 +01:00
Martin Pépin
68c0ff559d
Drop Grappelli
...
It's ugly and does not really improve the admin site
2017-02-23 01:55:43 +01:00
Martin Pépin
2dcc17298a
Use Django 1.11 (beta 1)
...
Starting to use Django 1.11.
The final version will be released before we push this to production.
2017-02-23 01:55:26 +01:00