aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-8/+9
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-035-11/+11
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+1
* [ticket/12557] Template fixesn-aleha2014-08-034-6/+7
* [ticket/12557] Search, cron and profilefields fixesn-aleha2014-08-037-4/+26
* [ticket/12557] Notification fixesn-aleha2014-08-0314-4/+19
* [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-038-19/+22
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-3/+4
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-036-17/+41
* Merge pull request #2782 from marc1706/ticket/12895Joas Schilling2014-08-023-9/+9
|\
| * [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-293-9/+9
* | Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeusJoas Schilling2014-08-021-1/+0
|\ \
| * | [ticket/12902] Remove duplicate entry in switch statementjeroendedauw2014-08-021-1/+0
* | | Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeusMarc Alexander2014-08-011-2/+16
|\ \ \
| * | | [ticket/12801] Changed name change @since as requestedbrunoais2014-08-011-3/+3
| * | | [ticket/12801] missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+1
| * | | [ticket/12801] Add core.functions_posting.load_drafts_draft_list_resultsbrunoais2014-07-061-0/+14
| * | | [ticket/12801] Add topic_poster to load_drafts' topics querybrunoais2014-07-031-1/+1
* | | | 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-olympus' into develop-ascraeusJoas Schilling2014-08-010-0/+0
|\ \ \
| * \ \ Merge pull request #2350 from Nicofuma/ticket/11480Joas Schilling2014-08-013-9/+125
| |\ \ \
* | \ \ \ Merge pull request #2784 from Nicofuma/ticket/11480-ascraeusJoas Schilling2014-08-013-22/+141
|\ \ \ \ \
| * | | | | [ticket/11480] Header fileTristan Darricau2014-07-311-3/+7
| * | | | | [ticket/11480] Fix unit testsTristan Darricau2014-07-311-2/+0
| * | | | | Merge branch 'ticket/11480' into ticket/11480-ascraeusTristan Darricau2014-07-303-22/+139
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [ticket/11480] Move the test into get_folder()Tristan Darricau2014-07-302-7/+1
| | * | | | [ticket/11480] Fix the double spaces in phpbb_functional_test_caseTristan Darricau2014-06-301-1/+1
| | * | | | [ticket/11480] Fix typosTristan Darricau2014-05-291-1/+2
| | * | | | [ticket/11480] Add functionnal testTristan Darricau2014-05-292-8/+123
| | * | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is fullNicofuma2014-04-251-0/+6
* | | | | | 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 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-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 pull request #2780 from Nicofuma/ticket/12870Andreas Fischer2014-07-285-21/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [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] Add $config['version'] in phpbb_extension_manager_testTristan Darricau2014-07-261-1/+1
| * | | | | | | [ticket/12870] Create the migrations table in db:migrateTristan Darricau2014-07-263-6/+31
* | | | | | | | 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