aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-09-101-37/+37
|\
| * Merge branch 'ticket/15746' into prep-release-3.2.3Marc Alexander2018-09-101-37/+37
| |\
| | * [ticket/15746] Update to Symfony 2.8.45Marc Alexander2018-09-091-37/+37
| |/
* | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-09-097-141/+193
|\ \ | |/
| * [prep-release-3.2.3] Update changelog with changes after 3.2.3-RC2Marc Alexander2018-09-091-0/+11
| * [prep-release-3.2.3] Fix improper version numberMarc Alexander2018-09-011-1/+1
| * [prep-release-3.2.3] Add 3.2.3 migrationMarc Alexander2018-08-261-0/+37
| * [prep-release-3.2.3] Update version numbers for 3.2.3 releaseMarc Alexander2018-08-264-6/+6
| * Merge branch 'ticket/15746' into prep-release-3.2.3Marc Alexander2018-08-212-137/+141
| |\
| | * [ticket/15746] Adjust tests after twig updateMarc Alexander2018-08-211-1/+1
| | * [ticket/15746] Update symfony to 2.8.44 & others to latestMarc Alexander2018-08-071-136/+140
| |/
| * Merge pull request #5314 from Zoddo/ticket/15740Marc Alexander2018-08-051-2/+2
| |\
| | * [ticket/15740] Fix hardcoded Terms/PrivacyZoddo2018-08-031-2/+2
| |/
* | [3.2.x] Update verions for 3.2.4-devMarc Alexander2018-08-023-4/+4
* | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-08-026-6/+66
|\ \ | |/
| * [prep-release-3.2.3] Update changelog for 3.2.3-RC2Marc Alexander2018-07-301-0/+24
| * [prep-release-3.2.3] Add migration for 3.2.3-RC2Marc Alexander2018-07-301-0/+36
| * [prep-release-3.2.3] Update version numbers for 3.2.3-RC2Marc Alexander2018-07-304-6/+6
* | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-301-0/+5
|\ \ | |/
| * Merge remote-tracking branch 'senky/ticket/11847' into prep-release-3.2.3Marc Alexander2018-07-301-0/+5
| |\
| | * [ticket/11847] Add depends_on() to auth_provider_oauthJakub Senko2018-07-301-0/+5
* | | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-302-2/+5
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'rubencm/ticket/15731' into prep-release-3.2.3Marc Alexander2018-07-302-2/+5
| |\ \ | | |/ | |/|
| | * [ticket/15731] Fix language string parametersRubén Calvo2018-07-302-2/+5
| |/
* | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-181-134/+193
|\ \ | |/
| * Merge pull request #5232 from marc1706/ticket/15677Marc Alexander2018-07-181-134/+193
| |\
| | * [ticket/15677] Updates for Symfony 2.8.42Marc Alexander2018-07-081-55/+54
| | * [ticket/15677] Update symfony to 2.8.41, others to latestMarc Alexander2018-07-081-128/+188
* | | Merge branch 'prep-release-3.2.3' into 3.2.xTristan Darricau2018-07-080-0/+0
|\ \ \ | |/ /
| * | Merge pull request #5238 from avijc/ticket/15680Tristan Darricau2018-07-081-1/+1
| |\ \ | | |/ | |/|
* | | Merge pull request #5238 from avijc/ticket/15680Tristan Darricau2018-07-081-1/+1
|\ \ \ | | |/ | |/|
| * | [ticket/15680] Point to 3.2 documentationAnssi Johansson2018-06-051-1/+1
* | | Merge pull request #5239 from avijc/ticket/15683Tristan Darricau2018-07-081-0/+9
|\ \ \
| * | | [ticket/15683] Better error message when commit message has CRLFAnssi Johansson2018-06-051-0/+9
| |/ /
* | | Merge pull request #5244 from OxCom/ticket/15678Tristan Darricau2018-07-081-0/+7
|\ \ \
| * | | [ticket/15678] Fix build and cache flow for containerAndrii Afanasiev2018-06-152-1/+8
* | | | Merge pull request #5249 from senky/ticket/15659Tristan Darricau2018-07-082-0/+106
|\ \ \ \
| * | | | [ticket/15659] Fix retrieve_block_vars()Jakub Senko2018-07-072-0/+106
* | | | | Merge pull request #5250 from senky/ticket/15666Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \
| * | | | | [ticket/15666] Fix array key in twig lang() callJakub Senko2018-06-181-1/+1
| |/ / / /
* | | | | Merge pull request #5252 from senky/ticket/15674Tristan Darricau2018-07-081-2/+2
|\ \ \ \ \
| * | | | | [ticket/15674] Improve CPF lang descriptionsJakub Senko2018-06-191-2/+2
| |/ / / /
* | | | | Merge pull request #5253 from senky/ticket/15618Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \
| * | | | | [ticket/15618] Display The team link only to users with permissionJakub Senko2018-06-181-1/+1
| |/ / / /
* | | | | Merge pull request #5254 from senky/ticket/15620Tristan Darricau2018-07-081-2/+2
|\ \ \ \ \
| * | | | | [ticket/15620] Use separate local avatar cache file for every langJakub Senko2018-06-181-2/+2
| |/ / / /
* | | | | Merge pull request #5256 from senky/ticket/13043Tristan Darricau2018-07-0811-38/+16
|\ \ \ \ \
| * | | | | [ticket/13043] Improve HTML5Jakub Senko2018-06-1811-38/+16
| |/ / / /
* | | | | Merge pull request #5257 from senky/ticket/15651Tristan Darricau2018-07-081-4/+1
|\ \ \ \ \
| * | | | | [ticket/15651] Remove unnecessary conditionJakub Senko2018-06-181-4/+1
| |/ / / /