aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'rechosen/ticket/11116' into developAndreas Fischer2013-04-111-2/+2
|\ | | | | | | | | * rechosen/ticket/11116: [ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
| * [ticket/11116] Made ACP "extension not available" error message E_USER_WARNINGrechosen2013-04-111-2/+2
| | | | | | | | | | | | | | | | | | The error message generated when an administrator tries to enable an incompatible extension used to be displayed in the green of the default E_USER_NOTICE. Changed it to E_USER_WARNING to make it appear in red, as requested in the ticket. PHPBB3-11116
* | [ticket/11492] Initialize $user_ids and $group_users arraysJoas Schilling2013-04-111-3/+5
|/ | | | | | Also avoid unneccessary calls to permissions when user_ids is empty PHPBB3-11492
* Merge pull request #1312 from VSEphpbb/ticket/11463Nils Adermann2013-04-041-1/+1
|\ | | | | [ticket/11463] Add title attribute to topics in search results
| * [ticket/11463] Add title attribute to topics in search resultsMatt Friedman2013-03-201-1/+1
| | | | | | | | | | | | | | | | We use this title attribute in viewforum_body.html, but not in search_results.html. Perhaps we should, as this will maintain consitency between all these topic view pages. PHPBB3-11463
* | Merge pull request #1199 from imkingdavid/ticket/11334Nils Adermann2013-04-031-8/+30
|\ \ | | | | | | [ticket/11334] Properly generate controller URL with helper url() method
| * | [ticket/11334] Allow parameters to be specified in the routeJoas Schilling2013-03-151-1/+8
| | | | | | | | | | | | PHPBB3-11334
| * | [ticket/11334] Use mocks instead of making parameters optionalJoas Schilling2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11334
| * | [ticket/11334] Expand functionality of helper->url()Joas Schilling2013-03-151-3/+21
| | | | | | | | | | | | | | | | | | | | | Expanded the functionality of helper->url() to support all parameters of append_sid() itself. PHPBB3-11334
| * | [ticket/11334] Remove extraneous periodDavid King2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11334
| * | [ticket/11334] Make url helper method publicDavid King2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11334
| * | [ticket/11334] Add a test for the controller helper URL methodDavid King2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11334
| * | [ticket/11334] Properly generate controller URL until paths issue gets fixedDavid King2013-03-151-8/+5
| | | | | | | | | | | | PHPBB3-11334
* | | Merge pull request #1323 from t-backoff/ticket/11477Nils Adermann2013-03-315-1/+28
|\ \ \ | | | | | | | | Ticket/11477
| * | | Changing effectively_installed function to check if the config var is set.Tabitha Backoff2013-03-311-1/+1
| | | |
| * | | Migration file and change board_home_text to board_index_textTabitha Backoff2013-03-286-7/+28
| | | |
| * | | Ticket# 11477 - Allow customisation of "Board index"Tabitha Backoff2013-03-285-1/+7
| | | |
* | | | Merge pull request #1316 from nickvergessen/ticket/11405Nils Adermann2013-03-315-4/+35
|\ \ \ \ | | | | | | | | | | Ticket/11405 Users that are subscribed to a forum, should receive notifications for new replies
| * | | | [ticket/11474] Clarify comment with "global" and forum_id = 0Joas Schilling2013-03-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forum ID 0 in permission checks, checks the global moderator permission. PHPBB3-11405 PHPBB3-11474
| * | | | [ticket/11474] Check read permission before sending *_in_queue notificationsJoas Schilling2013-03-262-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11405 PHPBB3-11474
| * | | | [ticket/11405] Order users in bookmark, in order to pass postgres testsJoas Schilling2013-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11405
| * | | | [ticket/11405] Sort $users array in order to prevent issues on postgresJoas Schilling2013-03-251-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11405
| * | | | [ticket/11405] Send post notifications to forum subscribersJoas Schilling2013-03-251-0/+15
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Like in 3.0 we should also send notifications about new posts to users that subscribed to the forum. (Subscriptions are verbose) PHPBB3-11405
* | | | Merge pull request #1311 from VSEphpbb/ticket/11461Nils Adermann2013-03-313-0/+11
|\ \ \ \ | | | | | | | | | | [ticket/11461] - Template Event added to bottom of view topic pages
| * | | | [ticket/11461] cut doc entry to 79 colsMatt Friedman2013-03-191-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11461
| * | | | [ticket/11461] Further clarify doc for viewtopic_body_footer_beforeMatt Friedman2013-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11461
| * | | | [ticket/11461] Add viewtopic_body_footer_before to the event docsMatt Friedman2013-03-191-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11461
| * | | | [ticket/11461] Add template event in the footer of view topic pagesMatt Friedman2013-03-192-0/+2
| | |_|/ | |/| | | | | | | | | | PHPBB3-11461
* | | | Merge pull request #1287 from erangamapa/ticket/11106Nils Adermann2013-03-311-2/+1
|\ \ \ \ | | | | | | | | | | [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
| * | | | [ticket/11106] Added missing line breaks.erangamapa2013-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added two missing line breaks into 'edited by' message. PHPBB3-11106
| * | | | [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.erangamapa2013-03-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When viewing a private message, when message edit count is 1 Undefined index EDITED_TIME_TOTAL php notice appears. Changed the message formatting method to what is used in viewtopic.php. PHPBB3-11106
* | | | | Merge pull request #1296 from bantu/ticket/11440Nils Adermann2013-03-311-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
| * | | | | [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.Andreas Fischer2013-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11440
| * | | | | [ticket/11440] Remove useless/incorrect comment.Andreas Fischer2013-03-151-1/+0
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-11440
* | | | | Merge pull request #1300 from bantu/ticket/11451Nils Adermann2013-03-293-93/+103
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
| * | | | | [ticket/11445] Add abstract class phpbb_notification_method_messenger_base.Andreas Fischer2013-03-163-93/+103
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11445
* | | | | [ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.Andreas Fischer2013-03-291-14/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11403
* | | | | [ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches.Andreas Fischer2013-03-291-2/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-11403
* | | | | Merge pull request #1285 from EXreaction/ticket/11422Nils Adermann2013-03-291-4/+6
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11422] Increment assets when database_update is complete
| * | | | | [ticket/11422] Increment assets when database_update is completeNathaniel Guse2013-03-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11422
* | | | | | [ticket/11469] Add comment about using bitwise operator.Andreas Fischer2013-03-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | [ticket/11469] Use multi insert property from DB. Do not copy value to buffer.Andreas Fischer2013-03-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | [ticket/11469] Use buffer with a single element instead of extra code path.Andreas Fischer2013-03-281-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | [ticket/11469] Cast $result to boolean in insert_all()Joas Schilling2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |= returns integer values PHPBB3-11469
* | | | | | [ticket/11469] Add note about calling flush() after batch insert is done.Andreas Fischer2013-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | [ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.Andreas Fischer2013-03-271-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | [ticket/11469] Add benefits over collecting huge insert arrays to class doc.Andreas Fischer2013-03-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into ↵Andreas Fischer2013-03-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11469 * nickvergessen/ticket/bantu/11469: [ticket/11469] Use method to check config count, instead of repeating it [ticket/11469] Return after sql_multi_insert when multi_insert is false [ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
| * | | | | | [ticket/11469] Return after sql_multi_insert when multi_insert is falseJoas Schilling2013-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11469
* | | | | | | Merge remote-tracking branch 'phpbb/develop' into ticket/11469Andreas Fischer2013-03-273-6/+7
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: [ticket/11476] Remove pass-by-reference from sql_mutli_insert [ticket/11466] Remove old database driver files from PHPUnit exclude [ticket/11448] Use of $user_id parameter to mark a user's notifications read [ticket/11460] Add default behaviour tests for notification and email types. [ticket/11460] Configure functional test board email using dummy SMTP data. [ticket/11460] Add test for whether post_email and topic_email are checked. [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case. [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.