aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [ticket/11429] Increment asset version on Ext enableMatt Friedman2014-03-131-0/+5
| |/ | | | | | | PHPBB3-11429
* | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-141-0/+271
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/9871-2: [ticket/9871] Can set current version to use instead of the phpBB version [ticket/9871] Fix indentation on comment [ticket/9871] Fix test name [ticket/9871] Split fast and slow version tests [ticket/9871] Option to force the stability when checking for updates [ticket/9871] Allow setting the host/file to load for the version class [ticket/9871] Restore get_remote_file_test [ticket/9871] Fix tests [ticket/9871] Typehint and comment on var types [ticket/9871] Mark test as slow [ticket/9871] Restore phpbb_version_compare [ticket/9871] Restore get_remote_file [ticket/9871] Use $request->variable instead of request_var [ticket/9871] Update version check file to use json format
| * | [ticket/9871] Can set current version to use instead of the phpBB versionNathan Guse2014-03-141-3/+23
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Option to force the stability when checking for updatesNathan Guse2014-03-111-1/+31
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Allow setting the host/file to load for the version classNathan Guse2014-03-101-3/+44
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Typehint and comment on var typesNathan Guse2014-03-051-1/+6
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Restore phpbb_version_compareNathan Guse2014-03-051-11/+1
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Restore get_remote_fileNathan Guse2014-03-051-71/+7
| | | | | | | | | | | | PHPBB3-9871
| * | [ticket/9871] Update version check file to use json formatNathan Guse2014-02-191-0/+249
| | | | | | | | | | | | PHPBB3-9871
* | | Merge remote-tracking branch 'dhruv/ticket/11040' into developJoas Schilling2014-03-142-14/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruv/ticket/11040: [ticket/11040] Topic is deleted if test is skipped [ticket/11040] Use unique text for the test post added [ticket/11040] Use hard delete in delete_topic [ticket/11040] Add migration to drop postgres search indexes [ticket/11040] Delete the functional test topic to avoid conflicts [ticket/11040] Add methods to delete post and topic in functional tests [ticket/11040] Swap post_text and post_subject for post_content index [ticket/11040] Add test cases for searching subject and post content together [ticket/11040] Remove postgres extra indexes [ticket/11040] Add post_content index [ticket/11040] Search subject and text together
| * | | [ticket/11040] Add migration to drop postgres search indexesDhruv2014-03-121-0/+47
| | | | | | | | | | | | | | | | PHPBB3-11040
| * | | [ticket/11040] Swap post_text and post_subject for post_content indexDhruv2014-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Provides better performance as per PostgreSQL Docs. PHPBB3-11040
| * | | [ticket/11040] Remove postgres extra indexesDhruv2014-03-121-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove post_text index as post_content index is sufficient to search post text. PHPBB3-11040
| * | | [ticket/11040] Add post_content indexDhruv2014-03-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to post_subject and post_title indexes add a post_content which is concatenation of both the columns. PHPBB3-11040
| * | | [ticket/11040] Search subject and text togetherDhruv2014-03-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of searching for post_subject and post_text seperately and then OR them in where clause we use concatenation of the two columns and search PHPBB3-11040
* | | | [ticket/12263] Add missing variable names to docblock fixesMatt Friedman2014-03-132-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12263
* | | | [ticket/12263] Remove invalid SQL query and unused variablesMatt Friedman2014-03-131-13/+1
| | | | | | | | | | | | | | | | PHPBB3-12263
* | | | [ticket/12263] Remove unused argument in module add/removeMatt Friedman2014-03-131-5/+3
| | | | | | | | | | | | | | | | PHPBB3-12263
* | | | [ticket/12263] Fix incorrect docblock commetsMatt Friedman2014-03-132-4/+4
| |_|/ |/| | | | | | | | PHPBB3-12263
* | | Merge remote-tracking branch 'EXreaction/ticket/11716' into developJoas Schilling2014-03-122-0/+190
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11716: [ticket/11716] Correct license URL [ticket/11716] Fix dependencies in migration files [ticket/11716] Rename migration files and add note that it's converting a MOD [ticket/11716] Convert Soft Delete Mod to post/topic visibility
| * | | [ticket/11716] Correct license URLNathan Guse2014-03-112-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11716
| * | | [ticket/11716] Fix dependencies in migration filesNathan Guse2014-03-112-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11716
| * | | [ticket/11716] Rename migration files and add note that it's converting a MODNathan Guse2014-02-032-2/+6
| | | | | | | | | | | | | | | | PHPBB3-11716
| * | | [ticket/11716] Convert Soft Delete Mod to post/topic visibilityNathan Guse2014-02-032-0/+186
| | | | | | | | | | | | | | | | PHPBB3-11716
* | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into developJoas Schilling2014-03-118-9/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11271-develop: (25 commits) [ticket/11271] Make path conversion more precise [ticket/11271] limit absolute path conversion to attachment links only [ticket/11271] Add docblock of feed_generate_content( ) [ticket/11271] Fix tabs and use !empty( ) instead of count( ) [ticket/11271] Remove unnecessary inclusion of functions_display [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. [ticket/11271] Removing unnecessary database object [ticket/11271] Separated attachment fetching query [ticket/11271] Fetched feed attachments before loop. [ticket/11271] Removed in-line attachment comments properly. [ticket/11271] Displaying in-line attached images in ATOM feed. [ticket/11271] Add the inline images html to content [ticket/11271] Use class variable $db instead of global [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. ...
| * | | | Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-12-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11271: [ticket/11271] Make path conversion more precise Conflicts: phpBB/feed.php
| * | | | [ticket/11271] limit absolute path conversion to attachment links onlyDhruv2013-12-271-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| * | | | Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-12-272-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11271: [ticket/11271] Add docblock of feed_generate_content( ) [ticket/11271] Fix tabs and use !empty( ) instead of count( ) [ticket/11271] Remove unnecessary inclusion of functions_display [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. [ticket/11271] Removing unnecessary database object [ticket/11271] Separated attachment fetching query [ticket/11271] Fetched feed attachments before loop. [ticket/11271] Removed in-line attachment comments properly. [ticket/11271] Displaying in-line attached images in ATOM feed. Conflicts: phpBB/feed.php
| * | | | Merge branch 'develop' into ticket/11271-developDhruv2013-12-27226-2001/+2950
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin (148) and others # Via Joas Schilling (50) and others * develop: (635 commits) [ticket/12079] Add default value to $multibyte in request.untrimmed_variable(). [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class [ticket/12060] A little less verbose cleanup of event docblocks [ticket/12060] Further clarifying new event docblocks as much as possible [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event [ticket/12060] Remove whitespaces [ticket/12060] Fix docblock for acp_bbcodes_modify_create event ...
| * | | | | [ticket/11271] Add the inline images html to contentDhruv2013-12-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| * | | | | [ticket/11271] Use class variable $db instead of globalDhruv2013-12-251-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| * | | | | Merge branch 'ticket/11271' into ticket/11271-developDhruv2013-10-058-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By erangamapa (7) and Dhruv (2) * ticket/11271: [ticket/11271] Typecast forum and topic id to integer [ticket/11271] Use absolute path for displaying inline attachments in feeds [ticket/11271] Changed executable bit. [ticket/11271] Formatting code and removing null assignment. [ticket/11271] Removing unnecessary database object [ticket/11271] Separated attachment fetching query [ticket/11271] Fetched feed attachments before loop. [ticket/11271] Removed in-line attachment comments properly. [ticket/11271] Displaying in-line attached images in ATOM feed. Conflicts: phpBB/feed.php
* | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11288-develop' into developJoas Schilling2014-03-111-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11288-develop: [ticket/11288] Add unit test cases for foo-bar like queries [ticket/11288] Handle +,- without preceeding whitespace characters
| * | | | | | Merge branch 'ticket/11288' into ticket/11288-developDhruv2014-03-091-0/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/11288: [ticket/11288] Handle +,- without preceeding whitespace characters
* | | | | | Merge pull request #2107 from VSEphpbb/ticket/12117Nathan Guse2014-03-101-0/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12117] Add get_all_tree_data method to tree class
| * | | | | | [ticket/12117] Select all fields instead of item_basic_dataMatt Friedman2014-03-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12117
| * | | | | | [ticket/12117] Add get_all_tree_data method to tree classMatt Friedman2014-03-101-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12117
* | | | | | | Merge pull request #2101 from nickvergessen/ticket/10763Nathan Guse2014-03-101-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/10763] Do not call non-static functions statically
| * | | | | | | [ticket/10763] Do not call set_post_visibility() staticallyJoas Schilling2014-03-091-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-10763
* | | | | | | Merge pull request #2092 from nickvergessen/ticket/12090Nathan Guse2014-03-103-40/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12090] Pass route name to url() instead of the url itself
| * | | | | | | [ticket/12090] Move find() call to container and fix testsJoas Schilling2014-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | [ticket/12090] Split finding routes and returning routes into 2 methodsJoas Schilling2014-03-092-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | [ticket/12090] Fix parameter list of controller helper constructorJoas Schilling2014-03-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-082-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | | | | [ticket/12090] Fix pagination for routesJoas Schilling2014-03-081-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No clickable "jump to" at the moment, as we can not get the route url by the route name in js yet. Need to find another solution later. PHPBB3-12090
| * | | | | | | [ticket/12090] Pass route name to url() to allow admins to change the routesJoas Schilling2014-03-071-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12090
* | | | | | | | Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-103-0/+34
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu3/ticket/12224: [ticket/12224] Add assign_block_vars_array() test. [ticket/12224] Add template wrapper method to assign block arrays
| * | | | | | | [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add one more wrapper template method for the function assign_block_vars() which takes a 2-dimensional array as a parameter and calls assign_block_vars() in a loop to assign the whole block loop at once. This can make the core a little bit more expendable from the point of developing extensions as it allows to pass the data to events before it's being assigned to template. PHPBB3-12224
* | | | | | | | Merge pull request #2089 from nickvergessen/ticket/12251Nathan Guse2014-03-097-18/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12251] Clean up and Enhancement of Custom Profile Fields
| * | | | | | | | [ticket/12251] Remove leading whitespace on doc blocksJoas Schilling2014-03-096-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251