Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
658 Commits 11 Branches 32 Tags 9.3 MiB
974148550b
Commit Graph

658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonin
e0b8842349 Updating composer.lock. 
- It's good practice : https://stackoverflow.com/questions/12896780/should-composer-lock-be-committed-to-version-control
.
 2015-04-02 11:54:40 +02:00
Olivier PEREZ
97ce8ca965 Merge: Use Smarty on creation poll first step 
* Use Smarty on infos_sondage.php
* Rename infos_sondage.php => create_poll.php
* Replace __('Section\\Key') => __('Section', 'Key)

See merge request !42
 2015-03-31 00:11:38 +02:00
Olivier Perez
d8c70a5f77 Fix back links to create_poll.php + Use values in session if _post is not present 2015-03-31 00:02:37 +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
a2f2118087 Smartysize index.php 2015-03-29 19:32:15 +02:00
Olivier PEREZ
c3fbbb8bf8 Merge branch 'Adjust_INSTALL_md' into main_framasoft_develop 2015-03-29 16:08:59 +02:00
Olivier PEREZ
ce6c1bd820 Merge branch 'develop' into 'develop' 
Add search engine on admin polls list

3 fields : id, title, author

See merge request !41
 2015-03-29 16:04:16 +02:00
Olivier PEREZ
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
Olivier PEREZ
eb4b40d1d6 Admin: Re-add crsf on polls list form 2015-03-29 13:18:00 +02:00
Olivier PEREZ
591c4dd1af Move some code from FramaDB to Service 2015-03-29 12:59:47 +02:00
Olivier PEREZ
a2ca03893a Update o80-i18n version 2015-03-28 17:13:03 +01:00
Olivier PEREZ
12bf92249c Smarty: Inline head.tpl and footer.tpl into page.tpl 2015-03-27 13:10:55 +01:00
Olivier PEREZ
40d707c96d Issue #18 Add search engine on admin polls list 2015-03-27 13:10:46 +01:00
Olivier PEREZ
15ecff4488 Merge branch 'develop' into 'develop' 
Added javascript name checking to avoid losing the choices with a bad name

Added a checking on form submit :
 - It cancel form submission if name is empty or doesn't respect the constant NAME_REGEX
 - If the submission is cancelled, it show the error (as a submit would do)

Also added a "header" smarty block in header.tpl, to allow pages which inherit page.tpl to add specific scripts or css.

See merge request !40
 2015-03-26 22:00:11 +01:00
Olivier PEREZ
4a9dd039bf Adjust INSTALL.md to match recents versions 2015-03-26 17:13:40 +01:00
Antonin
133dd203df Forgot a useless assignment... 2015-03-26 17:12:31 +01:00
Antonin
b3d79da0a6 Changing message creation logic. 2015-03-26 17:09:52 +01:00
Antonin
e4ec0c8105 Passing message directly in template 2015-03-26 16:48:39 +01:00
Antonin
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
Olivier PEREZ
3044de5ae3 Merge branch 'develop' into 'develop' 
Quelques corrections de bugs

J'ai essayé de faire 1 commit (ou 2) par correction, pour essayer de rendre le truc lisible.

---

**Fixes :**
* Afficher un message sur infos_sondage.php si l'utilisateur n'autorise pas **les cookies**
* Afficher un message sur infos_sondage.php si l'utilisateur n'autorise pas **Javascript**
* Problème quand le nom de domaine commence par **admin**

**Technique :**
* Début de découpage de *core.js* en plusieurs *.js* se trouvant dans **js/app/**
* Début de rédaction du CHANGELOG pour la version 0.9

See merge request !37
 2015-03-26 13:59:37 +01:00
Olivier PEREZ
cddbcbba73 Merge branch 'feature/HowToContribute' into 'develop' 
Travail sur README.md

J'ai sorti quelques infos du fichier **README.md**. Tout ce qui concernait de la doc technique se trouve dans un dossier **doc**.

J'ai également ajouté un chapitre **Comment contribuer**, et réorganisé les différentes parties de README.md pour garder les informations importantes en tête de page.

See merge request !38
 2015-03-26 13:58:30 +01:00
Olivier PEREZ
a19e7c48bb Fix missing key about Expiration date 2015-03-26 00:20:48 +01:00
Olivier PEREZ
70d0c90218 Generate a lang file for ES (not fully translated) 2015-03-26 00:20:22 +01:00
Olivier PEREZ
16949b4c61 Add complete font family DejaVu 2015-03-26 00:07:05 +01:00
Olivier PEREZ
7776b81847 Issue #27 Add DejaVu font to project 2015-03-26 00:00:27 +01:00
Olivier PEREZ
49cb30780d Update DE lang to match the FR one 2015-03-25 23:50:53 +01:00
Olivier PEREZ
674a032e3c Update EN lang to match the FR one 2015-03-24 19:08:06 +01:00
Olivier PEREZ
0aedb01933 Change i18n system around classical polls 2015-03-24 17:59:52 +01:00
Olivier PEREZ
bd7c401a83 Admin: Fix links of polls list pagination 2015-03-24 00:26:43 +01:00
Olivier PEREZ
659cf997b8 Change i18n system in admin pages 2015-03-24 00:22:37 +01:00
Olivier PEREZ
0ced885fe7 Change i18n system around adminstuds.php + Add some missing keys 2015-03-24 00:04:07 +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
3ccc5619d5 Add some missing i18n 2015-03-18 00:55:46 +01:00
Olivier PEREZ
880d0e7fa2 Locale: Add translations for 'To receive an email for each new comment.' 2015-03-18 00:47:27 +01:00
Olivier PEREZ
0efc3d4bcc Fix the update of poll infos 2015-03-18 00:46:19 +01:00
Olivier PEREZ
779af07c60 Fix expiration date check on studs.php 2015-03-13 12:56:45 +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
f8611c09d6 Complete date field on the all the screen that call framadatepicker.js 2015-03-05 21:01:26 +01:00
Olivier PEREZ
d6500a77d9 Fix Issue #35 : Complete date field when user fills only day+month 2015-03-05 18:10:41 +01:00
Olivier PEREZ
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
Olivier PEREZ
778a03f802 Fix usage of preg_replace 2015-03-05 13:22:55 +01:00
Olivier PEREZ
c25df81b1e Début de rédaction du changelog pour la version 0.9 2015-03-05 00:08:54 +01:00
Olivier PEREZ
b3bc68bbe6 Fix pb when host on domain name starting with 'admin' 
* Do str_replace only on the $dirname variable
 2015-03-05 00:02:45 +01:00
Olivier PEREZ
818151fe83 When Cookies are disabled then show message instead a the form to create poll 2015-03-04 23:35:03 +01:00
Olivier PEREZ
60f340f65f When Javascript is disabled then show message instead a the form to create poll 2015-03-04 21:45:22 +01:00
Olivier PEREZ
874fe33322 Some cleanin README.md + Add a section that say how to contribute 2015-03-04 17:17:10 +01:00
JosephK
c1d4bed4d5 Merge branch 'olivierperez/framadate-master' into develop 
Conflicts:
	admin/index.php
	adminstuds.php
	app/classes/Framadate/Utils.php
	app/inc/config.template.php
	app/inc/init.php
	choix_autre.php
	choix_date.php
	composer.json
	composer.lock
	creation_sondage.php
	locale/de_DE/LC_MESSAGES/Studs.mo
	locale/de_DE/LC_MESSAGES/Studs.po
	locale/en_GB/LC_MESSAGES/Studs.mo
	locale/fr_FR/LC_MESSAGES/Studs.mo
	studs.php
 2015-03-04 10:53:43 +01:00
JosephK
312272b1d0 Merge branch 'collisions' into 'master' 
Fix Collisions

See merge request !34
 2015-03-02 19:33:12 +01:00
FramaJosephK
a445a5d6fa Fix collisions + Inversion bandeau Gitlab entre README et INSTALL 2015-03-02 19:30:26 +01:00