aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-011-1/+14
|\
| * Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeusMarc Alexander2014-08-011-1/+14
| |\
| | * [ticket/12880] Changed name change @since as requestedbrunoais2014-08-011-3/+3
| | * [ticket/12800] removed superfulous tab characterbrunoais2014-07-201-1/+1
| | * [ticket/12800] Missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+2
| | * [ticket/12800] core.functions_display.display_user_activity.actives_afterbrunoais2014-07-031-0/+12
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-011-1/+1
|\ \ \ | |/ /
| * | Merge pull request #2784 from Nicofuma/ticket/11480-ascraeusJoas Schilling2014-08-011-1/+1
| |\ \
| | * \ Merge branch 'ticket/11480' into ticket/11480-ascraeusTristan Darricau2014-07-301-1/+1
| | |\ \
| | | * | [ticket/11480] Move the test into get_folder()Tristan Darricau2014-07-302-7/+1
| | | * | [ticket/11480] PM : "Unknown folder" returned when inbox folder is fullNicofuma2014-04-251-0/+6
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-317-0/+43
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeusMarc Alexander2014-07-317-0/+43
| |\ \ \ \
| | * | | | [ticket/12864] Update event docsMatt Friedman2014-07-271-4/+7
| | * | | | [ticket/12864] Add template event to header after stylesheetsMatt Friedman2014-07-187-0/+40
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-311-0/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2767 from Nicofuma/ticket/12882Joas Schilling2014-07-311-0/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [ticket/12882] Use a new migrationTristan Darricau2014-07-212-4/+34
| | * | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_searchTristan Darricau2014-07-211-0/+4
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-07-301-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #2425 from Zoddo/ticket/12492Joas Schilling2014-07-301-1/+1
| | |\ \ \ \ \
| | | * | | | | [ticket/12492] Add support of special charsSkouat2014-05-241-1/+1
* | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-07-284-20/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #2780 from Nicofuma/ticket/12870Andreas Fischer2014-07-284-20/+31
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/12870] Add doc blockTristan Darricau2014-07-281-0/+4
| | * | | | | | | [ticket/12870] Create the migrations table with a method in the migratorTristan Darricau2014-07-275-47/+29
| | * | | | | | | [ticket/12870] Create the migrations table in db:migrateTristan Darricau2014-07-263-6/+31
* | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-284-83/+73
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeusMarc Alexander2014-07-284-83/+73
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/12891] Replace template loops with 1 loop to reduce generation timeJoas Schilling2014-07-254-83/+73
* | | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-07-281-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'Nicofuma/ticket/12898' into develop-ascraeusMarc Alexander2014-07-281-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/12898] Call garbage_collection() at the end of cron.phpTristan Darricau2014-07-281-1/+2
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-07-2814-49/+83
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2772 from dhruvgoel92/ticket/12656Andreas Fischer2014-07-2814-49/+83
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | [ticket/12656] Fix typo for "purged extension"Dhruv2014-07-271-1/+1
| | * | | | | | | | | [ticket/12656] Fix syntax in language fileDhruv2014-07-241-2/+2
| | * | | | | | | | | [ticket/12656] Fix typoDhruv2014-07-241-1/+1
| | * | | | | | | | | [ticket/12656] Use utf8 ’ instead of escaping 'Dhruv2014-07-241-5/+5
| | * | | | | | | | | [ticket/12656] Use lang keys for all CLI stringsDhruv2014-07-2311-32/+55
| | * | | | | | | | | [ticket/12656] Use lang keys for CLI command descriptionsDhruv2014-07-2314-19/+30
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-271-8/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2718 from lucifer4o/ticket/12793Joas Schilling2014-07-271-8/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/12793] Changing get_profile_contact_value to get_profile_value_rawStanislav Atanasov2014-07-101-6/+1
| | * | | | | | | | | | [ticket/12793] String '0' does not display for string profile fieldsStanislav Atanasov2014-07-101-3/+3
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2719 from lucifer4o/ticket/12791Joas Schilling2014-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/12791] Changed the if checkStanislav Atanasov2014-07-101-2/+1
| | * | | | | | | | | | | [ticket/12791] String profile fields do not use links ...Stanislav Atanasov2014-07-101-1/+2
| | |/ / / / / / / / / /