cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1561 commits 38 branches 17 tags 11 MiB
Commit graph

1561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aurélien Delobelle 46187659ed Fix tirage pk conflicts with postgres 2017-10-17 14:42:39 +02:00
Martin Pepin 47e48e36b2 Merge branch 'aureplop/fix-unreachable-objects-form-creation' into 'test/views' 
Fix fields cleaning with unreachable items when…

See merge request !260
 2017-10-12 19:21:16 +02:00
Aurélien Delobelle 85657591f5 Fix fields cleaning with unreachable items when… 
… object is being created.
 2017-10-12 11:10:30 +02:00
Aurélien Delobelle c59bc487c3 Merge branch 'test/views__' into test/views 2017-10-11 23:35:38 +02:00
Aurélien Delobelle f4a7e9dbf1 Verbosity should stay calm. 2017-10-11 23:34:43 +02:00
Martin Pépin f8bb5b081e Merge branch 'Kerl/fix-JSONField-exn' into test/views 2017-10-10 21:37:40 +02:00
Martin Pépin 3f6c5be748 Upgrade python packages before testing 2017-10-10 21:27:15 +02:00
Martin Pépin e0ab7f5f94 Fix migration conflict 2017-10-10 21:21:28 +02:00
Martin Pépin 116b4da1a5 Merge branch 'test/views_kfet' into test/views 2017-10-10 21:15:49 +02:00
Martin Pépin 29ef297b2a try to set the redis password… 2017-10-10 21:14:52 +02:00
Martin Pépin 503b305299 djangorestframework 3.7 breaks with Django 1.8 
JSONField doesn't exist in Django 1.8
 2017-10-10 18:34:18 +02:00
Martin Pépin 3d22a1b029 Merge branch 'master' into test/views 2017-10-10 15:39:18 +02:00
Martin Pépin 528532cca7 Merge branch 'aureplop/fix-ci' 2017-10-10 15:35:22 +02:00
Martin Pépin 4d1cb3c2d7 Set password for redis in CI 2017-10-10 15:26:14 +02:00
Aurélien Delobelle 57a143e0e1 Merge branch 'PEI' into 'master' 
Statut PEI + cotisation gratuite

See merge request !258
 2017-10-06 11:06:44 +02:00
Martin Pépin 435e211b3d Add a "PEI" status + "Gratis" subscription fees 2017-10-02 13:58:52 +02:00
Aurélien Delobelle 596868f5b6 plop 2017-09-30 03:03:48 +02:00
Martin Pepin 22413d861c Merge branch 'aureplop/fix-attributions-admin' into 'master' 
Fix attribution inlines of participant in admin

See merge request !255
 2017-09-25 18:38:05 +02:00
Aurélien Delobelle d18fb86a98 Fix attribution inlines of participant in admin 2017-09-25 18:26:54 +02:00
Aurélien Delobelle 11e8cb1be2 Merge branch 'bdaAdminHotfix' into 'master' 
Hotfix : répare l'admin, le champ "given" n'était pas affiché quand il faut

See merge request !254
 2017-09-25 15:01:28 +02:00
Martin Pépin db512a97f6 In /admin: displays "given" when it's relevant 2017-09-25 14:22:46 +02:00
Martin Pepin 7d16001ee5 Merge branch 'aureplop/fix_kfet_perms' into 'master' 
K-Fêt' groups edits don't remove non-kfet app permissions.

Closes #168

See merge request !252
 2017-09-12 22:35:30 +02:00
Martin Pépin 1921f05eba Move STATIC_ROOT in production 2017-09-12 09:22:54 +02:00
Martin Pépin 368ee3190f Update CI: use postgres 2017-09-12 00:14:52 +02:00
Aurélien Delobelle 9e61887868 K-Fêt' groups edits don't remove non-kfet app permissions. 
Fixes #168.
 2017-09-11 16:42:14 +02:00
Martin Pépin faed7bff73 fix ?next=… on K-Fêt logout 2017-09-10 02:32:21 +02:00
Martin Pepin f581279825 Merge branch 'aureplop/fix-kfet-navbar' into 'master' 
Fix kfet navbar on small devices

See merge request !248
 2017-09-10 02:12:49 +02:00
Martin Pépin 937a485704 Merge branch 'master' into Production 2017-09-09 22:03:32 +02:00
Martin Pépin 439f49c3ba We ♥ hardcoding stuff… 2017-09-05 15:21:19 +02:00
Martin Pépin 35b352ac1d Fix mistake introduced in 51f4bf3fb5 2017-09-04 14:50:12 +02:00
Martin Pépin 50432d969f Update available promos for account creation 2017-09-04 13:25:45 +02:00
Martin Pépin 51f4bf3fb5 Clipper logins may be > 8 characters 2017-09-04 13:25:09 +02:00
Aurélien Delobelle fb5ba5fb1b Fix kfet navbar on small devices 2017-09-03 14:42:38 +02:00
Aurélien Delobelle af97c0cda6 Improve users management on kfet TestCase, and Py34 compat 2017-09-01 16:37:14 +02:00
Aurélien Delobelle 997b63d6b6 More docs for kfet.tests.utils 2017-09-01 13:35:32 +02:00
Aurélien Delobelle 7d490f0253 Merge branch 'test/views' into test/views_kfet 2017-09-01 12:41:31 +02:00
Aurélien Delobelle 5220bb75d0 Merge branch 'test/views_kfet' of git.eleves.ens.fr:cof-geek/gestioCOF into test/views_kfet 2017-09-01 12:40:37 +02:00
Aurélien Delobelle d8391e54a5 Add docs to kfet TestCases 2017-09-01 12:39:17 +02:00
Martin Pepin b7502e51ed Merge branch 'aureplop/amend_supplier_model' into 'test/views_kfet' 
Most data of suppliers should be optionnal.

See merge request !246
 2017-08-30 20:32:43 +02:00
Aurélien Delobelle be1e67626c Most data of suppliers should be optionnal. 2017-08-30 15:35:20 +02:00
Martin Pepin 0afbd577b1 Merge branch 'aureplop/fix_view_account_search' into 'test/views_kfet' 
View 'search account' should be restricted.

See merge request !245
 2017-08-29 20:41:49 +02:00
Martin Pepin afda1ba2ca Merge branch 'test/views_fix_msg' into 'test/views' 
Fix kfet.open.tests

See merge request !241
 2017-08-29 20:39:31 +02:00
Martin Pepin 6e140e540d Merge branch 'aureplop/fix_perms_settings' into 'test/views_kfet' 
Fix kfet config-related permissions

See merge request !244
 2017-08-29 20:37:48 +02:00
Aurélien Delobelle b4338ce8db View 'search account' should be restricted. 2017-08-16 22:54:40 +02:00
Aurélien Delobelle 22d8317dee Fix kfet.open.tests 
Due to messages sent in signals handlers, the tests were failing.
 2017-08-16 22:43:52 +02:00
Aurélien Delobelle b4b15ab371 Tests of kfet config views pass 2017-08-16 22:30:17 +02:00
Aurélien Delobelle 414b0eb433 Add missing perms to view/edit kfet config 2017-08-16 21:28:16 +02:00
Aurélien Delobelle a3bb9852be Merge branch 'master' into test/views 2017-08-16 18:28:59 +02:00
Aurélien Delobelle 2cfce1c921 Add tests for kfet views. 
kfet.tests.testcases embed mixins for TestCase:
- TestCaseMixin provides assertion helpers,
- ViewTestCaseMixin provides a few basic tests, which are common to
every view.

kfet.tests.utils provides helpers for users and permissions management.

Each kfet view get a testcase (at least very basic) in
kfet.tests.test_views.
 2017-08-16 17:45:59 +02:00
Aurélien Delobelle 343b52f986 Merge branch 'master' into test/views_kfet 2017-08-14 21:18:46 +02:00