aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | [ticket/13338] Move insert_config_array_test to functions_acp, add deps.Andreas Fischer2014-11-171-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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 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 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 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 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 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-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 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
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-11-111-22/+18
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #3133 from bantu/ticket/13324Tristan Darricau2014-11-111-22/+18
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.Andreas Fischer2014-11-111-22/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3112 from Elsensee/ticket/13083Tristan Darricau2014-11-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ticket/13083] Fix language string NO_ENTRIES for logsOliver Schramm2014-11-051-1/+1
* | | | | | | | | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3121 from Elsensee/ticket/13300Joas Schilling2014-11-093-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-093-4/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3120 from Elsensee/ticket/13301Marc Alexander2014-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13301] Fix called function in apche auth moduleOliver Schramm2014-11-091-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3119 from Elsensee/ticket/13243Marc Alexander2014-11-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3110 from Elsensee/ticket/13242Joas Schilling2014-11-091-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13242] Fix HTML validityOliver Schramm2014-11-051-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeusCesar G2014-11-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [ticket/13265] Don't show link to edit own profile to those without permissionOliver Schramm2014-11-051-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3118 from prototech/ticket/13270Tristan Darricau2014-11-071-0/+31
|\ \ \ \ \ \ \ \