Commit Graph

843 Commits

Author SHA1 Message Date
Olivier PEREZ
551b839292 Display the count of 'if need be' 2015-04-23 23:18:31 +02:00
Olivier PEREZ
7ed21ce9fa Clean choices when changing format of poll during the creation 2015-04-22 00:19:12 +02:00
Olivier PEREZ
11b2018bd0 For date poll, calculate archiving date from last poll choice 2015-04-22 00:11:13 +02:00
Olivier PEREZ
f0bd371b01 Replace 'removal date' words by 'archiving date' in poll creation 2015-04-21 23:58:25 +02:00
Olivier Perez
88f294cfe6 Merge branch 'feature/Smartysize_date_poll_creation' into 'develop'
Smartysize the date poll creation page (step 2 and 3)

* The page creation_date_poll.php is now full Smarty (step 2, step 3, error message)
* When get back from Step3, the form is filled with values stored in session

See merge request !52
2015-04-21 23:32:22 +02:00
Olivier PEREZ
a47c989595 Minor improvment of INSTALL.md 2015-04-21 23:31:40 +02:00
Olivier Perez
8882756c7f Add IT language file 2015-04-17 13:46:06 +02:00
Olivier Perez
433687beaa Fix: Re-add 'choices' to smarty 2015-04-16 13:32:45 +02:00
Olivier Perez
5660a42215 Smartysize error page of date poll creation 2015-04-16 13:21:48 +02:00
Olivier Perez
a1de8def6b Smartysize step 2 of date poll creation 2015-04-16 13:10:28 +02:00
Olivier Perez
3b9dd1fc7e Buttonify edit and delete line 2015-04-15 13:43:47 +02:00
Olivier Perez
f6be93840d Fix for PHP5.4 2015-04-15 13:23:19 +02:00
Olivier Perez
3fb351dbce Don't display description on studs.php if the field is blank 2015-04-15 13:16:55 +02:00
Olivier Perez
f5c4ddddbe Fix missing key 2015-04-15 13:03:13 +02:00
Olivier PEREZ
d14a7ec35d Some style on poll info 2015-04-14 22:43:04 +02:00
Olivier PEREZ
45d14044f8 Factorize a little the mails 2015-04-14 22:32:41 +02:00
Olivier PEREZ
95328cb29c Confidence becomes Trust 2015-04-14 22:06:07 +02:00
Olivier Perez
b83fb90376 Update FULL date format for EN and FR 2015-04-14 14:03:43 +02:00
Olivier Perez
199e41ec93 Fix: description was required 2015-04-14 13:34:42 +02:00
Olivier Perez
a410fd4473 Fix smarty template on ->title 2015-04-14 13:34:15 +02:00
JosephK
57ba11c6bd Merge branch 'trad-italien' into 'master'
Retouches italien

See merge request !51
2015-04-14 10:56:32 +02:00
JosephK
cd67793a8c Retouches italien 2015-04-14 10:54:19 +02:00
Olivier Perez
fc01fe6986 Merge branch 'feature/Package_the_application' into 'develop'
Package the application

**Add package creation script (Issue #43)**

To package the application into a zip file, you will need to go to `/scripts/packaging.php`, and wait for 2 seconds.

The script copy all needed files/directories into `build` directory, then generate the file `dist/framadate-version-date.zip`, then delete directory `build`.

See merge request !48
2015-04-14 09:01:58 +02:00
Olivier PEREZ
2388e461ff Move 'Where are my polls' key into en.json 2015-04-14 00:01:17 +02:00
Olivier PEREZ
942e2cb8d2 Merge branch 'feature/FindMyPolls' into develop
* A new page is available on index, it allows user to send by mail all the polls created by a given mail address
2015-04-13 23:55:40 +02:00
Olivier PEREZ
715bee6d7b Clean after merge request 2015-04-13 23:53:28 +02:00
Olivier Perez
e6a8ed4a90 Merge branch 'develop' into 'develop'
Bug with admin name checking && Step 1 input radio aligment

- Passing from POST to GET some of the admin poll's modification buttons : remove vote, remove column, add column.
- Added create_poll.php a specific css file for the radio buttons aligment.
- Added some args to the poll's URL creation.

See merge request !50
2015-04-13 16:47:40 +02:00
Antonin
0505ab6bb2 Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
	app/classes/Framadate/Utils.php
2015-04-13 16:16:02 +02:00
Antonin
fbd45960b7 Changing some actions from POST to GET. 2015-04-13 15:45:01 +02:00
Olivier PEREZ
3ef40417b2 Fix usage of markdown 2015-04-13 14:52:43 +02:00
JosephK
7b985288e3 Merge branch 'trad-italien' into 'master'
Trad italien

- erreur requête SQL anti-collisions
- bug export CSV
- remplacement "confidence" par "trust"
- ajout italien
- formatage markdown dans le README

See merge request !49
2015-04-13 12:56:58 +02:00
JosephK
ed66fe5c2c Italien + Thanks for your trust 2015-04-13 12:36:20 +02:00
Olivier PEREZ
7b4bc4ad7f Replace $html_lang by $locale 2015-04-13 12:10:07 +02:00
JosephK
2c7dceeb19 Fix erreur requête SQL anti-collision 2015-04-13 11:28:39 +02:00
Antonin
c34e34d728 Change the create_poll radio aligment.
- Update composer.lock by the way
.
2015-04-13 11:18:09 +02:00
Olivier PEREZ
d73ca37f5c Select the right lang in the Language select box 2015-04-11 23:12:01 +02:00
Olivier PEREZ
66edd29b9b Update dependency to o80-i18n 2015-04-11 22:58:18 +02:00
Olivier PEREZ
22e1ee1c40 Reorganize admin name, admin mail and description in poll info block 2015-04-11 18:08:18 +02:00
Olivier PEREZ
7e1f7f026a Some on vote page styling 2015-04-11 17:56:49 +02:00
Olivier PEREZ
faca65b510 Fix problem with 'empty' function and some PHP versions 2015-04-11 17:23:37 +02:00
Olivier PEREZ
6d1f0ada0e Don't allow black title, name or comment 2015-04-11 17:13:16 +02:00
Olivier PEREZ
e4b61ff54b Don't redirect to studs when you edit a vote from adminstuds 2015-04-11 17:03:10 +02:00
Olivier PEREZ
e7da951c9b Remove unused error codes 2015-04-11 16:03:56 +02:00
Olivier PEREZ
201d5168fe Refactor the input filter system 2015-04-11 16:02:07 +02:00
Olivier PEREZ
39c041135a Fix missing key 2015-04-11 15:05:21 +02:00
Olivier Perez
362f08cd4c Refactor the packaging script 2015-04-10 16:55:17 +02:00
Olivier PEREZ
db5e9d8862 Add scripts/packaging.php that create a ZIP of the Framadate 2015-04-10 00:45:31 +02:00
Olivier PEREZ
5ebcfca91e Delete deprecated scripts 2015-04-10 00:44:54 +02:00
Olivier PEREZ
8c4df609d7 Update CHANGELOG.md 2015-04-08 23:05:55 +02:00
Olivier PEREZ
64790496a5 Mails are more nice (using HTML and fixing missing keys) 2015-04-08 22:25:14 +02:00