ab0748597a
Merge branch 'feature/improve-self-editing-vote' into 'develop'
...
Feature : improve self editing vote
Adding a possibility to the user to enter his email address and to receive the personalized url by email.
See merge request !110
2016-05-03 21:16:05 +02:00
a376e18a90
Translation : CLose => Close
2016-05-03 21:12:51 +02:00
00dcd4a006
Better use of the translation system
2016-05-03 21:12:51 +02:00
2297b628dc
Fix comments form URL
2016-05-03 21:11:19 +02:00
02b94b44d3
Merge branch 'bugfix/config_encoding_on_install' into 'develop'
...
Config.php has bad encoding on install
Fix #142
See merge request !114
2016-05-03 21:01:37 +02:00
a6db9e6da1
Fix string
2016-05-03 20:59:45 +02:00
07b60b22f6
Config.php bad encoding on install
2016-05-03 17:24:05 +02:00
6a277eeda3
Merge branch 'improvement/find_poll_email_template' into 'develop'
...
Improvement of the email template to find polls
Fix #78
See merge request !111
2016-05-03 14:21:19 +02:00
d26dae1298
Escaping some forgotten vars in create_poll
2016-05-02 17:44:43 +02:00
2f7b48d142
Improved the email template for finding polls
2016-05-02 15:13:38 +02:00
fc235cefeb
Using o80::i18n shortcut and cleaning
2016-05-02 14:10:14 +02:00
391a8f751b
Added the edit link reminder functionnality
2016-05-01 14:21:31 +02:00
62cc6f6f09
Added some security in add_comment.php
2016-04-29 18:44:33 +02:00
f0c36ec05f
Merge branch 'Ecmu/framadate-Issue51' into develop
2016-04-27 01:15:01 +02:00
4fc2d1022e
Use bg-info background instead of '?' for unanswered slots
2016-04-27 01:13:32 +02:00
8a3e74cadb
Clean code
2016-04-27 00:59:20 +02:00
6d6334aa6d
Improving edit link visibility
2016-04-27 00:12:21 +02:00
96c28738c4
PHP: Check if there are at most MAX_SLOTS_PER_POLL dates before create a poll
2016-04-26 23:16:08 +02:00
51fbee139d
Javascript : Don't let user insert more than 123 dates in a row
2016-04-26 22:45:59 +02:00
c493de7cbe
Merge branch 'develop' into feature/create_interval_date
2016-04-26 21:53:47 +02:00
b35aa2420e
Fix comments deletion
2016-04-12 00:19:15 +02:00
28381f18a6
Merge branch 'Fix/119-Translations-change' into 'develop'
...
119 - Amélioration des traductions pour les permissions d'édition d'un sondage.
Changement des libellés visibles par le créateur d'un sondage concernant les permissions d'édition d'un vote.
Fix #119
See merge request !107
2016-03-23 22:40:14 +01:00
c857eac91c
#51 : make empty vote different from 'No'
2016-03-19 10:30:49 +01:00
03c480e32e
Fix error when customized ID is not selected
2016-03-14 23:55:18 +01:00
783affb73a
Remove trailling dots
2016-03-14 23:55:12 +01:00
8216bcbaa6
#51 : make empty vote different from 'No'
2016-03-13 16:20:38 +01:00
84414aeb97
#51 : make empty vote different from 'No'
2016-03-06 20:50:59 +01:00
af19e08b02
#51 : make empty vote different from 'No'
2016-03-06 20:36:22 +01:00
7da17c4f28
Suppression d'un point inutile dans une traduction.
2016-03-05 18:24:07 +01:00
ebfdf68d15
Libellés changés pour la modification des votes du sondage.
...
Fixes #119
2016-03-05 18:02:22 +01:00
aec2f04965
Fixes #140 - Auto-select url fields when user clicks in it
...
(cherry picked from commit e7064ed70c
2016-03-05 16:42:34 +01:00
e7064ed70c
Fixes #140 - Auto-select url fields when user clicks in it
2016-03-05 16:35:13 +01:00
67ed7977d6
Classical poll - Add missing check of $expired
2016-03-05 16:24:54 +01:00
449f6bfc9d
Date poll - Don't display vote form when not granted
2016-03-05 16:17:18 +01:00
0ffdbe8573
Merge branch 'master' into develop
2016-03-05 15:59:10 +01:00
510b797f85
Check if current user is admin BEFORE check editedVoteUniqueId
2016-01-19 22:28:34 +01:00
3fc25c0c4a
Can't vote if admin made some changes on slots
2015-12-09 00:23:32 +01:00
c6f3b9b527
Fill "action" attribute in comments form
2015-12-08 00:20:34 +01:00
ab9c0660cf
Merge branch 'feature/UrlNaming' into 'develop'
...
Choix de l'URL du sondage
Traitement de l'issue #39
- Agrandissement du champ ID
- Possilité de choisir son propre ID dans un champ texte (64 caractères, lettres/nombres/-)
- Si ID choisi => L'ID de l'admin est généré sur 24 caractères
- Si ID non choisi => L'ID de l'admin est généré sur 8 caractères + les caractères de l'ID
- Changement du htaccess
See merge request !97
2015-12-07 11:24:26 +01:00
604be480c4
UrlNaming - "Translate"
2015-12-05 19:26:32 +01:00
fac20a5908
UrlNaming - Add ID field to creation form
2015-12-05 17:28:35 +01:00
86fb49d51e
Fix tpl binding
2015-12-05 14:38:24 +01:00
a9bddc94b3
Affichage d'un titre sur l'entête des colonnes
2015-12-02 17:29:42 +01:00
c78613481e
Merge branch 'master' into develop
...
Conflicts:
CHANGELOG.md
htaccess.txt
locale/it.json
studs.php
tpl/part/vote_table_classic.tpl
tpl/part/vote_table_date.tpl
2015-11-30 21:55:56 +01:00
9accf7dab8
Add modal to insert an interval of dates
2015-11-30 21:04:17 +01:00
5750a36172
Rename add_slot by add_column
2015-11-30 20:38:53 +01:00
5d4958e1f4
Encode action values in base64 instead of url_encode (because of UrlRewrite)
2015-11-30 20:26:23 +01:00
9b4b72e3d4
Fix title of button to add column
2015-11-25 01:35:10 +01:00
2dd68146a2
Merge branch 'fix/Issue109_delete_column' into 'master'
...
Fixes issue #109 - Urlencode title of column to delete for classical polls too
Tout est dans le titre 😃
See merge request !85
2015-11-05 22:45:01 +01:00
171d45938c
Move URL encore to Utils::getUrlSondage
2015-11-05 22:43:54 +01:00
e1221b5a90
It's better to also correct the date poll...
2015-11-05 21:37:51 +01:00
3f774d5445
On permet d'éditer son vote à la volée.
...
Dans le cas d'un vote ou l'utilisateur ne peut modifier que son propre vote, après qu'il ait ajouté (ou édité) son vote, on affiche le crayon qui permet d'éditer son vote.
Fix #116
2015-11-05 21:26:59 +01:00
afe8eac89b
Fixes issue #109 - Urlencode title of column to delete for classical polls too
2015-11-05 21:02:49 +01:00
d72c5295ce
useless spaces
2015-10-30 22:02:24 +01:00
3eae4d97d4
Local improvement (remove useless dots)
...
- French errors messages were missing due to bad merge.
2015-10-30 22:00:43 +01:00
15c57eeb37
Allows the admin to modify password related stuff.
2015-10-30 20:45:18 +01:00
c6d6ad2393
Applying the password restriction in studs.
2015-10-29 11:52:13 +01:00
161b6b14c0
Password options are used with poll creation.
...
- Just found that the "hidden" parameter wasn't...
2015-10-29 11:52:13 +01:00
2cfeb385bb
Admin: Search in polls by author's mail address
2015-10-28 13:06:02 +01:00
3f1f957c5e
Merge branch 'feature/ajax_submission_for_comments' into 'develop'
...
Feature - ajax submission for comments
The sending of comments has been ajaxified, in order to prevent the lose of vote data while commenting.
The comment list is also refreshed while commenting.
See merge request !72
2015-10-26 17:00:40 +01:00
166927f8af
Ajaxifisation des commentaires.
...
- Permet de ne pas perdre ses votes à l'ajout d'un commentaire.
- On rafraichit aussi à l'envois du commentaire la liste des commentaires.
Fix #3
2015-10-22 22:50:53 +02:00
69a5bc2e1c
Hide poll hint into a modal
2015-10-13 00:42:33 +02:00
4fa4ee0acc
Merge branch 'master' into develop
...
Conflicts:
admin/migration.php
2015-10-12 23:46:02 +02:00
0e8ee276e7
If SMTP is enabled, 'private result' option is still activated.
2015-10-12 23:29:53 +02:00
6196a53a45
Display the comment timestamp
2015-10-12 23:14:21 +02:00
de18f826f0
The name can be any value.
...
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.
Fix #97
2015-10-12 21:26:13 +02:00
7cd51d38f3
Fix deletion when slot label contains html specific characters
2015-10-05 23:51:29 +02:00
f634e36344
Replace HR with DIV
2015-09-23 22:18:22 +02:00
e3ef7e564a
Fix css header responsive
2015-09-21 10:24:25 +02:00
9a3590a9e1
Fix css header + Framanav
2015-09-21 10:03:18 +02:00
5ebd83e681
Fix responsive header
2015-09-20 13:39:35 +02:00
2a6b8acfe1
Some responsive
2015-09-19 17:01:07 +02:00
24a7fb7df2
Optimize selection of polls in admin page
2015-09-13 00:53:03 +02:00
cbc5727ce4
Install: Display previous selections when installation failed
2015-09-07 16:37:03 +02:00
fd27c135c8
Install: Prefill the fields with values from InstallService
2015-09-07 16:36:57 +02:00
a7727d8523
Install: Create installation page
2015-09-07 16:36:25 +02:00
5772277792
Don't skip the last column on charts
2015-06-23 21:54:39 +02:00
20378e7fb7
No = fake btn unchecked in vote form + icon display onload and mouseover in results
2015-06-17 23:13:44 +02:00
3458b9b51a
Charts + Addition + little fixes
2015-06-17 22:39:14 +02:00
d365f18c01
Fix message when delete a poll
2015-05-30 23:27:17 +02:00
cdf4f0caec
Merge branch 'release/0.9' into 'release/0.9'
...
Bugfixes
- Prévention de la suppression du dernier slot
- Correction des problèmes de \n dans la description et les commentaires
- Correction de la date de suppression du sondage
- Blindage du format de la date d'expiration du sondage
See merge request !55
2015-05-29 19:07:48 +02:00
c9c45a2d24
Send mail to admin when update/delete a poll
2015-05-29 19:03:29 +02:00
4ced550942
Merge remote-tracking branch 'upstream/release/0.9' into release/0.9
2015-05-29 18:59:09 +02:00
64b79965c6
Fixing the description newlines problem
...
- As it is now, description can't be in error state : we are waiting the markdown implementation to eventually change that.
- Comments are now normaly formated (newlines are taken into account)
- The title, description and comment regexes are now useless. Deleted.
2015-05-29 18:38:03 +02:00
b717bee765
Remove '?' image on 'Where are my polls' link
2015-05-29 18:25:48 +02:00
4cacb412c6
Admin : Change colors on purge button
2015-05-29 16:06:50 +02:00
430cb511b6
Fix label for 'name' in comments form
2015-05-29 12:34:54 +02:00
d5cf1aa5a7
Add hidden-print class on vote line and actions column
2015-05-29 12:00:56 +02:00
60069b1151
Add hidden-print class on some alerts block
2015-05-29 11:48:47 +02:00
35da81a4cd
Remove "." at the end of options
2015-05-29 11:28:04 +02:00
4aee1d71e4
Fix: Display framanav when present
2015-05-25 00:02:20 +02:00
67d0516161
Remove icon on 'Send me my polls' button + Make it btn-success
2015-05-24 23:44:43 +02:00
f21892dc26
Put i18n on aria-label
2015-05-24 23:41:08 +02:00
551b839292
Display the count of 'if need be'
2015-04-23 23:18:31 +02:00
a1de8def6b
Smartysize step 2 of date poll creation
2015-04-16 13:10:28 +02:00
3b9dd1fc7e
Buttonify edit and delete line
2015-04-15 13:43:47 +02:00
f6be93840d
Fix for PHP5.4
2015-04-15 13:23:19 +02:00
3fb351dbce
Don't display description on studs.php if the field is blank
2015-04-15 13:16:55 +02:00
d14a7ec35d
Some style on poll info
2015-04-14 22:43:04 +02:00
a410fd4473
Fix smarty template on ->title
2015-04-14 13:34:15 +02:00
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
0505ab6bb2
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
app/classes/Framadate/Utils.php
2015-04-13 16:16:02 +02:00
fbd45960b7
Changing some actions from POST to GET.
2015-04-13 15:45:01 +02:00
3ef40417b2
Fix usage of markdown
2015-04-13 14:52:43 +02:00
7b4bc4ad7f
Replace $html_lang by $locale
2015-04-13 12:10:07 +02:00
c34e34d728
Change the create_poll radio aligment.
...
- Update composer.lock by the way
.
2015-04-13 11:18:09 +02:00
d73ca37f5c
Select the right lang in the Language select box
2015-04-11 23:12:01 +02:00
22e1ee1c40
Reorganize admin name, admin mail and description in poll info block
2015-04-11 18:08:18 +02:00
7e1f7f026a
Some on vote page styling
2015-04-11 17:56:49 +02:00
6d1f0ada0e
Don't allow black title, name or comment
2015-04-11 17:13:16 +02:00
e4b61ff54b
Don't redirect to studs when you edit a vote from adminstuds
2015-04-11 17:03:10 +02:00
77234edc82
Add page where the users can ask to receive their polls by mail
2015-04-08 22:11:19 +02:00
4a83c2192a
Smartysize the maintenance page
2015-04-07 21:32:21 +02:00
593d39c9cb
Fix missing keys
2015-04-07 20:06:24 +02:00
84e3a93645
Add edit link with vote update
2015-04-07 17:58:45 +02:00
fbf448c415
No space before ':' in english...
2015-04-07 17:46:30 +02:00
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
0c2ba20bfa
Added option of poll with hidden results.
2015-04-05 18:36:43 +02:00
a3f5763edd
New edition possibility is taken into account
...
- Also added Framadate\Message à link attribute
- Added local anchor #edit with vote edition
- For now, when the poll owner check the new edit option (ie: "Votes are editable solely by their owner"), users get their update link on vote creation
2015-04-05 17:44:29 +02:00
1f55167e2c
Added new editable possibility at poll creation
2015-04-05 15:41:19 +02:00
6d31f180e3
Javascript protection on invalid name : can now use form submission.
2015-04-02 17:25:01 +02:00
4c137748b4
Editing vote by link with unique id
...
- Changed the smarty modifier poll_url to a function and added the vote_id parameter
- Modified accordingly all poll_url occurence in templates
- Added htaccess.txt to be sure to keep poll's URL changes up to date
- Escaped some templates output in order to avoid to broke HTML
- Using vote's uniqId instead of vote's id when it's needed
2015-04-02 16:56:52 +02:00
6d34631fbf
Replace calls to __('Section\Key') with __('Section', 'Key')
2015-03-30 15:19:56 +02:00
da2cdeda12
Smartysize infos_creation, and rename it to create_poll
2015-03-29 22:13:22 +02:00
a2f2118087
Smartysize index.php
2015-03-29 19:32:15 +02:00
b298c61869
Fix problem when user want to edit a line, and see the msg 'The name is invalid'
2015-03-29 16:02:48 +02:00
eb4b40d1d6
Admin: Re-add crsf on polls list form
2015-03-29 13:18:00 +02:00
12bf92249c
Smarty: Inline head.tpl and footer.tpl into page.tpl
2015-03-27 13:10:55 +01:00
40d707c96d
Issue #18 Add search engine on admin polls list
2015-03-27 13:10:46 +01:00
b3d79da0a6
Changing message creation logic.
2015-03-26 17:09:52 +01:00
e4ec0c8105
Passing message directly in template
2015-03-26 16:48:39 +01:00
b66a47ef67
Added simple javascript check for the name.
...
- The goal here is to prevent the losing of the choices by having a bad name.
- This is a POC, there is probably some cleaning before merge
2015-03-26 16:33:11 +01:00
a19e7c48bb
Fix missing key about Expiration date
2015-03-26 00:20:48 +01:00
49cb30780d
Update DE lang to match the FR one
2015-03-25 23:50:53 +01:00
674a032e3c
Update EN lang to match the FR one
2015-03-24 19:08:06 +01:00
0aedb01933
Change i18n system around classical polls
2015-03-24 17:59:52 +01:00
bd7c401a83
Admin: Fix links of polls list pagination
2015-03-24 00:26:43 +01:00
659cf997b8
Change i18n system in admin pages
2015-03-24 00:22:37 +01:00
0ced885fe7
Change i18n system around adminstuds.php + Add some missing keys
2015-03-24 00:04:07 +01:00
119d0e01e1
Start changing the i18n system.
...
* Now works on windows servers
* Byebye .po/.mo, welcome .json
* Byebye old gettext library, welcome o80-i18n
2015-03-22 23:33:03 +01:00
0efc3d4bcc
Fix the update of poll infos
2015-03-18 00:46:19 +01:00
6bbe03758c
Start splitting core.js
...
New files :
* classic_poll.js -> loaded on page choix_autre.php
* date_poll.js -> loaded on page choix_date.ph
* framadatepicker.js -> loaded on pages that need the date picker
2015-03-05 14:59:32 +01:00
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
f40a9e5d2b
Admin>Polls: Fix overflow problem on table
2015-02-26 22:50:14 +01:00
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
d30b6d6f7b
Fix and improve performance for migration from 0.8 to 0.9
2015-02-26 10:44:49 +01:00
f67137166b
Display only one couple 'Month+Year' on every date of this Month+Year
2015-02-02 23:34:47 +01:00
be754a8628
Fix accessibility on classical polls
2015-02-02 23:32:45 +01:00
a3b56d6339
HTML-Escape log
2015-02-02 21:09:43 +01:00
8a0c8bd8d3
Make language selection work better
2015-01-20 00:05:43 +01:00
Olivier Perez