aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympusJoas Schilling2014-03-242-3/+3
|\ | | | | | | | | * schosser/ticket/10174: [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
| * [ticket/10174] Rename "Ban usernames" to "Ban users" in ACPDaniel Schosser2014-03-232-3/+3
| | | | | | | | | | | | | | Changing the language string from "Ban usernames" to "Ban users" to clarify its use. It bans users by their name and not the username itself PHPBB3-10174
* | Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympusJoas Schilling2014-03-222-1/+2
|\ \ | | | | | | | | | | | | | | | | | | * geetakshi/ticket/12035: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page
| * | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | | | | | PHPBB3-12035
| * | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-202-2/+2
| | | | | | | | | | | | PHPBB3-12035
| * | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-172-1/+2
| |/ | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
* | [ticket/11766] Hide edit, quote and delete buttons if topic is lockedOliver Schramm2014-03-191-1/+7
|/ | | | | | But show quote button to guests if topic isn't locked PHPBB3-11766
* Merge remote-tracking branch 'Elsensee/ticket/12072' into develop-olympusJoas Schilling2014-03-141-1/+1
|\ | | | | | | | | * Elsensee/ticket/12072: [ticket/12072] Fix comment about NEW MEMBERS permission
| * [ticket/12072] Fix comment about NEW MEMBERS permissionOliver Schramm2014-03-141-1/+1
| | | | | | | | PHPBB3-12072
* | Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympusJoas Schilling2014-03-141-2/+4
|\ \ | | | | | | | | | | | | | | | * marcosbc/ticket/12247: [ticket/12247] Makes static usernames work [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
| * | [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| * | [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| |/ | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympusJoas Schilling2014-03-143-5/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | * exreaction/ticket/12202: [ticket/12202] Use an array in the data provider instead of exploding manually [ticket/12202] Can't call htmlspecialchars before checking for quotes [ticket/12202] Fix tests [ticket/12202] Test for parse_cfg_file [ticket/12202] Use copyright symbol in style.cfg files [ticket/12202] Apply htmlspecialchars to style.cfg data
| * [ticket/12202] Can't call htmlspecialchars before checking for quotesNathaniel Guse2014-03-091-1/+5
| | | | | | | | PHPBB3-12202
| * [ticket/12202] Use copyright symbol in style.cfg filesNathan Guse2014-03-092-3/+3
| | | | | | | | PHPBB3-12202
| * [ticket/12202] Apply htmlspecialchars to style.cfg dataNathan Guse2014-03-091-3/+3
| | | | | | | | PHPBB3-12202
* | Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-132-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | * 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-152-2/+8
| | | | | | | | | | | | PHPBB3-12176
* | | [ticket/10549] using correct variable in includes/functions_module.php tooCrizzo2014-03-111-1/+1
| | | | | | | | | | | | PHPBB3-10549
* | | [ticket/10549] changed "right" to "incorrect"Crizzo2014-03-111-1/+1
| | | | | | | | | | | | PHPBB3-10549
* | | 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.
| * | | [ticket/11271] Make path conversion more preciseDhruv2013-12-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11271
| * | | [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 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 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
* | | | | [ticket/10549] Adds language variablesCrizzo2014-03-102-3/+6
|/ / / / | | | | | | | | | | | | 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/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
* | | | [ticket/12205] Do not display 0 for empty integers when show_novalue is offJoas Schilling2014-02-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12205
* | | | Merge remote-tracking branch 'remotes/prototech/ticket/12093' into ↵Nathan Guse2014-02-193-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/prototech/ticket/12093: [ticket/12093] Check that document.selection is supported.
| * | | | [ticket/12093] Check that document.selection is supported.Cesar G2014-01-253-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12093
* | | | | [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
* | | | [ticket/12146] Added a missing # to inline css-style of <span>Crizz02014-02-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12146
* | | | [ticket/12119] Remove meta tags from view-print templatesMarcus Vinicius2014-01-272-4/+0
| | | | | | | | | | | | | | | | PHPBB3-12119
* | | | [ticket/12118] Add noindex meta tag to subsilver2 view-print templatesMarcus Vinicius2014-01-262-0/+2
|/ / / | | | | | | | | | PHPBB3-12118