Commit Graph

815 Commits

Author SHA1 Message Date
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
FramaJosephK
f71326f496 Keep polls with bad expiration date in database
(cherry picked from commit c15ce049ad)

Conflicts:
	app/classes/Framadate/Utils.php
2015-01-04 18:33:31 +01:00
JosephK
c9cdc88ffa Produit l'erreur « PHP Parse error: syntax error, unexpected '') === true »
(cherry picked from commit dcee9d4cd6)
2015-01-04 18:31:53 +01:00
FramaJosephK
35ba152199 Retouches après série de merges
(cherry picked from commit 6751a8a9cf)

Conflicts:
	adminstuds.php
	app/classes/Framadate/Utils.php
	creation_sondage.php
2015-01-04 18:29:36 +01:00
Spanti Nicola (RyDroid)
381c4444e3 Minor modifications to Utils.php
(cherry picked from commit e6d171a4b0)

Conflicts:
	app/classes/Framadate/Utils.php
2015-01-04 18:18:59 +01:00
Spanti Nicola (RyDroid)
c3cff57bf3 Small cleaning of choix_date.php
(cherry picked from commit 9017676f70)

Conflicts:
	choix_date.php
2015-01-04 18:14:43 +01:00
Spanti Nicola (RyDroid)
f5ab47ff19 Updating .gitignore
(cherry picked from commit 151f18bd96)

Conflicts:
	.gitignore
2015-01-04 18:05:02 +01:00
Spanti Nicola (RyDroid)
e4d0487c21 Clearer names for LICENSE files
Licence also exists in english. https://en.wiktionary.org/wiki/licence

(cherry picked from commit 0e91c25789)
2015-01-04 17:19:02 +01:00
FramaJosephK
057ebba961 Fix horaires vides + fix mails qui partent pas + de_DE
(cherry picked from commit 2c49a9f0ac)

Conflicts:
	adminstuds.php
	creation_sondage.php
	locale/de_DE/LC_MESSAGES/Studs.mo
	locale/de_DE/LC_MESSAGES/Studs.po
	studs.php
2015-01-04 17:16:30 +01:00
Simon Leblanc
059f4c2fc7 move install into his own folder and split code into class
(cherry picked from commit 1a5846a156)
2015-01-04 17:01:46 +01:00
Simon Leblanc
b459eeb61e First implementation of the installer
(cherry picked from commit 16da53707f)

Conflicts:
	app/inc/constants.php.template
	app/inc/init.php
2015-01-04 16:58:43 +01:00
Simon Leblanc
05702c6cdc Add the composer.lock into the repository
Adding the composer.lock in the repository is a best practice :
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file

(cherry picked from commit 0468fb6d8c)
2015-01-04 16:55:07 +01:00
Simon Leblanc
760932cbf9 complete composer.json file
(cherry picked from commit b9e669a757)
2015-01-04 16:42:39 +01:00
Spanti Nicola (RyDroid)
7483620880 Minor modifications to Utils.php
Cherry-picked :
        e6d171a4

Conflicts:
	app/classes/Framadate/Utils.php
2015-01-04 16:41:11 +01:00
Spanti Nicola (RyDroid)
78c56796f7 Small cleaning of admin/index.php 2015-01-04 16:36:52 +01:00
Olivier PEREZ
15e5b40877 Hide some useless elements when printing 2015-01-04 02:00:02 +01:00
Olivier PEREZ
1330ea825f Remove old .php 2015-01-04 01:37:03 +01:00
Olivier PEREZ
6fff5f107a Poll creation: Fix + Improve end date choice 2015-01-04 01:36:55 +01:00
Olivier PEREZ
bb3d10583d Vote result: Clear markdown tags 2015-01-03 19:06:07 +01:00
Olivier PEREZ
c9ea14362d Fix promblem with Session loading 2015-01-03 19:06:05 +01:00
Olivier PEREZ
985842edf3 CSV Export: Implements export for classical polls 2015-01-03 19:06:03 +01:00
Olivier Perez [a570709]
8f8956d70a Migration: Add precondition on every Migration sub-classes 2015-01-02 09:08:07 +01:00
Olivier PEREZ
ca365ff348 Fix the selected item on langs selection 2015-01-02 00:19:56 +01:00
Olivier PEREZ
a8345cf7f8 Parse markdown on classic votes 2015-01-01 23:24:17 +01:00
Olivier PEREZ
313c1225d0 Vote pages: display number of votes below every slot 2015-01-01 23:06:35 +01:00
Olivier PEREZ
ffc7285cef Update translations 2015-01-01 22:04:20 +01:00
Olivier PEREZ
c533645d29 Make installation from scratch work with migration page 2015-01-01 01:18:49 +01:00
Olivier PEREZ
1578703de6 Fix line breaks on mails sent 2015-01-01 01:17:53 +01:00
Olivier PEREZ
1111b86e2a Define a prefix for database table names. 2014-12-31 15:19:15 +01:00
Olivier PEREZ
c9be94bc19 Migration: Finalize the migration of database from 0.8 to 0.9 2014-12-31 14:25:56 +01:00
Olivier PEREZ
64a017a44c Migration: Add summary at the end of the execution 2014-12-31 14:02:36 +01:00
Olivier PEREZ
88cae82e71 Create a migration system to migrate database.
+ Use this system to migrate from 0.8 to 0.9 (WIP)
2014-12-31 01:33:56 +01:00
Olivier PEREZ
ca00c4953c migration: Create a script to migrate database from 0.8 to 0.9 2014-12-30 18:15:29 +01:00
Olivier PEREZ
d37200addd Change version number to 0.9 2014-12-30 18:15:04 +01:00
Olivier PEREZ
f399b9e543 admin: fix deleteion a slot from a classical poll 2014-12-30 17:03:43 +01:00
Olivier PEREZ
1ca7502216 Translate database names (table+columns) to English + Reorganize some columns 2014-12-30 01:41:25 +01:00
Olivier PEREZ
dcb711dccc Implements purge methods 2014-12-29 21:54:07 +01:00
Olivier PEREZ
10c409e29e LogService: Change date format to "Ymd His" 2014-12-29 21:52:44 +01:00
Olivier PEREZ
23ec39adb2 Create PurgeService 2014-12-28 23:43:47 +01:00
Olivier PEREZ
53048e8488 Fix display of best choices on classic polls 2014-12-27 00:23:56 +01:00
Olivier PEREZ
60ae6bc364 Display a diffrent table if poll is a classic one 2014-12-27 00:00:14 +01:00
Olivier PEREZ
9a067e00ef Fix creation of classic polls 2014-12-26 23:32:53 +01:00
Olivier PEREZ
98f14c487a Enable poll deletion + improve random generator 2014-12-25 01:11:14 +01:00
Olivier PEREZ
9ed0043569 Some cleaning in poll creation 2014-12-25 00:55:52 +01:00
Olivier PEREZ
2f3831d997 Add const LOG_FILE to constants.php.template 2014-12-24 23:44:40 +01:00
Olivier PEREZ
31f62cd62d LogService: Add a line break at the en of lines 2014-12-24 23:38:44 +01:00
Olivier PEREZ
5d8e5362f9 admin: Add some logging on important actions (delete poll, clean votes, clean comments, drop column) 2014-12-24 22:42:50 +01:00