aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-3/+4
| | | | | | More corrections. PHPBB3-12557
* [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-036-17/+41
| | | | PHPBB3-12557
* Merge pull request #2782 from marc1706/ticket/12895Joas Schilling2014-08-023-9/+9
|\ | | | | | | | | | | | | [ticket/12895] Rename user style setting to resolve conflict with style param * marc1706/ticket/12895: [ticket/12895] Rename user style setting to resolve conflict with style param
| * [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-293-9/+9
| | | | | | | | | | | | | | The style URL parameter, i.e. style=1, will conflict with the user's style setting due to it also being named style. This patch with solve this conflict. PHPBB3-12895
* | Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeusJoas Schilling2014-08-021-1/+0
|\ \ | | | | | | | | | | | | * ticket/JeroenDeDauw/12902: [ticket/12902] Remove duplicate entry in switch statement
| * | [ticket/12902] Remove duplicate entry in switch statementjeroendedauw2014-08-021-1/+0
| | | | | | | | | | | | PHPBB3-12902
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name to core.load_drafts_draft_list_result as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12801
| * | | [ticket/12801] missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12801
| * | | [ticket/12801] Add core.functions_posting.load_drafts_draft_list_resultsbrunoais2014-07-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Adding event core.functions_posting.load_drafts_draft_list_results PHPBB3-12801
| * | | [ticket/12801] Add topic_poster to load_drafts' topics querybrunoais2014-07-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12801
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name to core.display_user_activity_modify_actives as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12880
| * | | [ticket/12800] removed superfulous tab characterbrunoais2014-07-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12800
| * | | [ticket/12800] Missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+2
| | | | | | | | | | | | | | | | PHPBB3-12800
| * | | [ticket/12800] core.functions_display.display_user_activity.actives_afterbrunoais2014-07-031-0/+12
| |/ / | | | | | | | | | | | | | | | Adding core.functions_display.display_user_activity.actives_after PHPBB3-12800
* | | Merge pull request #2784 from Nicofuma/ticket/11480-ascraeusJoas Schilling2014-08-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11480-ascraeus] PM : "Unknown folder" returned when inbox folder is full * Nicofuma/ticket/11480-ascraeus: [ticket/11480] Header file [ticket/11480] Fix unit tests [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
| * \ \ Merge branch 'ticket/11480' into ticket/11480-ascraeusTristan Darricau2014-07-301-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * | | [ticket/11480] Move the test into get_folder()Tristan Darricau2014-07-302-7/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| | * | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is fullNicofuma2014-04-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11480 PHPBB3-11480
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12864
| * | | | | [ticket/12864] Add template event to header after stylesheetsMatt Friedman2014-07-187-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12864 PHPBB3-12864
* | | | | | Merge pull request #2767 from Nicofuma/ticket/12882Joas Schilling2014-07-311-0/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_search * Nicofuma/ticket/12882: [ticket/12882] Use a new migration [ticket/12882] Update search_type when it's not prefixed by phpbb_search
| * | | | | [ticket/12882] Use a new migrationTristan Darricau2014-07-212-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12882
| * | | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_searchTristan Darricau2014-07-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12882
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-07-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12492] Add support of special chars
| * \ \ \ \ \ Merge pull request #2425 from Zoddo/ticket/12492Joas Schilling2014-07-301-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12492] Add support of special chars * Zoddo/ticket/12492: [ticket/12492] Add support of special chars
| | * | | | | | [ticket/12492] Add support of special charsSkouat2014-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support of special chars during db test in the installation PHPBB3-12492
* | | | | | | | Merge pull request #2780 from Nicofuma/ticket/12870Andreas Fischer2014-07-284-20/+31
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12870] phpbbcli.php db:migrate can not update from 3.0.12 to 3.1 * Nicofuma/ticket/12870: [ticket/12870] Add doc block [ticket/12870] Create the migrations table with a method in the migrator [ticket/12870] Add $config['version'] in phpbb_extension_manager_test [ticket/12870] Create the migrations table in db:migrate
| * | | | | | | [ticket/12870] Add doc blockTristan Darricau2014-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12870
| * | | | | | | [ticket/12870] Create the migrations table with a method in the migratorTristan Darricau2014-07-275-47/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12870
| * | | | | | | [ticket/12870] Create the migrations table in db:migrateTristan Darricau2014-07-263-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12870
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12891
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12898
* | | | | | | | | | Merge pull request #2772 from dhruvgoel92/ticket/12656Andreas Fischer2014-07-2814-49/+83
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12656] Translate existing CLI commands * dhruvgoel92/ticket/12656: [ticket/12656] Fix typo for "purged extension" [ticket/12656] Fix syntax in language file [ticket/12656] Fix typo [ticket/12656] Use utf8 ’ instead of escaping ' [ticket/12656] Use lang keys for all CLI strings [ticket/12656] Use lang keys for CLI command descriptions
| * | | | | | | | | [ticket/12656] Fix typo for "purged extension"Dhruv2014-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | | | [ticket/12656] Fix syntax in language fileDhruv2014-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | | | [ticket/12656] Fix typoDhruv2014-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | | | [ticket/12656] Use utf8 ’ instead of escaping 'Dhruv2014-07-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | | | [ticket/12656] Use lang keys for all CLI stringsDhruv2014-07-2311-32/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | | | [ticket/12656] Use lang keys for CLI command descriptionsDhruv2014-07-2314-19/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
* | | | | | | | | | Merge pull request #2718 from lucifer4o/ticket/12793Joas Schilling2014-07-271-8/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12793] String '0' does not display for string profile fields * lucifer4o/ticket/12793: [ticket/12793] Tests (added and changed) [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw [ticket/12793] String '0' does not display for string profile fields
| * | | | | | | | | | [ticket/12793] Changing get_profile_contact_value to get_profile_value_rawStanislav Atanasov2014-07-101-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the return to get_profile_value_raw PHPBB3-12793
| * | | | | | | | | | [ticket/12793] String '0' does not display for string profile fieldsStanislav Atanasov2014-07-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/phpbb/phpbb/pull/2647#discussion_r14503051 PHPBB3-12793
* | | | | | | | | | | Merge pull request #2719 from lucifer4o/ticket/12791Joas Schilling2014-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12791] String profile fields do not use links ... * lucifer4o/ticket/12791: [ticket/12791] Changed the if check [ticket/12791] String profile fields do not use links ...
| * | | | | | | | | | | [ticket/12791] Changed the if checkStanislav Atanasov2014-07-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded variable PHPBB3-12791
| * | | | | | | | | | | [ticket/12791] String profile fields do not use links ...Stanislav Atanasov2014-07-101-1/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smilies and line breaks in memberlist The value is overwritten with the contact value Added aditional check if the field is a contact so we don't overwrite it. PHPBB3-12791