aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-0912-64/+79
|\
| * [ticket/11701] New line at EOFNathaniel Guse2013-07-231-1/+1
| * [ticket/11701] Test events in loopsNathaniel Guse2013-07-233-0/+14
| * [ticket/11701] Refix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| * [ticket/11701] Fix regex for appending |lengthNathaniel Guse2013-07-231-2/+2
| * [ticket/11701] Fix loops var checkNathaniel Guse2013-07-238-56/+60
| * [ticket/11701] Remove useless str_replaceNathaniel Guse2013-07-231-3/+0
| * [ticket/11701] Loop variables are not passed correctly to eventsNathaniel Guse2013-07-232-7/+7
* | Merge remote-tracking branch 'Elsensee/ticket/11774' into developAndreas Fischer2013-08-081-1/+1
|\ \
| * | [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
|/ /
* | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-0811-143/+174
|\ \
| * | [ticket/11574] Remove install/udpate/new/ fallback from database_update.phpJoas Schilling2013-07-302-57/+12
| * | [ticket/11574] Do not display incompatible package note after successful updateJoas Schilling2013-07-301-0/+5
| * | Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3072-570/+2177
| |\ \
| * | | [ticket/11574] Remove old "continue step"-messageJoas Schilling2013-07-291-14/+1
| * | | [ticket/11574] Change order of files and database updateJoas Schilling2013-07-295-35/+55
| * | | Merge pull request #9 from igorw/ticket/11574Joas Schilling2013-07-146-23/+15
| |\ \ \
| | * | | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-144-20/+12
| | * | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-142-3/+3
| | |\ \ \
| * | \ \ \ Merge remote-tracking branch 'igorw/ticket/11574' into ticket/11574Joas Schilling2013-07-14509-5962/+12698
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-14509-5962/+12698
| | |\ \ \ \ | |/ / / / /
| * | | | | Merge pull request #7 from igorw/ticket/11574Joas Schilling2013-07-144-33/+33
| |\ \ \ \ \
| | * | | | | [ticket/11574] Add trailing slash for consistencyIgor Wiedler2013-07-142-2/+2
| | * | | | | [ticket/11574] Fix table prefix in database updaterIgor Wiedler2013-07-142-2/+3
| | * | | | | [ticket/11574] Fix various path issues in the updaterIgor Wiedler2013-07-143-30/+29
| |/ / / / /
| * | | | | [ticket/11574] Make install language filename less crazyIgor Wiedler2013-07-131-10/+4
| * | | | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-134-22/+19
| * | | | | [ticket/11574] Include normalizer so it loads form the correct directoryJoas Schilling2013-07-131-0/+1
| * | | | | [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)Joas Schilling2013-07-132-4/+6
| * | | | | [ticket/11574] Use log object instead of old functionJoas Schilling2013-07-131-2/+2
| * | | | | [ticket/11574] Include vendor into update packagesJoas Schilling2013-07-131-0/+2
| * | | | | [ticket/11574] Create phpbb_log object before using it.Joas Schilling2013-07-131-0/+3
| * | | | | [ticket/11574] Add correct language parameter to return linksJoas Schilling2013-07-131-2/+2
| * | | | | [ticket/11574] Use request object rather then request_var functionJoas Schilling2013-07-131-3/+3
| * | | | | [ticket/11574] Load new language files whenever possibleJoas Schilling2013-07-131-5/+17
| * | | | | [ticket/11574] Require new files in install/index.php and add a class loaderJoas Schilling2013-07-131-6/+25
| * | | | | [ticket/11574] Require new files in database_update.php and add a class loaderJoas Schilling2013-07-131-6/+28
| * | | | | [ticket/11574] Find language files in update/new before throwing an errorJoas Schilling2013-07-131-0/+12
| * | | | | [ticket/11574] Try to load updated service.yml before the default oneJoas Schilling2013-07-131-2/+10
* | | | | | Merge remote-tracking branch 'asperous/ticket/11761' into developAndreas Fischer2013-08-063-3/+3
|\ \ \ \ \ \
| * | | | | | [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-063-3/+3
* | | | | | | Merge remote-tracking branch 'brunoais/ticket11639' into developJoas Schilling2013-08-041-9/+4
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11639] Changing how censorship is handled.brunoais2013-08-031-4/+2
| * | | | | | | [ticket/11639] Removed a non-needed unsetBruno Ais2013-07-241-2/+0
| * | | | | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-201-1/+1
| * | | | | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-151-2/+2
| * | | | | | | [ticket/11639] Added an useful comment.Bruno Ais2013-07-151-1/+2
| * | | | | | | [ticket/11639] generate_text_for_display on functions_posting.phpBruno Ais2013-07-151-8/+6
* | | | | | | | Merge remote-tracking branch 'brunoais/ticket/11642' into developJoas Schilling2013-08-031-11/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11642] Use $parse_flagsBruno Ais2013-08-011-1/+2