Olivier Perez
f0c36ec05f
Merge branch 'Ecmu/framadate-Issue51' into develop
2016-04-27 01:15:01 +02:00
Olivier Perez
11ff60a170
Fix CHOICE_REGEX to allow space
2016-04-27 01:01:23 +02:00
Olivier PEREZ
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
Olivier PEREZ
0ffdbe8573
Merge branch 'master' into develop
2016-03-05 15:59:10 +01:00
Olivier Perez
a095c763fd
Merge branch 'feature/Occitan' into 'master'
...
Feature/occitan
Request in order to integrate the Occitan language, in its lengadocian version, to Framadate. The ISO code is OC.
See merge request !101
2016-02-25 14:51:35 +01:00
Quentin
2caa5117d6
Update to add the Occitan language
2016-02-23 09:25:05 +01:00
Olivier PEREZ
bde59fe974
Fix the position computation to insert default vote when adding column
2016-02-22 23:51:50 +01:00
Olivier PEREZ
2109ef3469
More precision on MD5 regex
2016-01-06 19:38:19 +01:00
Olivier PEREZ
3fc25c0c4a
Can't vote if admin made some changes on slots
2015-12-09 00:23:32 +01:00
Olivier PEREZ
cb0e74fba8
Fixes #124 - vote deletion
2015-12-08 00:20:23 +01:00
Antonin
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
Olivier Perez
a4ff2aaaa6
Standardization of regex format
2015-12-07 10:35:06 +01:00
Olivier PEREZ
6823133322
Update Framadate version number
2015-12-05 21:20:19 +01:00
Olivier PEREZ
17d050507b
UrlNaming - Allow new id format when loading a poll
2015-12-05 17:28:40 +01:00
Olivier PEREZ
fac20a5908
UrlNaming - Add ID field to creation form
2015-12-05 17:28:35 +01:00
Antonin
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
Olivier PEREZ
171d45938c
Move URL encore to Utils::getUrlSondage
2015-11-05 22:43:54 +01:00
Olivier PEREZ
4fa4ee0acc
Merge branch 'master' into develop
...
Conflicts:
admin/migration.php
2015-10-12 23:46:02 +02:00
Antonin
6196a53a45
Display the comment timestamp
2015-10-12 23:14:21 +02:00
Antonin
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
JosephK
74d5d87dae
Oups… :-/
2015-09-21 13:06:47 +02:00
JosephK
9a3590a9e1
Fix css header + Framanav
2015-09-21 10:03:18 +02:00
Olivier PEREZ
254512c55a
Install: Redirections between Install and Index
2015-09-07 16:36:42 +02:00
Olivier PEREZ
a7727d8523
Install: Create installation page
2015-09-07 16:36:25 +02:00
Olivier PEREZ
a6788d81c2
Host can now force URL, used behind a reverse-proxy
2015-06-23 22:03:56 +02:00
Antonin
4ced550942
Merge remote-tracking branch 'upstream/release/0.9' into release/0.9
2015-05-29 18:59:09 +02:00
Antonin
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
Olivier PEREZ
8313b9345d
Fix after update o80-i18n
2015-05-29 17:13:35 +02:00
Olivier Perez
8882756c7f
Add IT language file
2015-04-17 13:46:06 +02:00
Olivier Perez
199e41ec93
Fix: description was required
2015-04-14 13:34:42 +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
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
7b4bc4ad7f
Replace $html_lang by $locale
2015-04-13 12:10:07 +02:00
Olivier PEREZ
d73ca37f5c
Select the right lang in the Language select box
2015-04-11 23:12:01 +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
77234edc82
Add page where the users can ask to receive their polls by mail
2015-04-08 22:11:19 +02:00
Olivier PEREZ
663f08f607
Merge branch 'feature/Work_on_Service_and_Repository' into develop
2015-04-07 22:26:13 +02:00
Antonin
1058d3653b
Correcting 'Undefined index' notice on DevMode var
2015-04-07 17:40:20 +02:00
Antonin
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
Antonin
1f55167e2c
Added new editable possibility at poll creation
2015-04-05 15:41:19 +02:00
Olivier PEREZ
7ad74ae03a
Create PollRepository + Extract creation poll code from Service to Repository
2015-04-02 23:10:41 +02:00
Antonin
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
Antonin
86a89abf42
Added unique id to vote.
2015-04-02 12:03:38 +02:00
Antonin
09ca8b28a7
Added smarty developer configuration.
2015-04-02 11:57:12 +02:00
Olivier PEREZ
6d34631fbf
Replace calls to __('Section\Key') with __('Section', 'Key')
2015-03-30 15:19:56 +02:00
Olivier PEREZ
da2cdeda12
Smartysize infos_creation, and rename it to create_poll
2015-03-29 22:13:22 +02:00
Olivier PEREZ
0aedb01933
Change i18n system around classical polls
2015-03-24 17:59:52 +01:00