aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-129-9/+12
| | | | PHPBB3-8041
* Merge remote-tracking branch 'rxu3/ticket/12260' into developJoas Schilling2014-03-111-8/+59
|\ | | | | | | | | * rxu3/ticket/12260: [ticket/12260] Add core events to delete_posts() function.
| * [ticket/12260] Add core events to delete_posts() function.rxu2014-03-111-8/+59
| | | | | | | | | | | | Events for extensions to perform additional actions on posts deletion. PHPBB3-12260
* | Merge branch 'develop-olympus' into developJoas Schilling2014-03-110-0/+0
|\ \ | | | | | | | | | * develop-olympus:
| * \ Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympusJoas Schilling2014-03-111-9/+70
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11271: [ticket/11271] Make path conversion more precise [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.
* | \ \ Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into developJoas Schilling2014-03-1110-10/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-272-2/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11271: [ticket/11271] Make path conversion more precise Conflicts: phpBB/feed.php
| | * | | [ticket/11271] Make path conversion more preciseDhruv2013-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| * | | | [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
| | * | | [ticket/11271] Add docblock of feed_generate_content( )Dhruv2013-12-271-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | [ticket/11271] Fix tabs and use !empty( ) instead of count( )Dhruv2013-12-271-13/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | [ticket/11271] Remove unnecessary inclusion of functions_displayDhruv2013-12-271-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | [ticket/11271] Typecast forum and topic id to integerDhruv2013-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | [ticket/11271] Use absolute path for displaying inline attachments in feedsDhruv2013-12-271-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | [ticket/11271] Changed executable bit.erangamapa2013-12-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed executable bit value from 755 to 644. PHPBB3-11271
| | * | | [ticket/11271] Formatting code and removing null assignment.erangamapa2013-12-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formatted code and replaced null assignment with empty array assignment to attachments parameter in method 'feed_generate_content'. PHPBB3-11271
| | * | | [ticket/11271] Removing unnecessary database objecterangamapa2013-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unnecessary global database object from 'feed_generate_content' Method. PHPBB3-11271
| | * | | [ticket/11271] Separated attachment fetching queryerangamapa2013-12-271-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed external query used to fetch related attachments. Added attachments fetching method with database query to post based feed. PHPBB3-11271
| | * | | [ticket/11271] Fetched feed attachments before loop.erangamapa2013-12-271-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetched feed attachments before looping through feed items and send them to method 'feed_generate_content' for each feed item. PHPBB3-11271
| | * | | [ticket/11271] Removed in-line attachment comments properly.erangamapa2013-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new regex to remove in-line attachment comments. PHPBB3-11271
| | * | | [ticket/11271] Displaying in-line attached images in ATOM feed.erangamapa2013-12-271-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In-line attached images are not displaying as they are not parsing. Included 'parse_attachments' column name for data fetching queries in feed.php. Checked weather feeds have in-line attachments and parsed them by using parse_attachments() method. PHPBB3-11271
| * | | | Merge branch 'develop' into ticket/11271-developDhruv2013-12-27602-5945/+13038
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-059-9/+63
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | | | | [ticket/11271] Typecast forum and topic id to integerDhruv2013-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | | | [ticket/11271] Use absolute path for displaying inline attachments in feedsDhruv2013-09-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11271
| | * | | | | [ticket/11271] Changed executable bit.erangamapa2013-09-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed executable bit value from 755 to 644. PHPBB3-11271
| | * | | | | [ticket/11271] Formatting code and removing null assignment.erangamapa2013-09-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formatted code and replaced null assignment with empty array assignment to attachments parameter in method 'feed_generate_content'. PHPBB3-11271
| | * | | | | [ticket/11271] Removing unnecessary database objecterangamapa2013-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unnecessary global database object from 'feed_generate_content' Method. PHPBB3-11271
| | * | | | | [ticket/11271] Separated attachment fetching queryerangamapa2013-09-151-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed external query used to fetch related attachments. Added attachments fetching method with database query to post based feed. PHPBB3-11271
| | * | | | | [ticket/11271] Fetched feed attachments before loop.erangamapa2013-09-151-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetched feed attachments before looping through feed items and send them to method 'feed_generate_content' for each feed item. PHPBB3-11271
| | * | | | | [ticket/11271] Removed in-line attachment comments properly.erangamapa2013-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new regex to remove in-line attachment comments. PHPBB3-11271
| | * | | | | [ticket/11271] Displaying in-line attached images in ATOM feed.erangamapa2013-09-151-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In-line attached images are not displaying as they are not parsing. Included 'parse_attachments' column name for data fetching queries in feed.php. Checked weather feeds have in-line attachments and parsed them by using parse_attachments() method. PHPBB3-11271
* | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-110-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11288] Handle +,- without preceeding whitespace characters
| * | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympusJoas Schilling2014-03-111-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11288: [ticket/11288] Handle +,- without preceeding whitespace characters
| | * | | | | | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2013-10-051-0/+6
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-11288
* | | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11288-develop' into developJoas Schilling2014-03-112-0/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11288-develop: [ticket/11288] Add unit test cases for foo-bar like queries [ticket/11288] Handle +,- without preceeding whitespace characters
| * | | | | | | [ticket/11288] Add unit test cases for foo-bar like queriesDhruv2014-03-091-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | foo-bar and foo -bar are interpreted differently by native search backend now. PHPBB3-11288
| * | | | | | | Merge branch 'ticket/11288' into ticket/11288-developDhruv2014-03-091-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11288: [ticket/11288] Handle +,- without preceeding whitespace characters
| | * | | | | | | [ticket/11288] Handle +,- without preceeding whitespace charactersDhruv2014-03-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11288
* | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-111-2/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12259] Reduce the size of our test matrix Conflicts: .travis.yml
| * | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into ↵Joas Schilling2014-03-111-2/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * EXreaction/ticket/12259-olympus: [ticket/12259] Reduce the size of our test matrix
| | * | | | | | | | [ticket/12259] Reduce the size of our test matrixNathan Guse2014-03-101-2/+7
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only test MariaDB or PostgreSQL once on PHP 5.4. This reduces our build matrix by 10 builds (over half). PHPBB3-12259
* | | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2014-03-101-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/12106] Combined first and second sentence [ticket/12106] Adds a explaination that admin/mods still able to use the board Conflicts: phpBB/language/en/acp/board.php
| * | | | | | | | Merge pull request #2105 from Crizz0/ticket/12106Nathan Guse2014-03-101-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ticket/12106] Adds a explaination that admin/mods still able to use the...
| | * | | | | | | | [ticket/12106] Combined first and second sentenceCrizzo2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12106
| | * | | | | | | | [ticket/12106] Adds a explaination that admin/mods still able to use the boardCrizzo2014-03-101-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12106
* | | | | | | | | Merge branch 'develop-olympus' into developNathan Guse2014-03-102-3/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] Adds language variables Conflicts: phpBB/includes/functions_module.php
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-06 05:05:16 +0000