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

Commit Graph

  • 05e9ea1589 Update locales Luc Didry 2018-03-19 16:12:53 +0100
  • 0e022f51c1 Merge branch 'feature/fr' into 'develop' Thomas Citharel 2018-03-19 13:55:24 +0100
  • f344169157 Missing string in French and English locales Pierre Rudloff 2018-03-19 13:45:50 +0100
  • 6c2e44e400 Merge branch 'change-ci-image' into 'develop' Thomas Citharel 2018-03-19 13:36:40 +0100
  • 3bd1999e15 Merge branch 'feature/lang' into 'develop' Thomas Citharel 2018-03-19 13:22:29 +0100
  • 2711b3a019 lang attribute must be a valid IETF language tag Pierre Rudloff 2018-03-19 12:15:38 +0100
  • e9458c1839 Move php composer.phar to composer Thomas Citharel 2018-03-19 13:06:31 +0100
  • edee5626f4 Use own framasoft/framadate-ci image for CI Thomas Citharel 2018-03-19 13:04:09 +0100
  • 89c5ff3637 Merge branch 'develop' into 'master' Thomas Citharel 2018-03-19 11:16:06 +0100
  • a1fbe3946a Merge branch 'update-composer-lock' into 'develop' 1.1.0-alpha.1 Thomas Citharel 2018-03-19 11:14:24 +0100
  • 7a8549cfd7 Update composer.lock Thomas Citharel 2018-03-19 11:12:17 +0100
  • 4f402f60e7 Merge branch 'develop' Thomas Citharel 2018-03-19 11:09:47 +0100
  • a97bcf4d6a fixup for copying app files to framadate folder Thomas Citharel 2018-03-19 11:09:12 +0100
  • 0bd4f46535 Merge branch 'develop' into 'master' Thomas Citharel 2018-03-19 11:03:39 +0100
  • 72e0791e23 Merge branch 'release-1.1.0-alpha.1' into 'develop' Thomas Citharel 2018-03-19 11:01:59 +0100
  • 05ee7bf256 Release version 1.1.0-alpha.1 Thomas Citharel 2018-03-19 11:01:09 +0100
  • a78d3b3e01 Merge branch 'fix-zanata' into 'develop' Thomas Citharel 2018-03-19 10:50:04 +0100
  • ff3dcc9249 Fix Zanata (https://framagit.org/framasoft/framadate/merge_requests/228#note_194515) Fix #271 Fix #272 Thomas Citharel 2018-03-19 10:45:35 +0100
  • 8931255033 Merge branch 'upgrade-parsedown' into 'develop' Thomas Citharel 2018-03-19 10:36:37 +0100
  • 9305a82cb2 Upgrade parsedown Thomas Citharel 2018-03-19 10:34:58 +0100
  • b9f4577fbb Merge branch 'master' into develop Thomas Citharel 2018-03-19 10:33:00 +0100
  • 915fe17bfc Merge branch 'fix-develop' into 'develop' Thomas Citharel 2018-03-19 10:29:18 +0100
  • 26761c97a6 CS Thomas Citharel 2018-03-19 10:26:00 +0100
  • eadf775bb3 Fix generating URL issue with type check Thomas Citharel 2018-03-19 10:24:31 +0100
  • 7ffd7f0b21 Fix unable to vote with ConcurrentVoteException when ValueMax is null Thomas Citharel 2018-03-19 10:23:35 +0100
  • bac91c9182 Merge branch 'zanata-backed-locale-files' into 'develop' Thomas Citharel 2018-03-02 12:04:40 +0100
  • d8abafc78e Merge branch 'fix-SERVER_PORT-handling' into 'develop' Thomas Citharel 2018-03-02 12:03:43 +0100
  • 0951a89c33 Merge branch 'patch-1' into 'master' Thomas Citharel 2018-03-02 12:03:22 +0100
  • 678070af8f Merge branch 'patch-2' into 'master' Thomas Citharel 2018-03-02 12:03:01 +0100
  • fdbded4310 Update README.md: fix fork url, update urls from git.framasoft.org to framagit.org (avoid the redirection) Fla 2018-03-01 22:52:39 +0100
  • 847dcf2b92 Update INSTALL.md: typo Fla 2018-03-01 22:48:59 +0100
  • c4ec2bbc41 Fix $_SERVER['SERVER_PORT'] handling Luc Didry 2018-02-28 15:15:52 +0100
  • ee807db380 [Zanata] Add push-locales to CI for branch develop Luc Didry 2018-02-28 09:43:53 +0100
  • 3637e052d5 [Zanata] Add script to update zanata for one locale Luc Didry 2018-02-27 17:34:37 +0100
  • f340fbe046 Update json locale files (fetched from Zanata) Luc Didry 2018-02-27 17:11:30 +0100
  • 6839065ece [Zanata] Fix bugs in po to nested json toolchain Luc Didry 2018-02-27 17:10:34 +0100
  • 1c8e0061b5 [Zanata] Prettyfying locales json files Luc Didry 2018-02-27 15:50:39 +0100
  • c5b50050c9 Merge branch 'zanata-integration' into 'develop' Thomas Citharel 2018-02-26 17:29:00 +0100
  • 2907a20c9f Update README for zanata integration Luc Didry 2018-02-26 14:36:31 +0100
  • 15b173569d Zanata integration (https://trad.framasoft.org) Luc Didry 2018-02-26 11:49:15 +0100
  • 87b89bc609 Merge branch 'trad-de' into 'develop' Thomas Citharel 2018-02-21 12:10:41 +0100
  • 1d89074965 Translate missing italian strings Tubia 2018-02-21 12:08:57 +0100
  • 32ffa5f3e3 Merge branch 'trad-de' into 'develop' Thomas Citharel 2018-02-21 11:53:06 +0100
  • 710304c183 German translation Lukas Müller 2018-02-21 11:44:44 +0100
  • 991088119f typo on CI Thomas Citharel 2018-02-21 11:36:27 +0100
  • 872e30939c Merge branch 'fix-version-check' into 'develop' Thomas Citharel 2018-02-21 11:24:10 +0100
  • 755cd18d1a Fix php version check Thomas Citharel 2018-02-21 11:17:55 +0100
  • 8720595874 Allow setting SMTP config Simon LEBLANC 2018-02-21 11:07:11 +0100
  • 7e12443bc2 Merge branch 'develop' into funky Thomas Citharel 2018-02-20 19:40:51 +0100
  • 01dc23125a Merge branch 'merge-develop' into 'master' Thomas Citharel 2018-02-20 19:31:26 +0100
  • 77f05b1c21 fix issue with check for maxValue Thomas Citharel 2018-02-20 19:29:56 +0100
  • bf753480dd fix ui stuff Thomas Citharel 2018-02-20 19:29:40 +0100
  • 801bc08a81 Merge branch 'develop' Thomas Citharel 2018-02-20 19:05:24 +0100
  • e6ed712123 Merge branch 'update-jquery' into 'master' Thomas Citharel 2018-02-20 18:06:47 +0100
  • bd931676ae update bootstrap Thomas Citharel 2018-02-20 18:00:43 +0100
  • d106d3ba41 update jquery Thomas Citharel 2018-02-20 18:00:27 +0100
  • d9f50e8706 Merge branch 'cookies-http-only' into 'master' Thomas Citharel 2018-02-20 17:46:36 +0100
  • 1de98223db Add a check at install to suggest setting session.cookie_httponly inside php.ini Thomas Citharel 2018-02-20 17:44:08 +0100
  • 2328b2c871 Merge branch 'css-results-poll-responsive' into 'master' Thomas Citharel 2018-02-20 17:14:13 +0100
  • c350a7a012 Changement de le·a en le ou la Marjolaine Vé 2018-02-20 11:51:13 +0100
  • f11fd8c541 [FR] Ecriture inclusive Marjolaine Vé 2018-02-18 18:33:13 +0100
  • 4bbbaf19ed [Responsive] Buttons not too long Marjolaine Vé 2018-02-18 17:56:10 +0100
  • efda4e97b0 [Responsive] List of polls for admins with scrollbar Marjolaine Vé 2018-02-18 17:55:48 +0100
  • b29bbb5c9a Create a button for "Back to administration" link Marjolaine Vé 2018-02-18 15:45:23 +0100
  • 02fdf05786 Change place of arrows on poll results Marjolaine Vé 2018-02-18 12:50:07 +0100
  • 4e2a48685a Add space between language select and h1 Marjolaine Vé 2018-02-14 15:27:23 +0100
  • 27f4c1045a Allow buttons to be on many lines Marjolaine Vé 2018-02-14 15:23:21 +0100
  • ea575522a9 Add viewport to test responsive online Marjolaine Vé 2018-02-14 15:17:24 +0100
  • 6e1386fa4d Merge branch 'limit-number-of-participants' into 'master' Thomas Citharel 2018-02-20 16:52:32 +0100
  • a442cc5ee7 CS Thomas Citharel 2018-02-20 16:50:14 +0100
  • ff47a21ac2 Check that conditions on valueMax are acceptable before adding the vote Thomas Citharel 2018-02-20 16:47:10 +0100
  • 76b19ee9ba fix votes wrongly calculated because of type check Thomas Citharel 2018-02-20 15:17:14 +0100
  • 2d39a83a7f rebase and run php-cs-fixer Thomas Citharel 2018-02-20 13:12:46 +0100
  • 64ff414900 ValueMax : limit the number of voters per option Erwan TERTRAIS 2018-02-20 13:06:58 +0100
  • 2a01afe4b8 Merge branch 'fix-edit-vote-button-pos' into 'master' Thomas Citharel 2018-02-20 14:11:19 +0100
  • 70f296377f Move some style to css files Thomas Citharel 2018-02-20 12:42:27 +0100
  • 95c4737953 edit button classic poll Erwan TERTRAIS 2017-12-13 10:40:10 +0100
  • 2b25d8c301 edit button if slot >7 Erwan TERTRAIS 2017-12-11 11:32:45 +0100
  • c95c13e069 bouton edit à droite du nom Erwan TERTRAIS 2017-12-09 13:55:49 +0100
  • 05e4b820fb Merge branch 'fix-password-function' into 'master' Thomas Citharel 2018-02-20 11:56:46 +0100
  • c2cbc6eb0e Merge branch 'fix-copy-hours-function' into 'master' Thomas Citharel 2018-02-20 11:56:31 +0100
  • 4dc62b7da2 Merge branch 'run-tests-on-ci' into 'master' Thomas Citharel 2018-02-20 11:56:19 +0100
  • 2310333f8d Adds some comments to understand the logic Thomas Citharel 2018-02-20 11:55:14 +0100
  • e9deb8d22e run CS Thomas Citharel 2018-02-20 10:58:50 +0100
  • 1740a1d949 issue 240 desactivation checkbox resultat public DAVID Titouan 2017-11-20 10:54:34 +0100
  • 78ba609c5c Clean commented out code, fix a console warning and idents and typos Thomas Citharel 2018-02-20 09:31:36 +0100
  • 013c62eb9c Update date_poll.js DAVID Titouan 2018-01-21 21:37:56 +0100
  • 0a9c5095e5 cache vendor Thomas Citharel 2018-02-20 08:58:49 +0100
  • 83d3565472 Refactor to put tests outside of deployment and optimize autoloader on builds Thomas Citharel 2018-02-20 08:54:11 +0100
  • 89dd2fbc35 Run tests on CI, refactor .gitlab-ci.yml Thomas Citharel 2018-02-20 08:43:46 +0100
  • 819220997c Merge branch 'php-cs-fixer' into 'master' Thomas Citharel 2018-02-19 19:51:05 +0100
  • deb1da2635 fix typo Thomas Citharel 2018-02-19 19:50:50 +0100
  • 1e8d3a1bf0 Merge branch 'php-cs-fixer' into 'master' Thomas Citharel 2018-02-19 19:48:20 +0100
  • b8907fb1b6 Rebase Thomas Citharel 2018-02-19 19:47:06 +0100
  • 006e5c8c10 Add php-cs-fixer and phpunit to build Thomas Citharel 2018-02-19 00:38:51 +0100
  • 3157d6a590 Run php-cs-fixer with a custom config. This may break a lot of things Thomas Citharel 2018-02-19 00:18:43 +0100
  • 9827070b3d Merge branch 'require-php-56' into 'master' Thomas Citharel 2018-02-19 19:39:39 +0100
  • c2e00ef4d6 remove nginx for now Thomas Citharel 2018-02-19 19:38:43 +0100
  • 1e423e880e rebase Thomas Citharel 2018-02-19 19:38:23 +0100
  • 6b04d3542e Check for PHP 5.6 Thomas Citharel 2018-02-19 19:35:41 +0100