Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/12990] Disable all the notifications types which are not in the core | Tristan Darricau | 2014-08-23 | 1 | -0/+5 |
| | | | | PHPBB3-12990 | ||||
* | Merge pull request #2899 from Skouat/ticket/13003 | Andreas Fischer | 2014-08-22 | 2 | -4/+7 |
|\ | | | | | | | | | | | | | [ticket/13003] Add missing language keys * Skouat/ticket/13003: [ticket/13003] Add missing language keys | ||||
| * | [ticket/13003] Add missing language keys | Mario Skouat | 2014-08-21 | 2 | -4/+7 |
| | | | | | | | | PHPBB3-13003 | ||||
* | | Merge pull request #2900 from prototech/ticket/13004 | Andreas Fischer | 2014-08-21 | 1 | -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 G | 2014-08-21 | 1 | -1/+1 |
| |/ | | | | | | | PHPBB3-13004 | ||||
* | | [ticket/12990] Use {$var} instead of ${var} | Tristan Darricau | 2014-08-21 | 1 | -12/+12 |
|/ | | | | PHPBB3-12990 | ||||
* | Merge pull request #2894 from Nicofuma/ticket/12999 | Andreas Fischer | 2014-08-21 | 4 | -19/+0 |
|\ | | | | | | | | | | | | | [ticket/12999] Remove @author tags * Nicofuma/ticket/12999: [ticket/12999] Remove @author tags | ||||
| * | [ticket/12999] Remove @author tags | Tristan Darricau | 2014-08-19 | 4 | -19/+0 |
| | | | | | | | | PHPBB3-12999 | ||||
* | | Merge pull request #2885 from Nicofuma/ticket/12990 | Marc Alexander | 2014-08-21 | 36 | -121/+234 |
|\ \ | | | | | | | | | | [ticket/12990] Use the full services name for the notification's types | ||||
| * | | [ticket/12990] Use protected instead of private | Tristan Darricau | 2014-08-17 | 2 | -3/+3 |
| | | | | | | | | | | | | PHPBB3-12990 | ||||
| * | | [ticket/12990] Fix unit tests | Tristan Darricau | 2014-08-17 | 1 | -4/+4 |
| | | | | | | | | | | | | PHPBB3-12990 | ||||
| * | | [ticket/12990] Use the full services name for the notification's types | Tristan Darricau | 2014-08-16 | 35 | -118/+231 |
| | | | | | | | | | | | | PHPBB3-12990 | ||||
* | | | Merge pull request #2889 from rxu/ticket/12994 | Marc Alexander | 2014-08-21 | 1 | -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 template | rxu | 2014-08-21 | 1 | -0/+29 |
| | |/ | |/| | | | | | | | | | | | | | | | | Add core event to viewtopic.php before sending vars to template to allow extensions performing additional actions/modifying data first. PHPBB3-12994 | ||||
* | | | [ticket/12998] Fix use of $lang in mcp_warn.php | Tristan Darricau | 2014-08-19 | 1 | -2/+2 |
| | | | | | | | | | | | | PHPBB3-12998 | ||||
* | | | [ticket/12989] Remove unused "created_by.jpg" | Louis7777 | 2014-08-19 | 1 | -0/+0 |
|/ / | | | | | | | | | | | This image is not used anywhere in prosilver. PHPBB3-12989 | ||||
* | | Merge pull request #2886 from Oyabun1/ticket/12984 | Andreas Fischer | 2014-08-17 | 1 | -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 shown | Oyabun1 | 2014-08-17 | 1 | -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/12986 | Andreas Fischer | 2014-08-17 | 1 | -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 search | rxu | 2014-08-17 | 1 | -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/12975 | Andreas Fischer | 2014-08-16 | 2 | -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 Oauth | Tristan Darricau | 2014-08-12 | 2 | -2/+12 |
| |/ | | | | | | | PHPBB3-12975 | ||||
* | | Merge pull request #2876 from PayBas/ticket/12900 | Marc Alexander | 2014-08-14 | 3 | -1/+8 |
|\ \ | | | | | | | | | | [ticket/12900] Fix potential avatar size box overflow | ||||
| * | | [ticket/12900] Fix potential avatar size box overflow | PayBas | 2014-08-13 | 3 | -1/+8 |
| |/ | | | | | | | PHPBB3-12900 | ||||
* | | [ticket/12856] Remove images from assets/plupload/img/ | PayBas | 2014-08-13 | 3 | -0/+0 |
| | | | | | | | | PHPBB3-12856 | ||||
* | | [ticket/12856] Copy plupload images to prosilver dir | PayBas | 2014-08-13 | 4 | -3/+3 |
|/ | | | | PHPBB3-12856 | ||||
* | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development | Joas Schilling | 2014-08-12 | 2 | -2/+2 |
| | |||||
* | [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 | Joas Schilling | 2014-08-11 | 1 | -0/+122 |
| | |||||
* | [prep-release-3.1.0-RC3] Prepare Changelog | Joas Schilling | 2014-08-11 | 1 | -32/+35 |
| | |||||
* | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 | Joas Schilling | 2014-08-11 | 1 | -0/+35 |
| | |||||
* | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 | Joas Schilling | 2014-08-11 | 5 | -7/+7 |
| | |||||
* | [ticket/12970] Regenerate schema.json with new dependencies | Joas Schilling | 2014-08-11 | 1 | -14/+14 |
| | | | | PHPBB3-12970 | ||||
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵ | Nils Adermann | 2014-08-11 | 15 | -87/+129 |
|\ | | | | | | | | | | | | | | | | | 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] Add method for deleting avatars and use confirm_box | Marc Alexander | 2014-08-07 | 7 | -79/+124 |
| | | | | | | | | | | | | | | | | 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 boxes | Marc Alexander | 2014-08-07 | 9 | -8/+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/11854 | Marc Alexander | 2014-08-11 | 30 | -1221/+1254 |
|\ \ | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins | ||||
| * | | [ticket/11854] Don't override get service name in nogd | Tristan Darricau | 2014-08-11 | 2 | -9/+1 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Use a set_name method instead of overriding get_service_name | Tristan Darricau | 2014-08-11 | 6 | -27/+46 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Change the error message in reCaptcha | Tristan Darricau | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Fix comments | Tristan Darricau | 2014-08-11 | 1 | -4/+5 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Base the migration on rc2 | Tristan Darricau | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Fix the factory in \phpbb\auth\provider\db | Tristan Darricau | 2014-08-11 | 2 | -2/+13 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Remove unused globals | Tristan Darricau | 2014-08-11 | 1 | -12/+12 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Remove constants and use DI for QA tables | Tristan Darricau | 2014-08-11 | 2 | -36/+63 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Fix coding style | Tristan Darricau | 2014-08-11 | 3 | -812/+30 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Update the default captcha choosen during the installation | Tristan Darricau | 2014-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Rename captchas.plugins.service_collection service | Tristan Darricau | 2014-08-11 | 1 | -2/+2 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Rename captchas.factory service to captcha.factory | Tristan Darricau | 2014-08-11 | 9 | -10/+10 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Fix various comments | Tristan Darricau | 2014-08-11 | 2 | -3/+7 |
| | | | | | | | | | | | | PHPBB3-11854 | ||||
| * | | [ticket/11854] Split phpbb\captcha\gd.php | Tristan Darricau | 2014-08-11 | 2 | -0/+804 |
| | | | | | | | | | | | | PHPBB3-11854 |