aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-238-19/+11
|\ | | | | | | | | | | | | * develop-ascraeus: [ticket/12862] Remove remaining simple-wrap id [ticket/12862] Resize popups consistently [ticket/12862] Add Border
| * Merge pull request #2783 from hanakin/ticket/12862Andreas Fischer2014-08-238-19/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12862] Fix pop-up box wraps * hanakin/ticket/12862: [ticket/12862] Remove remaining simple-wrap id [ticket/12862] Resize popups consistently [ticket/12862] Add Border
| | * [ticket/12862] Remove remaining simple-wrap idMichael Miday2014-08-111-4/+0
| | | | | | | | | | | | PHPBB3-12862
| | * [ticket/12862] Resize popups consistentlyhanakin2014-07-306-14/+10
| | | | | | | | | | | | PHPBB3-12862
| | * [ticket/12862] Add Borderhanakin2014-07-291-1/+1
| | | | | | | | | | | | PHPBB3-12862
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-222-4/+7
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13003] Add missing language keys
| * | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-211-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
| * | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-211-12/+12
|\ \ \ \ | |/ / /
| * | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-214-19/+0
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12999] Remove @author tags
| * | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-2151-212/+327
|\ \ \ \ | |/ / /
| * | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-211-0/+29
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-201-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-191-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12989] Remove unused "created_by.jpg"
| * | | | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-191-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12996] Fix reliability issue in flock test.
| * | | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-171-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12984] Remove blank line when no forum description shown
| * | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-171-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12986] Fix detection of common words in search
| * | | | 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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-162-2/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
| * | | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-143-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-ascraeus' into developCesar G2014-08-134-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12856] Remove images from assets/plupload/img/ [ticket/12856] Copy plupload images to prosilver dir
| * | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 00:40:12 +0000