aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12990] Disable all the notifications types which are not in the coreTristan Darricau2014-08-231-0/+5
| | | | PHPBB3-12990
* Merge pull request #2899 from Skouat/ticket/13003Andreas Fischer2014-08-222-4/+7
|\ | | | | | | | | | | | | [ticket/13003] Add missing language keys * Skouat/ticket/13003: [ticket/13003] Add missing language keys
| * [ticket/13003] Add missing language keysMario Skouat2014-08-212-4/+7
| | | | | | | | PHPBB3-13003
* | Merge pull request #2900 from prototech/ticket/13004Andreas Fischer2014-08-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools. * prototech/ticket/13004: [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
| * | [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.Cesar G2014-08-211-1/+1
| |/ | | | | | | PHPBB3-13004
* | Merge pull request #2898 from Nicofuma/ticket/12990Marc Alexander2014-08-211-12/+12
|\ \ | |/ |/| | | [ticket/12990] Use {$var} instead of ${var}
| * [ticket/12990] Use {$var} instead of ${var}Tristan Darricau2014-08-211-12/+12
|/ | | | PHPBB3-12990
* Merge pull request #2894 from Nicofuma/ticket/12999Andreas Fischer2014-08-214-19/+0
|\ | | | | | | | | | | | | [ticket/12999] Remove @author tags * Nicofuma/ticket/12999: [ticket/12999] Remove @author tags
| * [ticket/12999] Remove @author tagsTristan Darricau2014-08-194-19/+0
| | | | | | | | PHPBB3-12999
* | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2151-212/+327
|\ \ | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| * | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-172-3/+3
| | | | | | | | | | | | PHPBB3-12990
| * | [ticket/12990] Fix unit testsTristan Darricau2014-08-1716-95/+97
| | | | | | | | | | | | PHPBB3-12990
| * | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1635-118/+231
| | | | | | | | | | | | PHPBB3-12990
* | | Merge pull request #2889 from rxu/ticket/12994Marc Alexander2014-08-211-0/+29
|\ \ \ | | | | | | | | | | | | [ticket/12994] Add core event to viewtopic.php before sending vars to template
| * | | [ticket/12994] Add core event to viewtopic.php before sending vars to templaterxu2014-08-211-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to viewtopic.php before sending vars to template to allow extensions performing additional actions/modifying data first. PHPBB3-12994
* | | | Merge pull request #2895 from Nicofuma/ticket/12998Marc Alexander2014-08-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/12998] Fix use of $lang in mcp_warn.php
| * | | | [ticket/12998] Fix use of $lang in mcp_warn.phpTristan Darricau2014-08-191-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-12998
* | | | Merge pull request #2893 from bantu/ticket/12989Andreas Fischer2014-08-191-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | [ticket/12989] Remove unused "created_by.jpg" * bantu/ticket/12989: [ticket/12989] Remove unused "created_by.jpg"
| * | | [ticket/12989] Remove unused "created_by.jpg"Louis77772014-08-191-0/+0
|/ / / | | | | | | | | | | | | | | | This image is not used anywhere in prosilver. PHPBB3-12989
* | | Merge pull request #2892 from bantu/ticket/12996Andreas Fischer2014-08-191-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | [ticket/12996] Fix reliability issue in flock test. * bantu/ticket/12996: [ticket/12996] Fix reliability issue in flock test.
| * | [ticket/12996] Fix reliability issue in flock test.Fred Emmott2014-08-191-4/+4
|/ / | | | | | | | | | | | | | | | | $delta was always an int - so, this test would sometimes fail if you happened to call time() /very/ close to a 1s boundary. Found by HHVM's continuous testing. PHPBB3-12996
* | Merge pull request #2886 from Oyabun1/ticket/12984Andreas Fischer2014-08-171-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12984] Remove blank line when no forum description shown * Oyabun1/ticket/12984: [ticket/12984] Remove blank line when no forum description shown
| * | [ticket/12984] Remove blank line when no forum description shownOyabun12014-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a conditional for forum description and move the <br /> within it. Currently if there is no forum description but there is 1. a displayed forum moderator and/or 2. a displayed sub-forum a blank line is added in place of the description PHPBB3-12984
* | | Merge pull request #2881 from rxu/ticket/12986Andreas Fischer2014-08-171-3/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/12986] Fix detection of common words in search * rxu/ticket/12986: [ticket/12986] Fix detection of common words in search
| * | [ticket/12986] Fix detection of common words in searchrxu2014-08-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | $search->get_common_words() call goes before the split_keywords() call, but $search->common_words array is being generated within the function $search->split_keywords(). Thus, get_common_words() returned an empty array instead of common words array. PHPBB3-12986
* | | Merge pull request #2872 from Nicofuma/ticket/12975Andreas Fischer2014-08-162-2/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth * Nicofuma/ticket/12975: [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
| * | [ticket/12975] Fix the construction of phpbb\auth\provider\db for OauthTristan Darricau2014-08-122-2/+12
| | | | | | | | | | | | PHPBB3-12975
* | | Merge pull request #2876 from PayBas/ticket/12900Marc Alexander2014-08-143-1/+8
|\ \ \ | | | | | | | | | | | | [ticket/12900] Fix potential avatar size box overflow
| * | | [ticket/12900] Fix potential avatar size box overflowPayBas2014-08-133-1/+8
| | |/ | |/| | | | | | | PHPBB3-12900
* | | Merge remote-tracking branch 'PayBas/ticket/12856' into develop-ascraeusCesar G2014-08-134-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | * PayBas/ticket/12856: [ticket/12856] Remove images from assets/plupload/img/ [ticket/12856] Copy plupload images to prosilver dir
| * | [ticket/12856] Remove images from assets/plupload/img/PayBas2014-08-133-0/+0
| | | | | | | | | | | | PHPBB3-12856
| * | [ticket/12856] Copy plupload images to prosilver dirPayBas2014-08-134-3/+3
|/ / | | | | | | PHPBB3-12856
* | Merge pull request #2853 from callumacrae/ticket/12951Dhruv Goel2014-08-121-0/+18
|\ \ | |/ |/| [ticket/12951] Added editorconfig
| * [ticket/12951] Made editorconfig file comments betterCallum Macrae2014-08-101-1/+2
| | | | | | PHPBB3-12951
| * [ticket/12951] Added editorconfigCallum Macrae2014-08-091-0/+17
| | | | | | | | PHPBB3-12951
* | Merge branch 'prep-release-3.1.0-RC3' into develop-ascraeusJoas Schilling2014-08-128-42/+202
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-RC3: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
| * | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-123-5/+5
| | |
| * | [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3Joas Schilling2014-08-111-0/+122
| | |
| * | [prep-release-3.1.0-RC3] Prepare ChangelogJoas Schilling2014-08-111-32/+35
| | |
| * | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3Joas Schilling2014-08-111-0/+35
| | |
| * | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-116-8/+8
|/ /
* | Merge pull request #2870 from nickvergessen/ticket/12970Tristan Darricau2014-08-111-14/+14
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12970] Regenerate schema.json with new dependencies * nickvergessen/ticket/12970: [ticket/12970] Regenerate schema.json with new dependencies
| * | [ticket/12970] Regenerate schema.json with new dependenciesJoas Schilling2014-08-111-14/+14
|/ / | | | | | | PHPBB3-12970
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Correctly call \phpbb\user in avatar manager test
| * | [ticket/12822] Correctly call \phpbb\user in avatar manager testMarc Alexander2014-08-111-1/+1
|/ / | | | | | | PHPBB3-12822
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-1122-113/+238
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| * | [ticket/12822] Fix test runs of avatar manager_testMarc Alexander2014-08-081-4/+11
| | | | | | | | | | | | PHPBB3-12822
| * | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-0714-93/+224
| | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| * | [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-0710-18/+5
| | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | | Merge pull request #2842 from Nicofuma/ticket/11854Marc Alexander2014-08-1132-1223/+1272
|\ \ \ | | | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-11 17:40:09 +0000