aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-181-1/+2
|\
| * Merge pull request #3152 from prototech/ticket/13277Marc Alexander2014-11-181-1/+2
| |\
| | * [ticket/13277] Force IE to not cache AJAX requests.Cesar G2014-11-181-1/+2
* | | Merge branch 'develop-ascraeus' into developCesar G2014-11-182-0/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeusCesar G2014-11-183-11/+19
| |\ \ | | |/ | |/|
| | * [ticket/13023] Add template event posting_editor_buttons_custom_tags_beforeTristan Darricau2014-11-163-11/+19
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-1715-14/+24
|\ \ \ | |/ /
| * | Merge pull request #3145 from bantu/ticket/13338Joas Schilling2014-11-1715-14/+24
| |\ \
| | * | [ticket/13338] Add include statements for dependencies.Andreas Fischer2014-11-176-0/+8
| | * | [ticket/13338] Do not use the _test.php suffix for abstract test case classes.Andreas Fischer2014-11-178-14/+14
| | * | [ticket/13338] Move insert_config_array_test to functions_acp, add deps.Andreas Fischer2014-11-171-0/+2
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-171-6/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-170-0/+0
| |\ \ \
| | * \ \ Merge pull request #3146 from bantu/ticket/13341Joas Schilling2014-11-171-3/+3
| | |\ \ \
| * | \ \ \ Merge pull request #3147 from bantu/ticket/13341-ascraeusJoas Schilling2014-11-171-6/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge pull request #3146 from bantu/ticket/13341Andreas Fischer2014-11-141-6/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | [ticket/13341] Change coverage to whitelist to prevent errors with temp files.Andreas Fischer2014-11-141-3/+3
| | | |/ /
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-1616-147/+164
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascr...Nils Adermann2014-11-1616-147/+164
| |\ \ \ \
| | * | | | [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-1612-56/+116
| | * | | | [ticket/13280] Add new testsTristan Darricau2014-11-121-0/+5
| | * | | | [ticket/13280] Make the tests failingTristan Darricau2014-11-124-100/+78
| | * | | | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-124-38/+12
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-162-4/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3136 from marc1706/ticket/13332Tristan Darricau2014-11-162-4/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/13332] Fix auth provider testsMarc Alexander2014-11-121-1/+8
| | * | | | [ticket/13332] Remove useless $result assignmentMarc Alexander2014-11-111-1/+1
| | * | | | [ticket/13332] Pass user row to passwords manager check methodMarc Alexander2014-11-111-2/+2
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-133-5/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3141 from bantu/ticket/13325Marc Alexander2014-11-133-5/+18
| |\ \ \ \
| | * | | | [ticket/13325] Make installing composer dependencies in tests folder optional.Andreas Fischer2014-11-122-3/+16
| | * | | | [ticket/13325] Remove whitespace at end of line.Andreas Fischer2014-11-121-1/+1
| | * | | | [ticket/13325] Update / Fix composer.lock hash.Andreas Fischer2014-11-121-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3125 from lavigor/ticket/13318Marc Alexander2014-11-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/13318] login_username needs to have the multibyte parameter set to truelavigor2014-11-101-1/+1
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-132-2/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3137 from prototech/ticket/13209Marc Alexander2014-11-132-2/+14
| |\ \ \ \ \ \
| | * | | | | | [ticket/13209] Gather language field values for boolean CPF's in all steps.Cesar G2014-11-111-1/+1
| | * | | | | | [ticket/13209] Fix expected request value of CPF language fields.Cesar G2014-11-111-1/+13
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-125-36/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-120-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #3142 from bantu/ticket/13331Joas Schilling2014-11-124-42/+69
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge pull request #3143 from bantu/ticket/13331-ascraeusJoas Schilling2014-11-125-36/+39
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php.Andreas Fischer2014-11-122-20/+1
| | * | | | | | | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-123-16/+38
| | |\ \ \ \ \ \ \ | |/ / / / / / / / | | | | _ / / / / | | | | / / / /
| | * | | | | | [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-123-20/+51
* | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-121-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3139 from prototech/ticket/13239Marc Alexander2014-11-121-0/+8
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.Cesar G2014-11-111-0/+8
| | | |_|/ / / | | |/| | | |