| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-18 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge pull request #3152 from prototech/ticket/13277 | Marc Alexander | 2014-11-18 | 1 | -1/+2 |
| | |\ | |||||
| | | * | [ticket/13277] Force IE to not cache AJAX requests. | Cesar G | 2014-11-18 | 1 | -1/+2 |
| * | | | Merge branch 'develop-ascraeus' into develop | Cesar G | 2014-11-18 | 2 | -0/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus | Cesar G | 2014-11-18 | 3 | -11/+19 |
| | |\ \ | | |/ | |/| | |||||
| | | * | [ticket/13023] Add template event posting_editor_buttons_custom_tags_before | Tristan Darricau | 2014-11-16 | 3 | -11/+19 |
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-17 | 15 | -14/+24 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3145 from bantu/ticket/13338 | Joas Schilling | 2014-11-17 | 15 | -14/+24 |
| | |\ \ | |||||
| | | * | | [ticket/13338] Add include statements for dependencies. | Andreas Fischer | 2014-11-17 | 6 | -0/+8 |
| | | * | | [ticket/13338] Do not use the _test.php suffix for abstract test case classes. | Andreas Fischer | 2014-11-17 | 8 | -14/+14 |
| | | * | | [ticket/13338] Move insert_config_array_test to functions_acp, add deps. | Andreas Fischer | 2014-11-17 | 1 | -0/+2 |
| * | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-17 | 1 | -6/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'develop-olympus' into develop-ascraeus | Joas Schilling | 2014-11-17 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #3146 from bantu/ticket/13341 | Joas Schilling | 2014-11-17 | 1 | -3/+3 |
| | | |\ \ \ | |||||
| | * | \ \ \ | Merge pull request #3147 from bantu/ticket/13341-ascraeus | Joas Schilling | 2014-11-17 | 1 | -6/+0 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | | * | | | | Merge pull request #3146 from bantu/ticket/13341 | Andreas Fischer | 2014-11-14 | 1 | -6/+0 |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp files. | Andreas Fischer | 2014-11-14 | 1 | -3/+3 |
| | | | |/ / | |||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-11-16 | 16 | -147/+164 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascr... | Nils Adermann | 2014-11-16 | 16 | -147/+164 |
| | |\ \ \ \ | |||||
| | | * | | | | [ticket/13280] Output escaping for the symfony request object | Tristan Darricau | 2014-11-16 | 12 | -56/+116 |
| | | * | | | | [ticket/13280] Add new tests | Tristan Darricau | 2014-11-12 | 1 | -0/+5 |
| | | * | | | | [ticket/13280] Make the tests failing | Tristan Darricau | 2014-11-12 | 4 | -100/+78 |
| | | * | | | | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280" | Tristan Darricau | 2014-11-12 | 4 | -38/+12 |
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-16 | 2 | -4/+11 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #3136 from marc1706/ticket/13332 | Tristan Darricau | 2014-11-16 | 2 | -4/+11 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | | [ticket/13332] Fix auth provider tests | Marc Alexander | 2014-11-12 | 1 | -1/+8 |
| | | * | | | | [ticket/13332] Remove useless $result assignment | Marc Alexander | 2014-11-11 | 1 | -1/+1 |
| | | * | | | | [ticket/13332] Pass user row to passwords manager check method | Marc Alexander | 2014-11-11 | 1 | -2/+2 |
| | | |/ / / | |||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-13 | 3 | -5/+18 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3141 from bantu/ticket/13325 | Marc Alexander | 2014-11-13 | 3 | -5/+18 |
| | |\ \ \ \ | |||||
| | | * | | | | [ticket/13325] Make installing composer dependencies in tests folder optional. | Andreas Fischer | 2014-11-12 | 2 | -3/+16 |
| | | * | | | | [ticket/13325] Remove whitespace at end of line. | Andreas Fischer | 2014-11-12 | 1 | -1/+1 |
| | | * | | | | [ticket/13325] Update / Fix composer.lock hash. | Andreas Fischer | 2014-11-12 | 1 | -1/+1 |
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #3125 from lavigor/ticket/13318 | Marc Alexander | 2014-11-13 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | [ticket/13318] login_username needs to have the multibyte parameter set to true | lavigor | 2014-11-10 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-13 | 2 | -2/+14 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #3137 from prototech/ticket/13209 | Marc Alexander | 2014-11-13 | 2 | -2/+14 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | [ticket/13209] Gather language field values for boolean CPF's in all steps. | Cesar G | 2014-11-11 | 1 | -1/+1 |
| | | * | | | | | | [ticket/13209] Fix expected request value of CPF language fields. | Cesar G | 2014-11-11 | 1 | -1/+13 |
| * | | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-12 | 5 | -36/+39 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'develop-olympus' into develop-ascraeus | Joas Schilling | 2014-11-12 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | | Merge pull request #3142 from bantu/ticket/13331 | Joas Schilling | 2014-11-12 | 4 | -42/+69 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge pull request #3143 from bantu/ticket/13331-ascraeus | Joas Schilling | 2014-11-12 | 5 | -36/+39 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | | * | | | | | | | [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php. | Andreas Fischer | 2014-11-12 | 2 | -20/+1 |
| | | * | | | | | | | Merge pull request #3142 from bantu/ticket/13331 | Andreas Fischer | 2014-11-12 | 3 | -16/+38 |
| | | |\ \ \ \ \ \ \ | |/ / / / / / / / | | | | _ / / / / | | | | / / / / | |||||
| | | * | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for dev branches. | Andreas Fischer | 2014-11-12 | 3 | -20/+51 |
| * | | | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-12 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Merge pull request #3139 from prototech/ticket/13239 | Marc Alexander | 2014-11-12 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | | * | | | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated. | Cesar G | 2014-11-11 | 1 | -0/+8 |
| | | | |_|/ / / | | |/| | | | | |||||
