aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11230] Update cache driver dock blocksMatt Friedman2014-03-223-0/+32
| | | | PHPBB3-12230
* [ticket/11230] Use inheritdoc in docblocks in cache driversMatt Friedman2014-03-199-73/+55
| | | | | | http://tracker.phpbb.com/browse/PHPBB3-11230 PHPBB3-11230
* Merge remote-tracking branch 'vsephpbb/ticket/12285' into developJoas Schilling2014-03-191-2/+4
|\ | | | | | | | | * vsephpbb/ticket/12285: [ticket/12285] Fix mult-lingual issues between extensions
| * [ticket/12285] Fix mult-lingual issues between extensionsMatt Friedman2014-03-191-2/+4
| | | | | | | | PHPBB3-12285
* | Merge remote-tracking branch 'Elsensee/ticket/11169' into developJoas Schilling2014-03-192-1/+78
|\ \ | | | | | | | | | | | | | | | * Elsensee/ticket/11169: [ticket/11169] Skip migration if "Users" category has been deleted [ticket/11169] Move module 'prune users' to users category
| * | [ticket/11169] Skip migration if "Users" category has been deletedOliver Schramm2014-03-191-1/+3
| | | | | | | | | | | | | | | | | | or the module has already been moved to that category PHPBB3-11169
| * | [ticket/11169] Move module 'prune users' to users categoryOliver Schramm2014-03-162-1/+76
| | | | | | | | | | | | PHPBB3-11169
* | | Merge pull request #2145 from Elsensee/ticket/10590Dhruv Goel2014-03-202-19/+13
|\ \ \ | | | | | | | | [ticket/10590] Remove confirmation page after posting
| * \ \ Merge branch 'nickvergessen/ticket/elsensee/10590' into ticket/10590Oliver Schramm2014-03-181-10/+10
| |\ \ \
| | * | | [ticket/10590] Fix functional tests are post confirm message removalJoas Schilling2014-03-181-10/+10
| |/ / / | | | | | | | | | | | | PHPBB3-10590
| * | | [ticket/10590] Remove confirmation page after postingOliver Schramm2014-03-161-9/+3
| | | | | | | | | | | | | | | | PHPBB3-10590
* | | | Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into ↵Joas Schilling2014-03-191-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * netdeamon/ticket/12198-Language-issue: [ticket/12198] Language issue in en/common.php
| * | | | [ticket/12198] Language issue in en/common.phpnetdeamon2014-03-181-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | Deleted lines as they are not needed anymore. PHPBB3-12198
* | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-191-1/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11766] Hide edit, quote and delete buttons if topic is locked Conflicts: phpBB/viewtopic.php
| * | | Merge remote-tracking branch 'Elsensee/ticket/11766' into develop-olympusJoas Schilling2014-03-191-1/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11766: [ticket/11766] Hide edit, quote and delete buttons if topic is locked
| | * | | [ticket/11766] Hide edit, quote and delete buttons if topic is lockedOliver Schramm2014-03-191-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | But show quote button to guests if topic isn't locked PHPBB3-11766
* | | | Merge remote-tracking branch 'prototech/ticket/12160' into developJoas Schilling2014-03-184-36/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12160: [ticket/12160] Use phpbb_check_installation_exists() in the other modules. [ticket/12160] Move phpbb_check_installation_exists() to functions_install.php [ticket/12160] Check if phpBB is installed before creating phpBB container. [ticket/12160] Add function to check if phpBB is installed.
| * | | | [ticket/12160] Use phpbb_check_installation_exists() in the other modules.Cesar G2014-02-222-17/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | [ticket/12160] Move phpbb_check_installation_exists() to functions_install.phpCesar G2014-02-222-19/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | [ticket/12160] Check if phpBB is installed before creating phpBB container.Cesar G2014-02-151-19/+49
| | | | | | | | | | | | | | | | | | | | PHPBB3-12160
| * | | | [ticket/12160] Add function to check if phpBB is installed.Cesar G2014-02-151-0/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-12160
* | | | | Merge remote-tracking branch 'rxu3/ticket/12278' into developJoas Schilling2014-03-181-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12278: [ticket/12278] Add mcp.php core event to allow to modify modules display option
| * | | | | [ticket/12278] Add mcp.php core event to allow to modify modules display optionrxu2014-03-171-0/+17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event allows extensions to set display option for custom MCP modules for extensions which add custom MCP modules and some of them should be displayed conditionally. PHPBB3-12278
* | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12284' into developAndreas Fischer2014-03-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12284: [ticket/12284] Fix functional test for extension manager changes
| * | | | | [ticket/12284] Fix functional test for extension manager changesMatt Friedman2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12284
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12284' into developAndreas Fischer2014-03-171-6/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12284: [ticket/12284] Improve readability of extension manager details
| * | | | | [ticket/12284] Improve readability of extension manager detailsMatt Friedman2014-03-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use span tags like the rest of the ACP does, instead of P tags. There is no semantic need to use P tags here. These are not paragraphs. PHPBB3-12284
* | | | | | Merge remote-tracking branch 'rxu3/ticket/12279' into developJoas Schilling2014-03-173-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12279: [ticket/12279] Add memberlist_view.html template event to add custom info
| * | | | | | [ticket/12279] Add memberlist_view.html template event to add custom inforxu2014-03-173-0/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template event to ddd custom content to the user profile view after the main content. PHPBB3-12279
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/7580' into developJoas Schilling2014-03-172-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/7580: [ticket/7580] Add test for IF {VAR} is defined in templates
| * | | | | | [ticket/7580] Add test for IF {VAR} is defined in templatesMatt Friedman2014-03-162-0/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-7580 This test demonstrates that is possible to test if a variable exists and then use it if it does, similar to using isset(), but in template/twig syntax. <!— IF {VAR} is defined —>{VAR}<!— ENDIF —> PHPBB3-7580
* | | | | | Merge remote-tracking branch 'dragooon/ticket/9040' into developJoas Schilling2014-03-172-1/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dragooon/ticket/9040: [ticket/9040] Minor cleanup in the unit test file [ticket/9040] Count HTML entities as single in custom profile fields
| * | | | | | [ticket/9040] Minor cleanup in the unit test fileShitiz Garg2014-03-171-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9040
| * | | | | | [ticket/9040] Count HTML entities as single in custom profile fieldsShitiz Garg2014-03-172-1/+118
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when an user adds a HTML entity to a custom profile field, the length gets incremented by 4 since the code reads &gt; instead of <. However, the length is presentational and not DB storage so it should be treated as a single character even if it takes four lengths in the DB by being stored as a HTML entity. Work around this by decoding html entities before counting. Also, added unit tests for string field type PHPBB3-9040
* | | | | | Merge branch 'ticket/12269' of github.com:netdeamon/phpbb into developJoas Schilling2014-03-171-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By netdeamon # Via netdeamon * 'ticket/12269' of github.com:netdeamon/phpbb: [ticket/12269] Delete folder mods in language
| * | | | | [ticket/12269] Delete folder mods in languagenetdeamon2014-03-171-0/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Deleted mods folder in phpbb/language/en/. PHPBB3-12269
* | | | | Merge branch 'ticket/11239' of github.com:geetakshi/phpbb into developJoas Schilling2014-03-161-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By geetakshi # Via geetakshi * 'ticket/11239' of github.com:geetakshi/phpbb: [ticket/11239] Removing hard-coded, language specific possessive [ticket/11239] Including username before Overview title
| * | | | | [ticket/11239] Removing hard-coded, language specific possessivegeetakshi2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11239
| * | | | | [ticket/11239] Including username before Overview titlegeetakshi2014-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding username to the page title to avoid confusion while managing multiple users in ACP PHPBB3-11239
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12274' into developJoas Schilling2014-03-162-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12274: [ticket/12274] Add core.js to the install footer [ticket/12274] Fix broke/missing jQuery asset paths in update script [ticket/12274] Load correct T_TEMPLATE_PATH during update
| * | | | | | [ticket/12274] Add core.js to the install footerMatt Friedman2014-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required so phpbb var is defined, as it is used in admin.js. PHPBB3-12274
| * | | | | | [ticket/12274] Fix broke/missing jQuery asset paths in update scriptMatt Friedman2014-03-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12274
| * | | | | | [ticket/12274] Load correct T_TEMPLATE_PATH during updateMatt Friedman2014-03-151-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12274
* | | | | | Merge pull request #2136 from Elsensee/ticket/11071Nathan Guse2014-03-161-0/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ticket/11071] Add fallback if requested style don't exist
| * | | | | [ticket/11071] Add fallback if requested style don't existOliver Schramm2014-03-151-0/+13
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-11071
* | | | | Merge pull request #2144 from nickvergessen/travis/disable-redisNathan Guse2014-03-161-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | [travis/disable-redis] Disable redis on travis until its fixed again
| * | | | [ticket/12281] Disable redis on travis until its fixed againJoas Schilling2014-03-161-2/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /home/travis/build/phpbb/phpbb/redis/redis.c:6141:34: error: unknown type name ‘tsrm_ls’ make: *** [redis.lo] Error 1 The command "sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/setup-php-extensions.sh; fi"" failed and exited with 2 during install. PHPBB3-12281
* | | | Merge branch 'prep-release-3.1.0-b1' into developJoas Schilling2014-03-158-34/+215
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.0-b1: [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1 [prep-release-3.1.0-b1] Prepare Changelog [prep-release-3.1.0-b1] Add migration for 3.1.0-b1 [prep-release-3.1.0-b1] Update version to 3.1.0-b1
| * | | | [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-devJoas Schilling2014-03-153-5/+5
| | | | |
| * | | | [prep-release-3.1.0-b1] Add changelog for 3.1.0-b1Joas Schilling2014-03-151-0/+145
| | | | |
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 02:42:54 +0000