Thomas Citharel
4c0c2a16f9
Small fixes
...
Change CollectMail class name, add a title on voters name in admin with email value
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 12:36:18 +02:00
Meteor-Furet
e6716bc745
MAJ table_vote_classic et table_vote_date + passage option 3 de collect_users_mail en disabled car non implémenté
2018-05-25 11:40:05 +02:00
Meteor-Furet
b5ce4baf60
MAJ poll_info.tpl
2018-05-25 11:39:30 +02:00
Meteor-Furet
feb0c1e6ce
Modification collect_users_mail de bool à int (MAJ de la création d'un sondage)
2018-05-25 11:39:28 +02:00
Thomas Citharel
bcd5acdea5
Merge branch 'chrosey/framadate-develop' into 'develop'
...
Chrosey/framadate develop
See merge request framasoft/framadate!318
2018-05-25 10:59:18 +02:00
Thomas Citharel
2e3fe1dcd3
Small fixes
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 10:57:46 +02:00
chrosey
ad450e2798
fixed classic_poll.js to work again
...
fix typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Fixed typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 10:40:40 +02:00
chrosey
141e9105be
refactored create_classic_poll and put step_2 view into own tpl file
2018-05-25 10:35:46 +02:00
chrosey
fad662e09a
renamed poll_step_3.tpl
2018-05-25 10:29:48 +02:00
Thomas Citharel
586e59e23f
Merge branch 'fix-session' into 'develop'
...
Fix session
Closes #255
See merge request framasoft/framadate!317
2018-05-25 10:28:25 +02:00
Thomas Citharel
d5f0f5a289
Merge branch 'develop' into 'develop'
...
Fix missing beginTransaction()
See merge request framasoft/framadate!315
2018-05-24 17:57:45 +02:00
Thomas Citharel
442fd174e9
Fix session by serializing the form object
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Fixup !
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Fixup
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-24 17:55:40 +02:00
Thomas Citharel
081a32b1bb
Merge branch 'mosterdt/framadate-bug/restrict-custom-url' into develop
2018-05-19 08:59:56 +02:00
Thomas De Backer
5951519ad8
restrict custom urls
...
fixed coding standard issues
added error message to locale
Remove unecessary variable
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-19 08:59:30 +02:00
PICHOU Kyâne
a64e182076
Fix missing beginTransaction()
2018-05-16 21:55:54 +02:00
Thomas Citharel
823c41d2e4
Update locales
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-15 08:55:34 +02:00
Thomas Citharel
f28198e497
Merge branch 'feature/warn-wrong-customized-url' into 'develop'
...
Warn when url has a wrong format
See merge request framasoft/framadate!311
2018-05-14 19:02:51 +02:00
Thomas Citharel
fe93733872
fix typo
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-23 10:40:18 +02:00
Thomas Citharel
5631167ca7
Merge branch 'dbal-fixes' into 'develop'
...
Couple of fixes following DBAL migration
See merge request framasoft/framadate!312
2018-04-23 10:30:10 +02:00
Thomas Citharel
87a61ebea3
Couple of fixes following DBAL migration
...
* Make sure we save timestamp as a string (🙈 ) inside slot table
* Make sure to set poll format properly at creation
* More Repository methods use DBAL specifics
* Clear legacy check all tables call
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-23 10:27:15 +02:00
Thomas Citharel
b008bfea9b
Update locales
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-23 09:07:18 +02:00
Thomas Citharel
3ba045791f
Merge branch 'dbal' into 'develop'
...
Make Framadate compatible with PostgreSQL and great again !
Closes #90 et #179
See merge request framasoft/framadate!305
2018-04-22 18:55:55 +02:00
Thomas Citharel
7f41eb831c
Remove class FramaDB and unused call
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-22 18:45:30 +02:00
Thomas Citharel
006a191544
Make Framadate compatible with PostgreSQL and great again !
...
* Move the database handling to Doctrine DBAL
* Move Migrations to Doctrine Migrations
* Rename migrations for Doctrine Migrations Uses
* Fix Migrations
* Change config parameters, introduce db name, host and port parameters and get rid of database url
* Change install form for this
* Add a CLI command to make migrations
* Add config.test.php to be used with APP_ENV=test for testing
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add sqlite to CI and execute migration in test env
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
SQLite is already inside the image...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Rebase two new migrations
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Move from trait to abstract class and remove legacy migration table after checks
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Move doctrine command path inside CI
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Move abstract migration class to correct namespace and remove unused command
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Check for legacy migration table existence
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Check if legacy migration table exists before deleting it
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add messages for skipped migrations and fix an issue with MySQL ERR_NO_DATE Migration
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-22 18:37:53 +02:00
Quentin Dupont
235002cd24
Warn when url has a wrong format
2018-04-22 12:54:12 +02:00
Thomas Citharel
c4e9cb59d3
Merge branch 'bug/button-create-poll-step-2' into 'develop'
...
bug/button-create-poll-step-2
See merge request framasoft/framadate!308
2018-04-21 11:56:56 +02:00
m
8e8ffedc4a
bug/button-create-poll-step-2
2018-04-20 20:11:10 +02:00
Thomas Citharel
2b351bc3d1
Update locales
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-20 14:31:18 +02:00
Thomas Citharel
17c264721e
Merge branch 'bug/send-comment-button' into 'develop'
...
Bug/send comment button
See merge request framasoft/framadate!307
2018-04-20 09:24:37 +02:00
m
e379b58d58
bug/send-comment-button
2018-04-20 09:17:37 +02:00
m
b2a550d09b
Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop
2018-04-19 21:53:28 +02:00
Thomas Citharel
0409256588
Merge branch 'Justine/Issue1' into 'develop'
...
Collecting polled users emails
Closes #38
See merge request framasoft/framadate!266
2018-04-19 16:55:21 +02:00
Thomas Citharel
abec2cb6a3
Refactor and fix indentation a bit, add a <pre> section for email collection and string changes
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-19 16:53:54 +02:00
Thomas Citharel
b24cc43c85
Merge branch 'bug/better-handle-undefined-config-values' into 'develop'
...
Bug/better handle undefined config values
See merge request framasoft/framadate!304
2018-04-19 15:33:56 +02:00
Thomas Citharel
4c4fb1557f
Merge branch 'feature/ask-name-and-comment-before-sending' into 'develop'
...
feature/ask name and comment before sending
See merge request framasoft/framadate!285
2018-04-19 15:21:49 +02:00
m
0841675577
ask name and comment before sending comment
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-19 15:12:13 +02:00
Thomas Citharel
aa690bb6d8
Update locales
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-19 14:52:41 +02:00
Thomas Citharel
06c3a8a078
Merge branch 'bug/create-date-poll-step-2' into 'develop'
...
Bug/create date poll step 2
See merge request framasoft/framadate!302
2018-04-19 14:20:54 +02:00
m
41578b19c8
error on date poll creation
...
https://framagit.org/framasoft/framadate/issues/318
code style
modify error message on session expiration
new local text
remove empty string
2018-04-19 14:19:24 +02:00
m
81092482af
Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop
2018-04-19 14:14:42 +02:00
Thomas Citharel
290ec002d5
Merge branch 'feature/files-cleaning' into 'develop'
...
Feature/files cleaning
See merge request framasoft/framadate!306
2018-04-19 14:06:16 +02:00
m
3330d28f29
nettoyage de printemps
...
clean type test
2018-04-19 14:05:22 +02:00
m
fb7c5e2f12
fork-awesome enabled by default
2018-04-18 17:05:20 +02:00
m
cc0f572335
Better handle undefined config values
...
https://framagit.org/framasoft/framadate/issues/322
2018-04-18 16:49:02 +02:00
m
0b598b8e80
Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop
2018-04-18 16:14:33 +02:00
Thomas Citharel
2627dc2ae6
Fixup for find_polls with empty localstorage
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 13:33:38 +02:00
Thomas Citharel
1a3081b58d
Merge branch 'save-poll-localstorage' into 'develop'
...
Implement saving polls in localstorage and finding them
Closes #235
See merge request framasoft/framadate!283
2018-04-18 13:12:49 +02:00
Thomas Citharel
685d8b5e3d
Move VueJS template to x-template DOM and update strings
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 13:11:17 +02:00
Thomas Citharel
7a12d98943
Handle localstorage empty or failure properly
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 12:46:02 +02:00
Thomas Citharel
c1ea6ae2a8
Implement saving polls in localstorage and finding them
...
Also, this brings VueJS and MomentJS in Framadate, 🍾 🎉
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 12:46:01 +02:00