Chapril/date.chapril.org-framadate
Chapril
/
date.chapril.org-framadate
23
1
Fork 0
Code Issues Pull Requests Releases Activity

Commit Graph

  • f656c790d0 Merge branch 'fix-markdown-in-previews' into 'develop' Thomas Citharel 2018-05-25 19:35:20 +0200
  • 14053d20c9
         Handle markdown properly in the best choices section Thomas Citharel 2018-05-25 19:34:36 +0200
  • 92f699337f
         Properly handle markdown choices inside titles, if no text as fallback, use the number of the choice column Thomas Citharel 2018-05-25 19:24:54 +0200
  • af760cf273
         Add checks on session Thomas Citharel 2018-05-25 18:16:22 +0200
  • f4c901d6cd
         Typo Thomas Citharel 2018-05-25 18:05:19 +0200
  • b04f95f0e1 Merge branch 'split-create-poll-form' into 'develop' Thomas Citharel 2018-05-25 17:39:26 +0200
  • bd748e5da7
         Split the create poll (step 1) template into parts Thomas Citharel 2018-05-25 17:37:48 +0200
  • e793a77b2a
         Update locales Thomas Citharel 2018-05-25 16:25:35 +0200
  • e078e2d22b
         Update locales Thomas Citharel 2018-05-25 16:18:38 +0200
  • 52bc066b05
         Fix json translation file that deleted the whole zanata document 🙈 Thomas Citharel 2018-05-25 16:02:56 +0200
  • 4b394e9546 Merge branch 'add-sendmail-option' into 'develop' Thomas Citharel 2018-05-25 15:51:31 +0200
  • d6c2f01457
         Introduce an use_sendmail option Thomas Citharel 2018-05-25 15:50:35 +0200
  • 7305c0f89c Merge branch 'add-missing-migration' into 'develop' Thomas Citharel 2018-05-25 15:20:42 +0200
  • 2cd54d9c4d
         Add a missing migration back Thomas Citharel 2018-05-25 15:18:56 +0200
  • 964952433c Merge branch 'JMarlow/framadate-Justine/Issue2' into 'develop' Thomas Citharel 2018-05-25 12:39:18 +0200
  • 4c0c2a16f9
         Small fixes Thomas Citharel 2018-05-25 12:36:18 +0200
  • e6716bc745
         MAJ table_vote_classic et table_vote_date + passage option 3 de collect_users_mail en disabled car non implémenté Meteor-Furet 2018-05-08 16:01:17 +0200
  • b5ce4baf60
         MAJ poll_info.tpl Meteor-Furet 2018-05-08 15:32:13 +0200
  • feb0c1e6ce
         Modification collect_users_mail de bool à int (MAJ de la création d'un sondage) Meteor-Furet 2018-05-08 15:03:22 +0200
  • bcd5acdea5 Merge branch 'chrosey/framadate-develop' into 'develop' Thomas Citharel 2018-05-25 10:59:18 +0200
  • 2e3fe1dcd3
         Small fixes Thomas Citharel 2018-05-25 10:57:46 +0200
  • ad450e2798
         fixed classic_poll.js to work again chrosey 2018-04-20 22:16:17 +0200
  • 141e9105be
         refactored create_classic_poll and put step_2 view into own tpl file chrosey 2018-04-20 22:05:13 +0200
  • fad662e09a
         renamed poll_step_3.tpl chrosey 2018-04-20 22:04:25 +0200
  • 586e59e23f Merge branch 'fix-session' into 'develop' Thomas Citharel 2018-05-25 10:28:25 +0200
  • d5f0f5a289 Merge branch 'develop' into 'develop' Thomas Citharel 2018-05-24 17:57:45 +0200
  • 442fd174e9
         Fix session by serializing the form object Thomas Citharel 2018-05-24 17:45:22 +0200
  • 081a32b1bb
         Merge branch 'mosterdt/framadate-bug/restrict-custom-url' into develop Thomas Citharel 2018-05-19 08:59:56 +0200
  • 5951519ad8
         restrict custom urls Thomas De Backer 2018-05-17 16:22:41 +0200
  • a64e182076 Fix missing beginTransaction() PICHOU Kyâne 2018-05-15 21:28:17 +0200
  • 823c41d2e4
         Update locales Thomas Citharel 2018-05-15 08:55:34 +0200
  • f28198e497 Merge branch 'feature/warn-wrong-customized-url' into 'develop' Thomas Citharel 2018-05-14 19:02:51 +0200
  • f62e0408de Personnalisation du pied de page de courriel. Didier Clermonté 2018-05-06 11:50:15 +0200
  • fe93733872
         fix typo Thomas Citharel 2018-04-23 10:40:18 +0200
  • 5631167ca7 Merge branch 'dbal-fixes' into 'develop' Thomas Citharel 2018-04-23 10:30:10 +0200
  • 87a61ebea3
         Couple of fixes following DBAL migration Thomas Citharel 2018-04-23 10:27:15 +0200
  • b008bfea9b
         Update locales Thomas Citharel 2018-04-23 09:07:18 +0200
  • 3ba045791f Merge branch 'dbal' into 'develop' Thomas Citharel 2018-04-22 18:55:55 +0200
  • 7f41eb831c
         Remove class FramaDB and unused call Thomas Citharel 2018-04-22 18:45:30 +0200
  • 006a191544
         Make Framadate compatible with PostgreSQL and great again ! Thomas Citharel 2018-04-18 16:16:22 +0200
  • 235002cd24 Warn when url has a wrong format Quentin Dupont 2018-04-22 12:29:37 +0200
  • c4e9cb59d3 Merge branch 'bug/button-create-poll-step-2' into 'develop' Thomas Citharel 2018-04-21 11:56:56 +0200
  • 8e8ffedc4a bug/button-create-poll-step-2 m 2018-04-20 20:11:10 +0200
  • 2b351bc3d1
         Update locales Thomas Citharel 2018-04-20 14:31:18 +0200
  • 17c264721e Merge branch 'bug/send-comment-button' into 'develop' Thomas Citharel 2018-04-20 09:24:37 +0200
  • e379b58d58 bug/send-comment-button m 2018-04-20 09:17:37 +0200
  • b2a550d09b Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop m 2018-04-19 21:53:28 +0200
  • 0409256588 Merge branch 'Justine/Issue1' into 'develop' Thomas Citharel 2018-04-19 16:55:21 +0200
  • abec2cb6a3
         Refactor and fix indentation a bit, add a <pre> section for email collection and string changes Thomas Citharel 2018-04-19 16:53:54 +0200
  • b24cc43c85 Merge branch 'bug/better-handle-undefined-config-values' into 'develop' Thomas Citharel 2018-04-19 15:33:56 +0200
  • 4c4fb1557f Merge branch 'feature/ask-name-and-comment-before-sending' into 'develop' Thomas Citharel 2018-04-19 15:21:49 +0200
  • 0841675577
         ask name and comment before sending comment m 2018-04-19 15:10:45 +0200
  • aa690bb6d8
         Update locales Thomas Citharel 2018-04-19 14:52:41 +0200
  • 06c3a8a078 Merge branch 'bug/create-date-poll-step-2' into 'develop' Thomas Citharel 2018-04-19 14:20:54 +0200
  • 41578b19c8
         error on date poll creation https://framagit.org/framasoft/framadate/issues/318 m 2018-04-15 14:34:53 +0200
  • 81092482af Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop m 2018-04-19 14:14:42 +0200
  • 290ec002d5 Merge branch 'feature/files-cleaning' into 'develop' Thomas Citharel 2018-04-19 14:06:16 +0200
  • 3330d28f29
         nettoyage de printemps m 2018-04-19 09:00:52 +0200
  • fb7c5e2f12 fork-awesome enabled by default m 2018-04-18 17:05:20 +0200
  • cc0f572335 Better handle undefined config values https://framagit.org/framasoft/framadate/issues/322 m 2018-04-17 00:06:46 +0200
  • 0b598b8e80 Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop m 2018-04-18 16:14:33 +0200
  • 2627dc2ae6
         Fixup for find_polls with empty localstorage Thomas Citharel 2018-04-18 13:33:38 +0200
  • 1a3081b58d Merge branch 'save-poll-localstorage' into 'develop' Thomas Citharel 2018-04-18 13:12:49 +0200
  • 685d8b5e3d
         Move VueJS template to x-template DOM and update strings Thomas Citharel 2018-04-18 13:11:17 +0200
  • 7a12d98943
         Handle localstorage empty or failure properly Thomas Citharel 2018-04-11 11:32:08 +0200
  • c1ea6ae2a8
         Implement saving polls in localstorage and finding them Thomas Citharel 2018-04-06 16:01:09 +0200
  • 68d5b64180
         Collecting Polled Users Emails JMarlow 2018-03-18 10:40:38 +0100
  • 6dd8fb1723 Merge branch 'feature/clean-demo-poll' into 'develop' Thomas Citharel 2018-04-18 11:13:27 +0200
  • b89622695e [i18n] Update translations Luc Didry 2018-04-17 11:56:52 +0200
  • 7d9f5becec Add script to add a key/value in locale/en.json + put all scripts in scripts/ Luc Didry 2018-04-17 11:46:15 +0200
  • 5b2a40ac58 Merge remote-tracking branch 'framadate/develop' into develop m 2018-04-16 07:32:46 +0200
  • 0f4587adf8 less often demo cleaning m 2018-04-15 23:30:40 +0200
  • 59569071e8 Merge branch '1.1.4-bugfix' into 'master' 1.1.4 Thomas Citharel 2018-04-15 12:23:57 +0200
  • 30e77a77c4
         Version 1.1.4 Thomas Citharel 2018-04-15 12:21:56 +0200
  • 367b239549
         Provide Fork-Awesome and add an option to disable it (should be useful on installations with Framanav) Thomas Citharel 2018-04-15 12:14:28 +0200
  • 3878c3ce7c Merge branch 'fork-awesome' into 'develop' Thomas Citharel 2018-04-15 12:19:31 +0200
  • a004576592
         Provide Fork-Awesome and add an option to disable it (should be useful on installations with Framanav) Thomas Citharel 2018-04-15 12:14:28 +0200
  • 081fdae5f5 code style m 2018-04-15 11:59:40 +0200
  • 8528a7fe65
         Update version to 1.2.0 on develop Thomas Citharel 2018-04-15 11:41:03 +0200
  • 8ce671e4d9 Merge branch '1.1.3-bugfix' into 'master' 1.1.3 Thomas Citharel 2018-04-15 11:35:10 +0200
  • 901f907dd4
         Release Version 1.1.3 Thomas Citharel 2018-04-15 11:33:39 +0200
  • a80602e3d5
         bug/error-on-empty-choices m 2018-04-14 17:47:22 +0200
  • c723c81697 Merge branch 'bug/error-on-empty-choices' into 'develop' Thomas Citharel 2018-04-15 11:29:27 +0200
  • afd83efd79
         bug/error-on-empty-choices m 2018-04-14 17:47:22 +0200
  • 00b871df5c nettoyage du sondage de démonstration https://framagit.org/framasoft/framadate/issues/316 m 2018-04-14 08:48:24 +0200
  • 3b54590bde IC m 2018-04-13 21:26:00 +0200
  • 6455f4be87 nettoyage du sondage de démonstration https://framagit.org/framasoft/framadate/issues/316 m 2018-04-13 21:24:43 +0200
  • 83ba53dffa Merge branch 'doc/deprecate-changelog' into 'develop' Thomas Citharel 2018-04-12 23:53:57 +0200
  • 94f7288446 deprecate CHANGELOG.md framartin 2018-04-12 18:37:46 -0300
  • 53572dbc1f Merge branch 'develop' into 'master' 1.1.2 Thomas Citharel 2018-04-11 18:08:01 +0200
  • b2fc3a9d53
         Remove unneeded Parsedown option Thomas Citharel 2018-04-11 18:06:45 +0200
  • baadea8e74 Merge branch 'security/parsedown-safe-mode' into 'develop' Thomas Citharel 2018-04-11 17:52:57 +0200
  • 075ba1739c
         Enable Parsedown Safe-Mode Thomas Citharel 2018-04-11 17:50:49 +0200
  • 9829c826ef Merge branch 'develop' into 'master' 1.1.1 Thomas Citharel 2018-04-11 15:55:16 +0200
  • 32492cf119
         Update version to 1.1.1 Thomas Citharel 2018-04-11 15:52:50 +0200
  • c5a2f299c5 Merge branch 'bug/send-voters-email' into 'develop' Thomas Citharel 2018-04-11 15:51:54 +0200
  • d72cf4ce24
         Fix link sent by email to voters Thomas Citharel 2018-04-11 15:50:07 +0200
  • f931516f24 Merge branch 'develop' into 'master' 1.1.0 Thomas Citharel 2018-04-11 10:14:24 +0200
  • 4035193377
         Update locales Thomas Citharel 2018-04-11 10:08:14 +0200
  • 4838577d9d
         Release 1.1.0 Thomas Citharel 2018-04-11 09:59:05 +0200