Evarin
350836aeb2
Revert to old_css
2018-11-21 19:46:41 +01:00
Daru13
d08a39307f
Initial addition of the visual calendar (day view only).
...
This is the first step to include a visual calendar to Poulpe,
only including a "day view" as of now (i.e. events hour-by-hour from one date to another).
More views may be added at a later time.
It is **NOT WORKING YET**!
The CSS has been broken on this branch, and will have to be fixed before the calendar can work:
* the CSS of the calendar needs to be adapted to the environment and design of Poulpe;
* add actual links to enroll/un-enroll to an activity (cf. `Event` class in `calendar.js`);
* other small tweaks :)?
Finally, this view is likely to require the addition of start and end date change,
so that an user can browse events over several days (cf. `setStartDate` and `setEndDate` methods of `Calendar` class in `calendar.js`).
Note that this code should be better re-written (e.g. in Typescript, split between files, using more/better design patterns) at a later time.
It should nonetheless be easy to fix it and use it right now (see above requirements for this).
2018-11-19 23:57:42 +01:00
Daru13
d3e1943021
Merge branch 'Evarin/enrol-json' into Qwann/calendar
2018-11-19 22:32:58 +01:00
Evarin
511c3096f7
enrol?ajax=json renvoie un JSON pour le calendrier dynamique
2018-11-12 21:44:10 +01:00
Qwann
b1c0dd857d
search matos
2018-11-07 21:39:50 +01:00
Qwann
abdd893309
dos not work
2018-10-12 18:04:27 +02:00
Qwann
1042b9f9e4
partial commit
2018-10-12 17:15:55 +02:00
Qwann
94a629371c
allauth don't works right now…
2018-10-11 09:48:03 +02:00
Qwann
a32881a24b
MAJ allauth
2018-10-04 21:34:39 +02:00
Qwann
7ebee733c5
css no finished
2018-10-04 21:10:30 +02:00
Evarin
601ba4d116
Fix css filtrage catégories
2018-08-28 22:40:02 +02:00
Evarin
6d81735a55
Inscription en perm
2018-08-28 22:19:24 +02:00
Qwann
634c4ad4ff
hotfix: admin
2018-08-27 17:11:27 +02:00
Qwann
727bd10aeb
hotfix: place and tags show correctly
2018-08-27 15:51:29 +02:00
Qwann
3275de7c9c
hotfix: dates activity
2018-08-27 15:31:44 +02:00
Qwann
dd47cc3b07
avec les migrations c'est mieux
2018-08-27 14:09:27 +02:00
Qwann
62330956ec
MAJ : MAJ 2.1, remove user urls
2018-08-27 14:03:06 +02:00
Qwann
c8717fb06b
MAJ : preparing for Django 3.0
2018-08-27 00:56:57 +02:00
Qwann
3c9486a858
Merge branch 'Qwann/django_maj'
2018-08-27 00:31:28 +02:00
Qwann
906db7069b
MAJ : MAJ 2.0, remove debug_panel, django.change url.resolvers to django.urls
2018-08-27 00:30:12 +02:00
Qwann
fc0f861c2c
avec les migrations c'est mieux
2018-08-27 00:09:41 +02:00
Qwann
b45d7722a7
MAJ : add on_delete + MIDDLEWARE
2018-08-27 00:02:33 +02:00
Qwann
7c7adab658
event base done
2018-08-26 21:18:51 +02:00
Qwann
7ebc34d5aa
date behaviour is correct
2018-08-22 14:04:42 +02:00
Erkan Narmanli
c723f53909
Merge branch 'Qwann/events/admin' into 'master'
...
Qwann/events/admin
See merge request cof-geek/GestionEvenementiel!28
2018-08-20 18:23:10 +02:00
Qwann
5d39b1018b
admin for event
2018-08-20 18:20:18 +02:00
Qwann
0ff2f40832
cleaning activity
2018-08-20 17:46:41 +02:00
Qwann
e6d79df735
event admin base
2018-08-20 16:02:42 +02:00
Qwann
7690c1a8ab
hotfix: owner can be None
2018-08-20 15:18:54 +02:00
Qwann
7064e89059
event admin
2018-08-20 15:16:40 +02:00
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
