Commit graph

247 commits

Author SHA1 Message Date
Erkan Narmanli
20fad42d6d Merge branch 'Qwann/mv_root' into 'master'
rename app evenementiel to poulpe

See merge request cof-geek/GestionEvenementiel!27
2018-08-20 14:36:12 +02:00
Qwann
e8c1ecadcc rename app evenementiel to poulpe 2018-08-20 14:32:52 +02:00
Qwann
fb1308e70c add migrations 2018-08-20 13:24:47 +02:00
Erkan Narmanli
617edf8691 Merge branch 'Qwann/inventaire_list' into 'master'
equipment main views

See merge request cof-geek/GestionEvenementiel!26
2018-08-20 13:22:07 +02:00
Qwann
fd4567b531 equipment main views 2018-08-20 13:17:10 +02:00
Qwann
df0d5b4351 email_server 2018-08-11 13:47:25 +02:00
Qwann
44c003ea7d Merge branch 'master' into Qwann/inventaire 2018-08-11 13:30:59 +02:00
Qwann
573df9e3f7 admin modified 2018-08-09 18:34:36 +02:00
Qwann
57e3feb414 it is possible not to loose an item 2018-08-09 17:57:13 +02:00
Qwann
8dee36f928 new admin ! 2018-08-09 17:52:28 +02:00
Qwann
6e993c0e27 admin search fields 2018-08-09 16:14:28 +02:00
Qwann
14728c8513 category full name 2018-08-09 16:06:24 +02:00
Qwann
ec8e289ff8 no cyclic reference possible 2018-08-09 15:11:20 +02:00
Qwann
174e62b316 rename stock verbose 2018-08-09 14:36:12 +02:00
Qwann
b063d18cf0 equipement added_at modifed_at 2018-08-09 14:06:40 +02:00
Qwann
ae0fac4b86 new poulpe 2018-08-09 10:56:29 +02:00
Qwann
5b2207bd59 cascade or protect set 2018-08-08 16:56:24 +02:00
Qwann
70d1d403f6 equipment attributes 2018-08-08 16:45:29 +02:00
Qwann
c8f4ab1a80 categories as taxinomy 2018-08-08 16:02:23 +02:00
Qwann
4c1a1da64f add group owner 2018-08-07 20:44:57 +02:00
Qwann
a5cb99c0c3 rm old owner 2018-08-07 20:43:56 +02:00
Qwann
f361932590 site name 2018-08-07 20:29:56 +02:00
Qwann
c8f5df3a13 change owner to group 2018-08-07 20:29:37 +02:00
Qwann
788a2077e2 change remarks, add lost 2018-08-07 19:08:20 +02:00
Qwann
41883cb2dd equipment admin list 2018-08-07 16:26:33 +02:00
Qwann
4bfb11bdd3 collaps admin 2018-08-07 15:58:38 +02:00
Qwann
707ef2292f add cof-geek site 2018-08-07 10:00:43 +02:00
Qwann
e5ac994380 small fixes 2018-08-06 19:31:34 +02:00
Evarin
747d3419b2 Fix IdField validation 2018-08-06 18:34:07 +02:00
Qwann
7ab4dcede0 owner+pole+category-tags 2018-08-06 17:06:38 +02:00
Qwann
ecdcc0e949 urls fixed 2018-08-06 16:15:09 +02:00
Qwann
b07cddaf3b life is crap 2018-08-06 16:12:33 +02:00
Qwann
7215da1d81 I kwew it was you python-cas! 2018-08-06 11:58:54 +02:00
Qwann
31cde9ca26 prod requirements 2018-08-06 10:19:48 +02:00
Qwann
e863823457 init migrations for prod 2018-08-06 09:52:56 +02:00
Qwann
e6c0a0697e ignore redis & channels for the time being 2018-08-06 09:45:14 +02:00
Qwann
0c32b05a48 ignore sass-cache 2018-08-05 15:04:49 +02:00
Qwann
6b2ea6eae4 CAS not working 2018-08-05 15:01:51 +02:00
Qwann
556e59706f mmmh 2018-08-05 14:26:07 +02:00
Qwann
f2c65b11e1 ça fonctionne bien 2018-08-04 18:18:34 +02:00
Qwann
0483610e69 moins caca 2018-08-04 05:38:03 +02:00
Qwann
0be9e5eb3a caca 2018-08-02 17:55:27 +02:00
Qwann
123d524eab start equipement 2018-07-26 15:53:42 +02:00
Qwann
328f3d7852 package dependencies 2018-07-13 14:54:38 +02:00
Martin Pepin
3aab76613a Merge branch 'Aufinal/permissions' into 'master'
Permissions par évènement

See merge request cof-geek/GestionEvenementiel!15
2018-05-03 14:34:36 +02:00
Martin Pépin
10e4393bda Merge branch 'master' into Aufinal/permissions 2018-05-03 12:45:29 +02:00
Martin Pépin
94b2529ab6 Use the correct user model when creating users 2018-05-03 12:38:31 +02:00
Martin Pépin
306ca2bcc8 switch to channels 2.x 2018-05-03 12:34:23 +02:00
Martin Pépin
ce9ee193d8 asgi-redis has been renamed to channels_redis 2018-05-03 12:25:37 +02:00
Ludovic Stephan
392e5cf144 Revert c894d35 --- Fuck django-guardian
This reverts commit c894d35932.
2017-09-19 11:48:39 +02:00