aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | [ticket/12251] Add string validation for a-zA-Z0-9 and underscoreJoas Schilling2014-03-061-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12251
| * | | | | | | [ticket/12251] Load profile fields by default on posts, pms and memberlistJoas Schilling2014-03-061-0/+30
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12251
* | | | | | | Merge pull request #2099 from bantu/ticket/12256Nathan Guse2014-03-091-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | [ticket/12256] Selecting founders is fetching $sql instead of $result
| * | | | | | [ticket/12256] Selecting founders is fetching $sql instead of $resultForumhulp.com2014-03-091-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12256
* | | | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into ↵Nathan Guse2014-03-091-23/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * remotes/dhruvgoel92/ticket/10945-develop: [ticket/10945] Remove mark test incomplete for native search backend [ticket/10945] Fix Unit Tests as per new changes to split_keywords [ticket/10945] Remove mark test incomplete for mysql and postgres [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call
| * | | | | | Merge branch 'ticket/10945' into ticket/10945-developDhruv2014-03-081-23/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10945: [ticket/10945] Fix return values for split_keywords function [ticket/10945] Display search query when search fails in native search [ticket/10945] remove trigger_error call Conflicts: phpBB/phpbb/search/fulltext_native.php
* | | | | | [ticket/11938] Fix whitespace charactersDhruv2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11938
* | | | | | [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinalDhruv2014-03-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11938
* | | | | Merge pull request #2088 from nickvergessen/ticket/12236Nathan Guse2014-03-055-1/+197
|\ \ \ \ \ | | | | | | | | | | | | Ticket/12236 Convert AOL and Yahoo to custom profile fields
| * | | | | [ticket/12249] Fix "Undefined variable: row" when editing profileJoas Schilling2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12249
| * | | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-052-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-052-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12237
* | | | | | Merge pull request #2058 from nickvergessen/ticket/12216Nathan Guse2014-03-051-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12216] Undefined index: lang_options when creating date profile field
| * | | | | | [ticket/12216] Undefined index: lang_options when creating date profile fieldJoas Schilling2014-02-241-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12216
* | | | | | Merge pull request #2075 from Elsensee/ticket/11693Nathan Guse2014-03-051-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ticket/11693] Change sql_build_array to support DELETE
| * | | | | [ticket/11693] Change sql_build_array to support DELETEOliver Schramm2014-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11693
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-0514-77/+550
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
| * | | | | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-042-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | | [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-045-27/+53
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 23:18:26 +0000