aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10945] Remove mark test incomplete for mysql and postgresDhruv2014-03-082-8/+0
| | | | PHPBB3-10945
* Merge branch 'ticket/10945' into ticket/10945-developDhruv2014-03-082-29/+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/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/10945] remove trigger_error callDhruv Goel2014-03-081-6/+0
| | | | | | | | | | | | | | | | removes trigger_error call incase no search results are found or start variable exceeds the amount. So that search query is displayed in the search box even if no results are returned. PHPBB3-10945
* | Merge remote-tracking branch 'VarunAgw/ticket/12250' into developDhruv2014-03-082-40/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | # By Varun Agrawal # Via Varun Agrawal * VarunAgw/ticket/12250: [ticket/12250] Remove deprecated phpbb_clean_path function [ticket/12250] Remove deprecated phpbb_clean_path function
| * | [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 remote-tracking branch 'VSEphpbb/ticket/12248' into developAndreas Fischer2014-03-061-9/+9
|\ \ \ | |/ / |/| | | | | | | | * VSEphpbb/ticket/12248: [ticket/12248] Restore id attributes to extension details (used by tests)
| * | [ticket/12248] Restore id attributes to extension details (used by tests)Matt Friedman2014-03-061-9/+9
| | | | | | | | | | | | PHPBB3-12248
* | | Merge pull request #2087 from marc1706/ticket/12239Nathan Guse2014-03-063-36/+36
|\ \ \ | | | | | | | | [ticket/12239] Move deprecated passwords functions to compatibility file
| * | | [ticket/12239] Move deprecated passwords functions to compatibility fileMarc Alexander2014-03-063-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #2088 from nickvergessen/ticket/12236Nathan Guse2014-03-0543-243/+289
|\ \ \ \ | | | | | | | | | | Ticket/12236 Convert AOL and Yahoo to custom profile fields
| * | | | [ticket/12236] Fix language key name for Yahoo MessangerJoas Schilling2014-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | [ticket/12236] Change order of profile fields for new installsJoas Schilling2014-03-051-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | [ticket/12249] Fix "Undefined variable: row" when editing profileJoas Schilling2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12249
| * | | | [ticket/12236] Fix layout of memberlist searchJoas Schilling2014-03-052-34/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-0540-134/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | [ticket/12237] Regenerate db schema filesJoas Schilling2014-03-057-14/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-12237
| * | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-0530-69/+119
| |/ / / | | | | | | | | | | | | PHPBB3-12237
* | | | Merge pull request #2054 from rxu/ticket/12213-1Nathan Guse2014-03-051-4/+4
|\ \ \ \ | | | | | | | | | | [ticket/12213] Add MCP events for custom quick moderation options
| * | | | [ticket/12213] Add MCP events for custom quick moderation optionsrxu2014-02-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addition to PR #2045 - rename the flag variable to more sensible one. PHPBB3-12213
* | | | | 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 #2061 from rxu/ticket/12231Nathan Guse2014-03-053-0/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12231] Add template events to forumlist_body.html
| * | | | | | [ticket/12231] Add template events to forumlist_body.htmlrxu2014-03-033-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add events before/after category header, before/after subforums list to allow add/modify content in respective places. PHPBB3-12231
* | | | | | | 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 pull request #2080 from nickvergessen/ticket/12243Nathan Guse2014-03-058-63/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [Ticket/12243] subsilver2 is missing profile field files
| * | | | | | | | [ticket/12243] Remove outdated adm/style/custom_profile_fields.htmlJoas Schilling2014-03-031-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12243
| * | | | | | | | [ticket/12243] Split custom_profile_fields.html into 1 file for each typeJoas Schilling2014-03-037-31/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12243
* | | | | | | | | Merge pull request #2086 from VSEphpbb/ticket/12248Nathan Guse2014-03-055-31/+31
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | [ticket/12248] Make extension details homepage a clickable link
| * | | | | | | [ticket/12248] Remove unused label for attributes and related id tagsMatt Friedman2014-03-051-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | | | | [ticket/12248] Use id instead of name attribute in a tagsMatt Friedman2014-03-055-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | | | | [ticket/12248] Fix meta_author tags (IDs must be unique)Matt Friedman2014-03-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | | | | [ticket/12248] Remove p tag in favor of strong tagMatt Friedman2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | | | | [ticket/12248] Make extension details homepage a clickable linkMatt Friedman2014-03-041-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12248 PHPBB3-12248
* | | | | | | [develop] Fix incorrect merge conflict resolution from PR #2085Nils Adermann2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12235
* | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-0566-528/+758
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0434-239/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | | | | [ticket/12187] Do not make clickable when using as contact fieldJoas Schilling2014-03-046-28/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | | [ticket/12187] Split generate_profile_fields_template() into 2 methodsJoas Schilling2014-03-044-104/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the mode switch that wraps the content of the method PHPBB3-12187
| * | | | | | | [ticket/12187] Remove user_website fieldJoas Schilling2014-03-049-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-0329-86/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | | [ticket/12187] Convert website field data to custom profile fieldJoas Schilling2014-03-0310-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-039-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-2840-117/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12234
| * | | | | | | [ticket/12233] Update schema fileJoas Schilling2014-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12233
| * | | | | | | [ticket/12233] Add images back to subsilver2Joas Schilling2014-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12233
| * | | | | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-2818-13/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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