Commit Graph

143 Commits

Author SHA1 Message Date
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
Olivier PEREZ
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
Olivier PEREZ
1d5a33b560 Remove the notion of 0.9.1, replace it with 0.9 2015-03-05 21:30:33 +01:00
Olivier PEREZ
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
Olivier PEREZ
be754a8628 Fix accessibility on classical polls 2015-02-02 23:32:45 +01:00
Olivier PEREZ
8a0c8bd8d3 Make language selection work better 2015-01-20 00:05:43 +01:00
Olivier PEREZ
f6a7a1c7bb Issue #18 Install pagination on polls admin page 2015-01-18 16:14:45 +01:00
Olivier PEREZ
7e04bdff6d Split constants.php in 2 files: constants.php + config.php 2015-01-17 16:47:10 +01:00
Olivier PEREZ
3cf47aa4e1 Issue #14 Use same cookie for / and /admin 2015-01-17 16:30:28 +01:00
Olivier PEREZ
80be71d382 Improve management of errors in infos_sondage page 2015-01-17 16:25:12 +01:00
Olivier PEREZ
87150cc97e Add column receiveNewComments to poll table, to send notification when a user wrote a comment. 2015-01-17 01:28:12 +01:00
Olivier PEREZ
e9b456ad6e (re) Allow accents in names 2015-01-13 08:10:50 +01:00
Olivier PEREZ
08a3fe1b69 Escape html for all bound variables from .tpl files 2015-01-11 14:59:25 +01:00
Olivier PEREZ
19175d12ce Allow accents in names 2015-01-11 14:55:39 +01:00
Olivier PEREZ
c67a4c7c14 Add some security with strip_tags + Don't encode quotes 2015-01-07 23:16:42 +01:00
Olivier Perez [a570709]
1f8fd2e3e2 Admin: Move migration page + add landing page 2015-01-07 14:01:08 +01:00
Olivier PEREZ
7727ffde73 Workaround for LC_MESSAGES and some PHP versions 2015-01-05 23:31:12 +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
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
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
1111b86e2a Define a prefix for database table names. 2014-12-31 15:19:15 +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
d37200addd Change version number to 0.9 2014-12-30 18:15:04 +01:00
Olivier PEREZ
2f3831d997 Add const LOG_FILE to constants.php.template 2014-12-24 23:44:40 +01:00
Olivier PEREZ
4818d7977a Update constants.php.template 2014-12-23 09:33:00 +01:00
Olivier PEREZ
410d2127ce admin: Add some work to poll information pane. 2014-12-17 23:43:06 +01:00
Olivier PEREZ
7c5ba2eb17 Split parts of studs.tpl into severals sub-templates. 2014-12-17 23:12:05 +01:00
Olivier PEREZ
80b06d65cd Some work on vote saving 2014-12-17 13:17:08 +01:00
Olivier PEREZ
d54f2e4759 Improve usage of namespace + Create PollService in /Framadate/Service namespace 2014-12-16 00:02:01 +01:00
Olivier PEREZ
2480d441d4 Remove code in comment 2014-12-15 13:55:46 +01:00
Olivier PEREZ
ea105960b4 Add line to add vote + Add line to show best choices 2014-12-14 00:16:49 +01:00
Olivier PEREZ
fcaea63b84 A big part of refactoring
* Use Smarty to split View and Controller on studs page (work in progress)
* Add field "active" to Poll
* And some other stuff...
2014-12-12 13:46:55 +01:00
Olivier PEREZ
de04d47434 Minor changes on "constants.php.template" 2014-12-05 01:09:14 +01:00
Olivier PEREZ
1437eaf47e Refactoring some code:
* Store all informations about forms into an object "Form" stored in $_SESSION['form']
* Replace connection to database by PDO object
* Check if database is ready in bandeaux.php file
2014-12-03 21:08:08 +01:00
Bob Le Bricodeur
0239dd0735 Add environment variable to be able to switch between languages using Windows 2014-11-15 00:46:55 +01:00
Bob Le Bricodeur
7cee54901f Adaptation setlocale en fonction de l'environnement (Windows) 2014-11-14 22:35:19 +01:00
FramaJosephK
307f36ae64 fix a11y + reprise config.inc + bug date_format win 2014-11-14 17:35:22 +01:00
FramaJosephK
e0ff6ec0e7 liens et images autorisés par défaut + purge auto limitée à 50 pour 1 créé 2014-11-13 21:33:20 +01:00
Bob Le Bricodeur
a716ef8c47 delete configuration option $show_language_bar_selection
condition is based on the number of languages configured
2014-11-12 21:28:27 +01:00
Bob Le Bricodeur
eb5677e451 new parameter '$use_smtp' to disable email notification if needed
bug correction on email notification (using '$dsondage->titre' in adminstuds.php)
2014-11-12 21:17:52 +01:00
Bob Le Bricodeur
52a783fba2 MAJ https://github.com/framasoft ==> https://git.framasoft.org/framasoft/framadate 2014-11-12 11:44:57 +01:00
Bob Le Bricodeur
e24c74c93b deplace config.inc.php file from root to app/inc dir. Allow access from anywhere and not only from a file present in root dir. 2014-11-12 11:10:36 +01:00
Bob Le Bricodeur
4edf3b308f Modification des appels de function.inc.php (ajout dans init) pour être accessible par toutes les pages 2014-11-11 12:33:17 +01:00
Bob Le Bricodeur
0db5daa371 ajout fonction pour récupérer des options dans un fichier de configuration 2014-11-10 19:27:18 +01:00
FramaJosephK
051575fa64 The big one 2014-10-21 01:31:26 +02:00
FramaJosephK
7f87858ff7 Mise à jour du dépôt avec la dernière version sur Github 2014-09-04 17:52:18 +02:00