|
|
e9e0d6ac11
|
Merge branch 'dev' into fix-dates
|
2019-11-19 14:45:34 +01:00 |
|
|
|
1a38d672a5
|
Merge branch 'dev' of https://framagit.org/framasoft/framadate/funky-framadate-front into dev
|
2019-11-19 14:45:21 +01:00 |
|
|
|
7b590840b2
|
👽 translate buttons
|
2019-11-19 14:42:59 +01:00 |
|
|
|
572f0837cc
|
⚡ add unique interval days
|
2019-11-19 14:23:51 +01:00 |
|
ty kayn
|
a01977ef53
|
Merge branch 'issue-36' into 'dev'
#36 graphique de répartition des votes à réutiliser
See merge request framasoft/framadate/funky-framadate-front!13
|
2019-11-19 11:39:08 +01:00 |
|
|
|
20876f9a8d
|
👽 translate button to add in template
|
2019-11-19 11:23:42 +01:00 |
|
|
|
6a40e041d0
|
👽 translate button to add
|
2019-11-19 11:21:58 +01:00 |
|
|
|
026c7cfda2
|
⚡ start call backend service to retrieve my polls by email
|
2019-11-19 11:19:21 +01:00 |
|
|
|
933c32798c
|
🐛 fix deletions in date buttons , input of type date
|
2019-11-19 11:18:58 +01:00 |
|
alrom8
|
c36a3b064c
|
Ajout formatage données
|
2019-11-19 10:55:56 +01:00 |
|
|
|
cf2a12507e
|
🐛 fix focus on date, extend the empty all button to timespans
|
2019-11-19 10:36:53 +01:00 |
|
alrom8
|
2261bd2406
|
Merge
|
2019-11-19 09:01:30 +01:00 |
|
Le Libre Au Quotidien
|
1055a0cdbe
|
fix bug
|
2019-11-18 13:37:46 +01:00 |
|
Le Libre Au Quotidien
|
497cf9e12c
|
Fix bug
|
2019-11-18 11:36:34 +01:00 |
|
alrom8
|
723a0f9527
|
Issue-36 : Graph sondage
|
2019-11-18 10:19:28 +01:00 |
|
Le Libre Au Quotidien
|
6b2e4bcd21
|
Merge branch 'dates-poll' into 'dev'
Dates poll
See merge request framasoft/framadate/funky-framadate-front!12
|
2019-11-16 22:22:51 +01:00 |
|
tykayn
|
b7afca96db
|
⚡ choices to add,clear and delete
|
2019-11-15 15:19:42 +01:00 |
|
alrom8
|
0059741027
|
issue-36 : restitution des votes d'un sondage sous forme de graphiques. début
|
2019-11-13 18:18:42 +01:00 |
|
ty kayn
|
5083306384
|
Merge branch 'styles' into 'dev'
Styles
See merge request framasoft/framadate/funky-framadate-front!11
|
2019-11-13 11:44:50 +01:00 |
|
MarguoNana
|
22a560d82d
|
Err correction special dates
|
2019-11-12 21:34:03 +01:00 |
|
MarguoNana
|
61d31dfd5a
|
Traduction placeholder
|
2019-11-12 21:29:53 +01:00 |
|
MarguoNana
|
8b728d172f
|
Conflit resolved
|
2019-11-12 21:10:58 +01:00 |
|
ty kayn
|
55719f59b5
|
Merge branch 'components/vote-choice' into 'styles'
Finalisation composant de vote
See merge request framasoft/framadate/funky-framadate-front!10
|
2019-10-28 10:22:49 +01:00 |
|
ty kayn
|
c394ccc384
|
Merge branch 'issue-30/markdown' into 'dev'
Issue 30/markdown
See merge request framasoft/framadate/funky-framadate-front!9
|
2019-10-26 19:33:38 +02:00 |
|
MarguoNana
|
985be95b0d
|
Resolution du conflit
|
2019-10-25 14:17:13 +02:00 |
|
MarguoNana
|
f9a8c1d8c3
|
suppression du code mort
|
2019-10-25 14:14:50 +02:00 |
|
22px
|
6f8b180d1f
|
[front] vote choice : add image and text cases
|
2019-10-24 20:51:41 +02:00 |
|
22px
|
28b3334d3e
|
[fix] vote choice : minor css fixes
|
2019-10-24 20:16:14 +02:00 |
|
ty kayn
|
36ed7dd4cb
|
Merge branch 'component/vote-choice' into 'styles'
Component : vote choice
See merge request framasoft/framadate/funky-framadate-front!8
|
2019-10-24 17:06:05 +02:00 |
|
ty kayn
|
479c264acd
|
Merge branch 'ui/buttons' into 'styles'
[front] global : update button styles
See merge request framasoft/framadate/funky-framadate-front!6
|
2019-10-24 17:03:32 +02:00 |
|
ty kayn
|
fb67e99c76
|
Merge branch 'tabs-in-html' into 'dev'
Format html templates with tabs
See merge request framasoft/framadate/funky-framadate-front!7
|
2019-10-24 16:08:58 +02:00 |
|
Côme
|
bfa44534aa
|
Format html templates with tabs
|
2019-10-24 16:08:56 +02:00 |
|
MarguoNana
|
ca3b76d0c8
|
Issue-30 : markdown - bouton retour
|
2019-10-24 08:48:26 +02:00 |
|
22px
|
6ee9f742fa
|
[front] component : vote choice
|
2019-10-23 18:08:35 +02:00 |
|
MarguoNana
|
be96384a8e
|
Issue-30: Markdown support
|
2019-10-23 16:04:59 +02:00 |
|
alrom8
|
5f2a2b4461
|
issue 36 : select daltonien
|
2019-10-23 15:39:16 +02:00 |
|
alrom8
|
46a02846bf
|
#36 : ajout librairie chartjs
|
2019-10-23 13:39:00 +02:00 |
|
alrom8
|
a006e4d42a
|
ajout composant graphique sondage
|
2019-10-23 10:45:30 +02:00 |
|
22px
|
3e29117ea6
|
[front] component : vote choice
|
2019-10-17 21:56:59 +02:00 |
|
22px
|
a176405dd4
|
[front] global : increase main wrap size
|
2019-10-17 21:56:22 +02:00 |
|
22px
|
802f54b930
|
[front] global : update button styles
|
2019-10-16 21:33:49 +02:00 |
|
ty kayn
|
504d35ffdb
|
Merge branch 'minor-works' into 'dev'
Minor works
See merge request framasoft/framadate/funky-framadate-front!3
|
2019-10-15 10:58:37 +02:00 |
|
Come_744
|
70f13b0f01
|
Merge branch 'dev' into minor-works
|
2019-10-14 22:36:58 +02:00 |
|
ty kayn
|
b0fbc167c1
|
Merge branch 'internationalisation' into 'dev'
Internationalisation
See merge request framasoft/framadate/funky-framadate-front!5
|
2019-10-14 13:17:23 +02:00 |
|
ty kayn
|
f99df9c439
|
Merge branch 'logo' into 'dev'
Stick "Frama" and "date" together
See merge request framasoft/framadate/funky-framadate-front!4
|
2019-10-14 13:16:19 +02:00 |
|
ty kayn
|
1be5fdd8d8
|
Merge branch 'translation' into 'dev'
Translation fr->en
See merge request framasoft/framadate/funky-framadate-front!2
|
2019-10-14 13:15:56 +02:00 |
|
Le Libre Au Quotidien
|
69802a99ff
|
Align elements
|
2019-10-10 19:04:19 +02:00 |
|
Come_744
|
c5021a2aa1
|
Replaced text by i18n json keys and add i18n attribute
Texts have been replaced only when the keys were in the json files.
i18n attributes have been added only when keys were not in the json files.
|
2019-10-07 22:02:22 +02:00 |
|
Le Libre Au Quotidien
|
c671a8bdea
|
Minimal commit
|
2019-10-07 19:17:51 +02:00 |
|
Come_744
|
efe0b89218
|
Stick "Frama" and "date" together
|
2019-10-05 22:15:06 +02:00 |
|
