aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-201-0/+32
|\
| * [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4Joas Schilling2014-09-191-0/+32
* | Merge branch 'ticket/13073' into ticket/13073-developMarc Alexander2014-09-191-2/+9
|\ \ | |/
| * [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-191-1/+1
| * [ticket/13073] Use just one regex in helper route()Marc Alexander2014-09-191-1/+1
| * [ticket/13073] Properly place comments in helperMarc Alexander2014-09-191-2/+1
| * [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routesMarc Alexander2014-09-181-2/+10
* | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-182-18/+1
|\ \ | |/
| * [ticket/12963] Revert back to "migrations" folder name for extensionsJoas Schilling2014-09-182-18/+1
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-18/+1
|\ \ | |/
| * [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."Joas Schilling2014-09-171-18/+1
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-172-40/+4
|\ \ | |/
| * Merge pull request #2948 from Nicofuma/ticket/13061Joas Schilling2014-09-172-40/+4
| |\
| | * [ticket/13061] Replace the service event.subscriber_loader by a compiler passTristan Darricau2014-09-132-40/+4
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-171-1/+18
|\ \ \ | |/ /
| * | Merge pull request #2951 from Nicofuma/ticket/13064Joas Schilling2014-09-171-1/+18
| |\ \
| | * | [ticket/13064] Validate the migrations provided to migrator::set_migrations()Tristan Darricau2014-09-141-1/+18
| | |/
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-171-3/+10
|\ \ \ | |/ /
| * | Merge pull request #2922 from Nicofuma/ticket/13036Marc Alexander2014-09-171-3/+10
| |\ \
| | * | [ticket/13036] Add unit testsTristan Darricau2014-09-161-0/+5
| | * | [ticket/13036] Make the reference type configurable when generating a routeTristan Darricau2014-09-161-3/+5
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-172-5/+25
|\ \ \ \ | |/ / /
| * | | Merge pull request #2932 from Nicofuma/ticket/12963Marc Alexander2014-09-172-5/+25
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/12963] Edit deprecation messageTristan Darricau2014-09-162-2/+2
| | * | [ticket/12963] Load extensions migrations from /migrationTristan Darricau2014-09-102-1/+20
| | * | [ticket/12963] Don't use static var in \extension\base\get_migration_file_listTristan Darricau2014-09-101-4/+5
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-161-15/+29
|\ \ \ \ | |/ / /
| * | | Merge pull request #2921 from Nicofuma/ticket/13034Marc Alexander2014-09-161-15/+29
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/13034] Update the base url to move to the root dirTristan Darricau2014-09-151-2/+18
| | * | [ticket/13034] Add commentTristan Darricau2014-09-151-0/+2
| | * | [ticket/13034] Use utf8_basenameTristan Darricau2014-09-141-1/+1
| | * | [ticket/13034] Fix the route generated for the frontend not in the phpbb rootTristan Darricau2014-09-041-14/+10
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-121-7/+3
|\ \ \ \ | |/ / /
| * | | [ticket/12734] Remove unnecessary error supressingJakub Senko2014-09-101-7/+3
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-071-2/+2
|\ \ \ \ | |/ / /
| * | | [ticket/13048] Only update session_page if request is not ajaxJakub Senko2014-09-071-2/+2
| | |/ | |/|
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-3/+21
|\ \ \ | |/ /
| * | Merge pull request #2919 from Senky/ticket/12852Tristan Darricau2014-09-061-3/+21
| |\ \
| | * | [ticket/12852] Add space after ifJakub Senko2014-09-041-1/+1
| | * | [ticket/12852] Remove whitespaceJakub Senko2014-09-041-1/+1
| | * | [ticket/12852] Make get_url_parts handle get variable with no valueJakub Senko2014-09-041-3/+21
| | |/
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-7/+32
|\ \ \ | |/ /
| * | [ticket/13031] Slightly change behavior of choose_mime_type and add unit testsMarc Alexander2014-09-051-4/+4
| * | [ticket/13031] Guess with all mimetype guessers and pick best guessMarc Alexander2014-09-051-7/+32
| |/
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-021-0/+4
|\ \ | |/
| * Merge pull request #2908 from Pico/t/12661Marc Alexander2014-09-021-0/+4
| |\
| | * [ticket/12661] Add template testPico882014-08-241-1/+1
| | * [ticket/12661] Load extensions templates from "all" folder by render()Pico882014-08-241-0/+4
* | | Merge branch 'develop-ascraeus' into developDhruv2014-08-296-9/+9
|\ \ \ | |/ /
| * | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-296-9/+9
| |\ \