aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-131-3/+4
|\ | | | | | | | | | | | | | | | | [ticket/8041] Merge item name into "Return to" string for better translations * nickvergessen/ticket/8041: [ticket/8041] Add space/tabs after => in array list [ticket/8041] Wrap forum name, topic title and pm folder name with quotes [ticket/8041] Merge item name into "Return to" string for better translations
| * [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| | | | | | | | PHPBB3-8041
| * [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-121-2/+3
| | | | | | | | PHPBB3-8041
* | Merge branch 'develop-olympus' into developJoas Schilling2014-03-131-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message. Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * \ Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-131-2/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12176: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message.
| | * | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-151-2/+7
| | | | | | | | | | | | | | | | PHPBB3-12176
* | | | Merge pull request #2104 from nickvergessen/ticket/12261Nathan Guse2014-03-121-2/+8
|\ \ \ \ | | | | | | | | | | [ticket/12261] Remove web root path from login redirect url
| * | | | [ticket/12261] Add a functional test for redirect after using login_box()Joas Schilling2014-03-101-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12261
| * | | | [ticket/12261] Remove web root path from login redirect urlJoas Schilling2014-03-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redirect url must be relative to the ucp.php and not relative to the current page. PHPBB3-12261
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-121-1/+1
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] using correct variable in includes/functions_module.php too [ticket/10549] changed "right" to "incorrect" Conflicts: phpBB/includes/functions_module.php
| * | | [ticket/10549] using correct variable in includes/functions_module.php tooCrizzo2014-03-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10549
| * | | 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 '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 developNathan Guse2014-03-101-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] Adds language variables Conflicts: phpBB/includes/functions_module.php
| * | | | | [ticket/10549] Adds language variablesCrizzo2014-03-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10549
| * | | | | [ticket/10945] Fix return values for split_keywords functionDhruv2014-03-081-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function now returns false if all the words are common words and true otherwise. PHPBB3-10945
| * | | | | [ticket/10945] Display search query when search fails in native searchDhruv2014-03-081-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If search fails and common words are present, split_keywords returns false and search.php file prints appropriate message of common words. If search fails and there are no common words, split_keywords returns true and keyword_search returns false so that the search query is displayed in search box. PHPBB3-10945
| * | | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is offJoas Schilling2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12205
| * | | | | [ticket/12210] dbtools::sql_create_table incorrectly throws errorNathaniel Guse2014-02-171-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | related to auto-increment length on non auto-increment fields PHPBB3-12210
* | | | | Merge pull request #2101 from nickvergessen/ticket/10763Nathan Guse2014-03-103-22/+26
|\ \ \ \ \ | | | | | | | | | | | | [ticket/10763] Do not call non-static functions statically
| * | | | | [ticket/10763] Do not call messenger::error() staticallyJoas Schilling2014-03-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763
| * | | | | [ticket/10763] Do not call non-static transfer() staticallyJoas Schilling2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763
| * | | | | [ticket/10763] Fix static calls to non static methods in colour_managerJoas Schilling2014-03-091-16/+16
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-10763
* | | | | Merge pull request #2092 from nickvergessen/ticket/12090Nathan Guse2014-03-101-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | [ticket/12090] Pass route name to url() instead of the url itself
| * | | | [ticket/12090] Split finding routes and returning routes into 2 methodsJoas Schilling2014-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12090
| * | | | [ticket/12090] Make provider a service and inject it into the helperJoas Schilling2014-03-081-4/+4
| | |_|/ | |/| | | | | | | | | | PHPBB3-12090
* | | | Merge pull request #2074 from Crizz0/ticket/12240Nathan Guse2014-03-081-0/+1
|\ \ \ \ | | | | | | | | | | Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support
| * | | | [ticket/12240] Added class code for custom bbcodes based on bbcode_tagCrizzo2014-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12240
* | | | | [ticket/12250] Remove deprecated phpbb_clean_path functionVarun Agrawal2014-03-071-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function phpbb_clean_path() in functions.php is deprecated and is replaced by filesystem class. Therefore, this function is moved to the functions_compatibility file. PHPBB3-12250
* | | | | [ticket/12250] Remove deprecated phpbb_clean_path functionVarun Agrawal2014-03-061-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function phpbb_clean_path() in functions.php is deprecated as is not used used 3.0/3.1 core PHPBB3-12250
* | | | | Merge pull request #2087 from marc1706/ticket/12239Nathan Guse2014-03-062-35/+35
|\ \ \ \ \ | |_|/ / / |/| | | | [ticket/12239] Move deprecated passwords functions to compatibility file
| * | | | [ticket/12239] Move deprecated passwords functions to compatibility fileMarc Alexander2014-03-062-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deprecated passwords functions are no longer used in the core and have been replaced with the passwords manager. Therefore, the functions are moved to the functions_compatibility file. PHPBB3-12239
* | | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-054-12/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
* | | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-054-10/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12237
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-056-49/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-044-10/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187
| * | | | [ticket/12187] Remove user_website fieldJoas Schilling2014-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-034-15/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12187] Convert website field data to custom profile fieldJoas Schilling2014-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-284-14/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12234
| * | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-282-7/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages PHPBB3-12233
* | | | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-242-4/+4
|/ / / | | | | | | | | | PHPBB3-12226
* | | Merge pull request #2035 from prototech/ticket/12138Nathan Guse2014-02-201-62/+130
|\ \ \ | | | | | | | | [ticket/12138] Include file time limit when generating attachment management pagination and stats.
| * | | [ticket/12138] Replace old code and generate pagination using filetime limit.Cesar G2014-02-161-60/+22
| | | | | | | | | | | | | | | | PHPBB3-12138
| * | | [ticket/12138] Add methods for attachment manage functionality.Cesar G2014-02-161-2/+108
| | | | | | | | | | | | | | | | PHPBB3-12138
* | | | Merge pull request #2025 from marc1706/ticket/12183Nathan Guse2014-02-201-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/12183] Update user_newpasswd column in users table for passwords manager
| * | | | [ticket/12183] Move user_newpasswd, user_actkey below user_pass_convertMarc Alexander2014-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12183
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:19:45 +0000