aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-236-9/+9
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-281-54/+0
|\ \ \ \ | |/ / /
| * | | [ticket/11909] Remove unused function load_migrationsn-aleha2014-08-261-54/+0
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #2905 from Nicofuma/ticket/13008Andreas Fischer2014-08-241-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/13008] Use an absolute path with the FileLocator for the routing filesTristan Darricau2014-08-231-1/+1
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-241-0/+5
|\ \ \ \ | |/ / /
| * | | [ticket/12990] Disable all the notifications types which are not in the coreTristan Darricau2014-08-231-0/+5
| |/ /
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-221-4/+4
|\ \ \ | |/ /
| * | Merge pull request #2899 from Skouat/ticket/13003Andreas Fischer2014-08-221-4/+4
| |\ \
| | * | [ticket/13003] Add missing language keysMario Skouat2014-08-211-4/+4
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-12/+12
|\ \ \ \ | |/ / /
| * | | [ticket/12990] Use {$var} instead of ${var}Tristan Darricau2014-08-211-12/+12
| |/ /
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2122-29/+142
|\ \ \ | |/ /
| * | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-2/+2
| * | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1622-29/+142
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-161-2/+11
|\ \ \ | |/ /
| * | [ticket/12975] Fix the construction of phpbb\auth\provider\db for OauthTristan Darricau2014-08-121-2/+11
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-0/+35
|\ \ \ | |/ /
| * | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3Joas Schilling2014-08-111-0/+35
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-115-4/+44
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascr...Nils Adermann2014-08-115-4/+44
| |\ \
| | * | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-2/+39
| | * | [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-073-2/+5
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-1115-14/+5971
|\ \ \ \ | |/ / /
| * | | [ticket/11854] Don't override get service name in nogdTristan Darricau2014-08-112-9/+1