Commit Graph

461 Commits

Author SHA1 Message Date
JosephK
c1d4bed4d5 Merge branch 'olivierperez/framadate-master' into develop
Conflicts:
	admin/index.php
	adminstuds.php
	app/classes/Framadate/Utils.php
	app/inc/config.template.php
	app/inc/init.php
	choix_autre.php
	choix_date.php
	composer.json
	composer.lock
	creation_sondage.php
	locale/de_DE/LC_MESSAGES/Studs.mo
	locale/de_DE/LC_MESSAGES/Studs.po
	locale/en_GB/LC_MESSAGES/Studs.mo
	locale/fr_FR/LC_MESSAGES/Studs.mo
	studs.php
2015-03-04 10:53:43 +01:00
JosephK
312272b1d0 Merge branch 'collisions' into 'master'
Fix Collisions

See merge request !34
2015-03-02 19:33:12 +01:00
FramaJosephK
a445a5d6fa Fix collisions + Inversion bandeau Gitlab entre README et INSTALL 2015-03-02 19:30:26 +01:00
Olivier PEREZ
b051dd59f8 Implement purge in 2 steps
First: Block the poll (no more modification)
Second: Delete the poll 60 days after the expiration date (configurable)
2015-02-28 19:18:59 +01:00
Olivier PEREZ
6e442e02e3 Complete the fix of accent problem during migration 2015-02-26 23:03:49 +01:00
Olivier PEREZ
f40a9e5d2b Admin>Polls: Fix overflow problem on table 2015-02-26 22:50:14 +01:00
Olivier PEREZ
3aa3ee486c Admin: Fix the number of polls + Set to 30 the number of polls displayed per page 2015-02-26 22:29:24 +01:00
Olivier PEREZ
a4dd36d1bc Convert accent from html to utf8 when migrating 2015-02-26 21:29:30 +01:00
JosephK
91a9af07bd Merge pull request #44 from FramaJosephK/import-prod
Bugfix et reprises à partir de la version en prod
2015-02-26 19:09:40 +01:00
FramaJosephK
56c5810c7b Fix bug ajout de colonne et résultats décalés 2015-02-26 18:22:50 +01:00
FramaJosephK
b352192647 Le datepicker mémorise la dernière date sélectionnée 2015-02-26 17:06:09 +01:00
FramaJosephK
3e1ef601ce Nb de colonnes minimum du sondage passé à 1 au lieu de 2 2015-02-26 13:33:03 +01:00
Olivier PEREZ
d30b6d6f7b Fix and improve performance for migration from 0.8 to 0.9 2015-02-26 10:44:49 +01:00
Olivier PEREZ
ca8be9443b Set timeout to 300 sec for the migration page 2015-02-26 10:43:24 +01:00
FramaJosephK
edc7e84bd9 Import des modifs effectuées en prod 2015-02-25 20:58:04 +01:00
Olivier PEREZ
f67137166b Display only one couple 'Month+Year' on every date of this Month+Year 2015-02-02 23:34:47 +01:00
Olivier PEREZ
be754a8628 Fix accessibility on classical polls 2015-02-02 23:32:45 +01:00
Olivier PEREZ
a3b56d6339 HTML-Escape log 2015-02-02 21:09:43 +01:00
Olivier PEREZ
547a186f60 Translate message 'This poll doesn't exist' 2015-02-02 21:00:42 +01:00
Olivier PEREZ
8a0c8bd8d3 Make language selection work better 2015-01-20 00:05:43 +01:00
Olivier PEREZ
70fc0b5c5c Logs have now a specific page in administration 2015-01-18 17:03:47 +01:00
Olivier PEREZ
73a1df84be Improve admin table display 2015-01-18 16:46:54 +01:00
Olivier PEREZ
9054885bcc Update locale .mo 2015-01-18 16:30:31 +01:00
Olivier PEREZ
cbad43614d Re-add count of votes in polls admin page 2015-01-18 16:30:02 +01:00
Olivier PEREZ
f6a7a1c7bb Issue #18 Install pagination on polls admin page 2015-01-18 16:14:45 +01:00
Olivier PEREZ
9098fe0aaa Admin: Redorder polls column title, format, author, email, expiration's date, users, id, actions 2015-01-18 12:14:51 +01:00
Olivier PEREZ
7e04bdff6d Split constants.php in 2 files: constants.php + config.php 2015-01-17 16:47:10 +01:00
Olivier PEREZ
3cf47aa4e1 Issue #14 Use same cookie for / and /admin 2015-01-17 16:30:28 +01:00
Olivier PEREZ
80be71d382 Improve management of errors in infos_sondage page 2015-01-17 16:25:12 +01:00
Olivier PEREZ
87150cc97e Add column receiveNewComments to poll table, to send notification when a user wrote a comment. 2015-01-17 01:28:12 +01:00
Olivier PEREZ
e9b456ad6e (re) Allow accents in names 2015-01-13 08:10:50 +01:00
Olivier PEREZ
08a3fe1b69 Escape html for all bound variables from .tpl files 2015-01-11 14:59:25 +01:00
Olivier PEREZ
19175d12ce Allow accents in names 2015-01-11 14:55:39 +01:00
Olivier PEREZ
1df48988a6 Use CSRF tokens on admin page 2015-01-10 16:35:21 +01:00
Olivier PEREZ
e7ebd55299 WIP Start implmenting CSRF 2015-01-09 09:22:31 +01:00
Olivier PEREZ
8f0e27cb86 Add new labels 2015-01-08 22:18:30 +01:00
Olivier PEREZ
6f7c911bae Issue #26 Admin can change the name of initiator of the poll 2015-01-08 22:18:28 +01:00
Olivier PEREZ
924bd1ed1a Issue #26 Poll admin can change expiration date 2015-01-08 22:18:27 +01:00
Olivier PEREZ
73a5bd3615 Fix label "for" attribute 2015-01-08 22:18:26 +01:00
Olivier PEREZ
afd6079420 Issue #22 Enable vote name modification 2015-01-08 22:18:18 +01:00
Olivier PEREZ
c67a4c7c14 Add some security with strip_tags + Don't encode quotes 2015-01-07 23:16:42 +01:00
Olivier PEREZ
2495a8002f Admin: The polls page now use Smarty template 2015-01-07 22:47:34 +01:00
Olivier Perez [a570709]
1f8fd2e3e2 Admin: Move migration page + add landing page 2015-01-07 14:01:08 +01:00
Olivier PEREZ
073bc9048d Admin: Fix the admin page 2015-01-06 23:52:52 +01:00
Olivier PEREZ
a4f3041a73 Implement error page template 2015-01-06 23:21:10 +01:00
Olivier PEREZ
7727ffde73 Workaround for LC_MESSAGES and some PHP versions 2015-01-05 23:31:12 +01:00
Olivier PEREZ
1e2877e863 Don't encode to HTML value before storing it to database 2015-01-05 23:30:47 +01:00
Olivier PEREZ
b7e43fb271 Merge remote-tracking branch 'framasoft/master' 2015-01-04 22:32:52 +01:00
Olivier PEREZ
342440991a Composer: fix composer.json 2015-01-04 21:34:19 +01:00
Olivier PEREZ
98018de541 Fix some things after cherry-picking 2015-01-04 18:49:57 +01:00