Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
1,065 Commits 11 Branches 32 Tags 9.3 MiB
c350a7a012
Commit Graph

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonin
daf7fcd30a Bug sur l'éditabilité des sondage. 2016-10-14 08:22:15 +02:00
Antonin
7a1033b216 Merge branch 'master' into release 2016-10-14 07:28:03 +02:00
Antonin
1714434eb9 Merge branch 'task/merge-dutch-language-from-master' into 'release' 
Task - merge dutch language from master

I also normalized the indentation from the current javascript "norm" of the project.

All `locale/` files of the b2d8723043 commit are just from the change of indentation: Gitlab doesn't seem to have a "ignore whitespace" functionality yet, so that's better to be said...

See merge request !160
 2016-10-14 07:12:09 +02:00
Antonin
b2d8723043 Unification of locale indentation. 2016-10-13 17:40:48 +02:00
Antonin
ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +02:00
Antonin
76c2b1ae1c Merge branch 'patch-1' into 'release' 
Update oc.json

Translated the remaining French bits

See merge request !159
 2016-10-12 20:22:13 +02:00
Quentin
4eb2d8b381 Update oc.json 2016-10-12 20:01:23 +02:00
Antonin
a414f96a88 Merge branch 'patch-1' into 'release' 
Update br.json

translate missing strings
(made online with gitlab, sorry for the ugly branch name)

See merge request !158
 2016-10-12 17:30:51 +02:00
Gwenn
72221fd0a3 Update br.json 2016-10-12 17:19:48 +02:00
Olivier PEREZ
134cd23f5f Mise à jour de la release note 2016-10-06 23:52:57 +02:00
Olivier Perez
1dfb276b52 Merge branch 'task/update-composer-lock' into 'release' 
Update composer.lock



See merge request !157
 2016-10-06 23:41:28 +02:00
Antonin
22956d4c2c Update composer.lock 2016-10-06 23:39:57 +02:00
Olivier PEREZ
2377013a6f Fix Breton dates management 2016-10-06 23:36:07 +02:00
Antonin
671f37c05c Merge branch 'feature/Disable_when_results_are_hidden' into 'release' 
Disable when results are hidden

Fix #196

See merge request !154
 2016-10-06 22:46:24 +02:00
Olivier Perez
1d43293276 Merge branch 'bugfix/translate-optionnal-parameters' into 'release' 
Added missing translation for "Optional parameters"



See merge request !156
 2016-10-06 22:43:28 +02:00
Olivier PEREZ
73de6199fa Password protected polls cannot be exported 2016-10-06 22:42:57 +02:00
Antonin
8bc9b05329 Added missing translation for "Optional parameters" 2016-10-06 22:39:13 +02:00
Olivier PEREZ
d980571a74 Disable export when results are invisibles 2016-10-06 21:13:01 +02:00
Olivier PEREZ
e8aac339f0 Booleanize some fields 2016-10-06 20:56:23 +02:00
Olivier PEREZ
357bc89d16 Remove useless default SQL columns 2016-10-06 20:37:46 +02:00
Antonin
785d1fe55f Merge branch 'translation' into 'develop' 
Update French Translation



See merge request !151
 2016-09-28 15:55:27 +02:00
Antonin
05faa85074 Merge branch 'patch-1' into 'develop' 
Update add_comment.php: update sendUpdateNotification parameters order



See merge request !150
 2016-09-05 16:41:20 +02:00
Olivier Perez
52d7e88b00 Merge branch 'feature/hide-optionnal-parameters' into 'develop' 
Collapse by default optional parameters

To be cherry-picked on `release`.

See merge request !147
 2016-08-09 01:23:38 +02:00
Olivier Perez
f3ce74d997 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop' 
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
 2016-08-08 17:15:45 +02:00
Olivier Perez
08d623a1e1 Merge branch 'bugfix/add-tooltip-on-table-headers' into 'master' 
Added the missing title attribute

Fix #189

See merge request !145
 2016-08-08 15:10:47 +02:00
Olivier Perez
1d5af5de3b
Add missing translations 2016-08-05 12:02:41 +02:00
Antonin
9eb55db522 Added the missing title attribute 2016-08-04 22:28:05 +02:00
Olivier Perez
651289ec2d Merge branch 'bugfix/typo-in-comment-header' into 'develop' 
Correcting comment typo in file header

Fix #190 

See merge request !144
 2016-08-04 22:26:50 +02:00
Antonin
c50ca48efd Merge branch 'feature/rework_poll_creation_1st_page' into 'release' 
Rework on 1st page of poll creation



See merge request !142
 2016-08-04 22:07:52 +02:00
Olivier Perez
4b433bc124 Merge branch 'feature/disable_auto_complete' into 'develop' 
Disabled autocompletion on the datepicker input

Avoid autocompletion of the datepicker input field to occur
(Step to reproduce : Long click on a datepicker input field)

See merge request !141
 2016-08-04 21:55:09 +02:00
Olivier Perez
9b39dd2fa1
New style of URL customization 2016-08-04 21:44:31 +02:00
Olivier Perez
64fe5e0589
Add 'Permissions' section 2016-08-04 20:19:17 +02:00
Antonin
fe3e1bc8b7 Merge branch 'feature/update-breton-translation' into 'develop' 
Update, fix and add breton translation to correct branch



See merge request !143
 2016-08-04 17:29:29 +02:00
Antonin
ccddddaf2d Merge branch 'Issue187' into 'develop' 
Install framadate in non empty database

Modifications pour l'issue #187.

See merge request !139
 2016-08-04 16:57:38 +02:00
Olivier Perez
7b5f42b174 New style for password fields 2016-07-29 17:50:37 +02:00
Olivier Perez
8066e18ae7 Reorder parameters at poll creation 2016-07-29 17:49:52 +02:00
Olivier Perez
d7675831e1
New style of poll id 2016-07-29 14:47:56 +02:00
JosephK
a34b767f8e Bandeau README + URL Framanav 2016-07-19 08:38:01 +02:00
Olivier Perez
e642d1e35c Merge branch 'bugfix/php54-empty-compatibility' into 'develop' 
PHP5.4 compatibility for empty() function.



See merge request !137
 2016-07-07 15:11:35 +02:00
Olivier Perez
0cf52c8461 Merge branch 'bugfix/install-config-escape' into 'develop' 
Added escaping for install in config.tpl

In the installation process, string like the one below should be a valid application name (or DB password).
> Framadate c'est vraiment super ! "Datez" comme vous voulez \o/

It missed some escaping for single quote (') and backslash (\\), resulting in PHP parse errors.

It should be cherry-picked to the `release` branch too.

See merge request !136
 2016-07-07 14:16:09 +02:00
Antonin
b3ecf1262f Merge branch 'Fix_edition_of_expired_poll' into 'release' 
Fix edition limits for expired polls

Fix #129 

See merge request !117
 2016-07-01 00:34:42 +02:00
Olivier Perez
7adb14f3ef Merge branch 'bugfix/double-escaped-field-in-create-poll' into 'release' 
Correcting escaping in create_poll.php

In create_poll.php, removing of the php escaping and completion of the template ones.

See merge request !134
 2016-06-30 23:42:15 +02:00
Olivier Perez
0a8d955f77
Update CHANGELOG.md 2016-06-30 23:36:50 +02:00
Antonin
2af04c3b1a Removing php escape and completing template ones. 2016-06-30 23:10:47 +02:00
Olivier Perez
90963f0fc4 Merge branch 'doc/contributing-git-branch' into 'master' 
Readme: added the contributing git branch

Added in the `README.md` from which branch the contributing users can work.

See merge request !133
 2016-06-30 22:35:48 +02:00
Antonin
19182e98e3 Readme: added the contributing git branch 2016-06-30 22:17:19 +02:00
Antonin
9fe4fa159e Merge branch 'feature/breton-translation' into 'master' 
Add breton translation



See merge request !120
 2016-06-30 20:53:16 +02:00
Olivier Perez
fa5014de32
Fixed expiry date edition 2016-06-30 20:48:30 +02:00
Olivier Perez
d3db76ccd7
Allow admin to delete an expired poll 2016-06-30 20:09:22 +02:00
Olivier Perez
5862e647d3
Fix edition limits for expired polls 2016-06-30 20:09:22 +02:00