Commit Graph

820 Commits

Author SHA1 Message Date
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
Come_744
0cb0813eb7 Add i18n in navigation 2019-10-05 19:40:48 +02:00
Come_744
fd6cce2777 Put the words in a more natural order
In dates: put "same/different" into the sentence.
2019-10-04 23:14:06 +02:00
Come_744
a63f76b450 Correction of a typing mistake 2019-10-03 21:35:45 +02:00
Come_744
5e2193e8aa Translation fr->en
Notice that even if en.json file is fully translated, translation is still not
applied everywhere.
2019-10-03 21:20:10 +02:00
Le Libre Au Quotidien
280783c56b Modify vote component 2019-10-03 18:36:06 +02:00
Come_744
fd27382a9a Add npm i command to README.md
This might be useful to newcomers.
2019-10-03 16:01:49 +02:00
ty kayn
cccf894e56 Merge branch 'ng-init' into 'dev'
integrate Ng init

See merge request framasoft/framadate/funky-framadate-front!1
2019-10-03 15:21:42 +02:00
Le Libre Au Quotidien
8215dfab78 stylize the date 2019-10-03 12:00:34 +02:00
Le Libre Au Quotidien
36192647c0 Corrige center alignement 2019-10-03 11:57:39 +02:00
Le Libre Au Quotidien
940b34fc1c Merge branch 'styles' of https://framagit.org/framasoft/framadate/funky-framadate-front into styles 2019-10-03 11:52:31 +02:00
Le Libre Au Quotidien
1b9c669ae3 Add round to buttons on vote-choice 2019-10-03 11:52:26 +02:00
2d060f9905 date en français dans le choix de vote 2019-10-03 11:48:13 +02:00
1074d219dd 🐛 fix undefined choice 2019-10-03 11:27:25 +02:00
49494236cf Merge branch 'styles' of https://framagit.org/framasoft/framadate/funky-framadate-front into styles 2019-10-02 14:47:53 +02:00
f48d05b518 choice component JS logic and type constraints. demo for dev environment 2019-10-02 14:45:50 +02:00
Le Libre Au Quotidien
9c4fabb176 Minimal commit 2019-10-02 14:10:29 +02:00
Le Libre Au Quotidien
e059d45f73 Add css on vote component : No works 2019-10-01 18:59:14 +02:00
Le Libre Au Quotidien
6cc09aebb5 Add html code for voting 2019-10-01 18:32:24 +02:00