aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/blitze/ticket/11458' into developNathaniel Guse2013-05-183-25/+140
|\
| * [ticket/11458] Update functional testOpenShift guest2013-05-111-0/+5
| * [ticket/11458] Use finder to get all permission language filesOpenShift guest2013-05-101-35/+12
| * [ticket/11458] Use helper to create/move/delete directories/filesOpenShift guest2013-05-091-24/+27
| * [ticket/11458] Fix functional test againOpenShift guest2013-04-141-20/+64
| * [ticket/11458] Fix testOpenShift guest2013-04-131-1/+8
| * [ticket/11458] Add functional testOpenShift guest2013-04-132-0/+65
| * [ticket/11458] We still auto add language files from the mods and acpOpenShift guest2013-04-131-4/+31
| * [ticket/11458] Search for permission language files in extensionsOpenShift guest2013-03-251-24/+11
* | Merge remote-tracking branch 'bantu/ticket/11547-develop' into developAndreas Fischer2013-05-171-2/+2
|\ \
| * | [ticket/11547] Add phpbb_db_driver_ prefix to DBMS names.Andreas Fischer2013-05-171-2/+2
|/ /
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-173-7/+15
|\ \
| * \ Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympusAndreas Fischer2013-05-171-0/+8
| |\ \
| | * | [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.Andreas Fischer2013-05-171-0/+8
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11542-2' into develop-olympusAndreas Fischer2013-05-172-7/+7
| |\ \ \
| | * | | [ticket/11542] Use Czech as example as it contains non-latin charactersJoas Schilling2013-05-172-7/+7
| |/ / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-170-0/+0
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'marc1706/ticket/11544' into develop-olympusAndreas Fischer2013-05-171-0/+44
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/11544] Add admin_login() method to 3.0 functional test caseMarc Alexander2013-05-141-0/+44
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-172-0/+60
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11542' into develop-olympusAndreas Fischer2013-05-172-0/+60
| |\ \ \
| | * | | [ticket/11542] Add non-existing default value for language selectJoas Schilling2013-05-161-0/+1
| | * | | [ticket/11542] Add lang_english_name to fixtureJoas Schilling2013-05-151-0/+3
| | * | | [ticket/11542] Add unit tests for language_select()Joas Schilling2013-05-142-0/+56
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into develop-oly...Andreas Fischer2013-05-161-2/+2
| |\ \ \ \
| | * | | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-162-5/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympusAndreas Fischer2013-05-162-5/+26
| |\ \ \ \
| | * | | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-162-5/+26
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-152-0/+64
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympusAndreas Fischer2013-05-152-0/+64
| |\ \ \ \
| | * | | | [ticket/11541] Add unit tests for style_select()Joas Schilling2013-05-142-0/+64
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-152-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympusAndreas Fischer2013-05-152-1/+2
| |\ \ \ \
| | * | | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-152-1/+2
| |/ / / /
* | | | | Merge remote-tracking branch 'bantu/ticket/11540' into developAndreas Fischer2013-05-151-1/+1
|\ \ \ \ \
| * | | | | [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus.Andreas Fischer2013-05-151-1/+1
|/ / / / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympusAndreas Fischer2013-05-151-0/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/11540] Add unit tests for is_absolute()Joas Schilling2013-05-141-0/+34
| | |/ /
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-124-158/+145
|\ \ \ \
| * | | | [ticket/11533] Update unit testsVjacheslav Trushkin2013-05-111-1/+1
| * | | | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| * | | | [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| * | | | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
* | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11465' into developNathan Guse2013-05-1215-49/+369
|\ \ \ \ \
| * | | | | [ticket/11465] Increase count of disabled extensions to 5 in functional testMarc Alexander2013-05-121-1/+1
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-12185-1989/+6802
| |\ \ \ \ \
| * | | | | | [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()Marc Alexander2013-05-125-2/+50