Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | [ticket/13338] Move insert_config_array_test to functions_acp, add deps. | Andreas Fischer | 2014-11-17 | 1 | -0/+2 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | 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 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 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 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 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 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-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 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 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeus | Tristan Darricau | 2014-11-11 | 1 | -22/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3133 from bantu/ticket/13324 | Tristan Darricau | 2014-11-11 | 1 | -22/+18 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. | Andreas Fischer | 2014-11-11 | 1 | -22/+18 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #3112 from Elsensee/ticket/13083 | Tristan Darricau | 2014-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [ticket/13083] Fix language string NO_ENTRIES for logs | Oliver Schramm | 2014-11-05 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #3113 from prototech/ticket/13251 | Marc Alexander | 2014-11-09 | 1 | -10/+18 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php. | Cesar G | 2014-11-07 | 1 | -10/+18 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3121 from Elsensee/ticket/13300 | Joas Schilling | 2014-11-09 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabled | Oliver Schramm | 2014-11-09 | 3 | -4/+4 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3120 from Elsensee/ticket/13301 | Marc Alexander | 2014-11-09 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ticket/13301] Fix called function in apche auth module | Oliver Schramm | 2014-11-09 | 1 | -2/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #3119 from Elsensee/ticket/13243 | Marc Alexander | 2014-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [ticket/13243] Validate announcement entry for existence in version_helper | Oliver Schramm | 2014-11-09 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #3110 from Elsensee/ticket/13242 | Joas Schilling | 2014-11-09 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ticket/13242] Fix HTML validity | Oliver Schramm | 2014-11-05 | 1 | -0/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus | Cesar G | 2014-11-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | [ticket/13265] Don't show link to edit own profile to those without permission | Oliver Schramm | 2014-11-05 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #3118 from prototech/ticket/13270 | Tristan Darricau | 2014-11-07 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ |