Commit Graph

872 Commits

Author SHA1 Message Date
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
Olivier PEREZ
77234edc82 Add page where the users can ask to receive their polls by mail 2015-04-08 22:11:19 +02:00
Olivier PEREZ
8b3eaac717 Fixes after merge 2015-04-07 23:17:26 +02:00
Olivier PEREZ
663f08f607 Merge branch 'feature/Work_on_Service_and_Repository' into develop 2015-04-07 22:26:13 +02:00
Olivier PEREZ
223019b0a7 Git ignore admin/stdout.log 2015-04-07 22:02:08 +02:00
Olivier PEREZ
cfe653f144 Replace " by ' 2015-04-07 22:00:48 +02:00
Olivier PEREZ
15baf349de Always show vote result on adminstuds 2015-04-07 21:55:34 +02:00
Olivier PEREZ
4a83c2192a Smartysize the maintenance page 2015-04-07 21:32:21 +02:00
Olivier PEREZ
593d39c9cb Fix missing keys 2015-04-07 20:06:24 +02:00
Olivier Perez
e26af38b35 Merge branch 'feature/hidden-and-private-polls' into 'develop'
Feature/hidden and private polls

**Added an option for the poll's hidden results**
  - At poll creation, a new checkbox is added to hide the results
  - At poll visualization, results are hidden if option is activated
  - At poll edition by the poll maker, the hidden option can be changed

**Added a new edition option**
  - At poll creation, we can choose between "no user modification" and "all users can modify every vote" like before. But we can now also select "each vote can be modified by its owner"
  - This edition option is also available for the poll maker in the poll administration interface
  - When a user votes with this new option activated, an edition link is displayed to him : only this link can allow the user to modify its vote.
  - This functionality will be useful to create "private polls" later.

**Side work**
  - The token generation is now safer, with fallback to unsafe version if the php functions are not available
  - An anchor is added to the edit link, to scroll down to the current line that the user is editing
  - Commited composer.lock (good practice)
  - Added the root htaccess.txt to keep the CLEAN_URL format updated
  - The Message class can now contain a link (only displayed in studs.php where I needed it)

See merge request !45
2015-04-07 18:43:47 +02:00
Antonin
84e3a93645 Add edit link with vote update 2015-04-07 17:58:45 +02:00
Antonin
fbf448c415 No space before ':' in english... 2015-04-07 17:46:30 +02:00
Antonin
bd00cf1915 From double quote to simple quote 2015-04-07 17:40:20 +02:00
Antonin
1058d3653b Correcting 'Undefined index' notice on DevMode var 2015-04-07 17:40:20 +02:00
Antonin
af668d2428 Correcting 'Undefined index' notice on hidden 2015-04-07 17:40:20 +02:00
Antonin
213980e807 Remove POST['poll'] access 2015-04-07 17:39:57 +02:00
Antonin
16143d4ac8 Changed defaut edition option 2015-04-06 14:06:47 +02:00
Antonin
1e39eae056 Changed the file header to framadate license 2015-04-06 12:54:18 +02:00
Antonin
3043ce044f Merge branch 'develop' into feature/hidden-and-private-polls 2015-04-06 12:46:31 +02:00
Antonin
db69a9a695 Merge remote-tracking branch 'upstream/develop' into develop 2015-04-06 12:44:51 +02:00
Antonin
a135f74383 Hidden results option is taken into account.
- Also added possibility for the poll's maker to edit this hidden results option.
2015-04-06 12:40:59 +02:00
Antonin
0c2ba20bfa Added option of poll with hidden results. 2015-04-05 18:36:43 +02:00