Joas Schilling
6a3d77d76e
[ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_provider
...
The phpbb_root_path needs to be removed from the style path, before giving
the path to the finder, because the finder prepends it later again and is
therefor unable to find style files when the root path is not ./
PHPBB3-10844
2013-04-12 21:35:06 +02:00
Nils Adermann
c25dfef770
Merge pull request #1184 from marc1706/ticket/11314
...
[ticket/11314] Improve readability and code cleanup in new JavaScript files
2013-04-12 06:32:13 -07:00
Nils Adermann
653666c76e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11358] Removed all trailing white spaces.
[ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:56 +02:00
Nils Adermann
0ce94fde77
Merge branch 'ticket/11358' into develop-olympus
...
* ticket/11358:
[ticket/11358] Removed all trailing white spaces.
[ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:24 +02:00
erangamapa
7d8bbcd596
[ticket/11358] Removed all trailing white spaces.
...
Removed all trailing white spaces with new lines.
PHPBB3-11358
2013-04-12 14:03:06 +02:00
erangamapa
00b45fa4dc
[ticket/11358] Fixed the code according to coding guidlines.
...
Added proper indentation and new line after break in switch
statement.
PHPBB3-11358
2013-04-12 14:02:51 +02:00
Andreas Fischer
d071d57a1b
Merge remote-tracking branch 'rechosen/ticket/11116' into develop
...
* rechosen/ticket/11116:
[ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
2013-04-11 15:18:29 -04:00
Joas Schilling
1296417b52
[ticket/11492] Initialize $user_ids and $group_users arrays
...
Also avoid unneccessary calls to permissions when user_ids is empty
PHPBB3-11492
2013-04-11 16:38:14 +02:00
rechosen
694eb3ccb5
[ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
...
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
2013-04-11 13:13:50 +02:00
Nils Adermann
52a0f32d99
Merge pull request #1312 from VSEphpbb/ticket/11463
...
[ticket/11463] Add title attribute to topics in search results
2013-04-04 01:39:37 -07:00
Nils Adermann
3985bdbc1b
Merge pull request #1199 from imkingdavid/ticket/11334
...
[ticket/11334] Properly generate controller URL with helper url() method
2013-04-03 06:44:15 -07:00
Nils Adermann
a7cf2bdace
Merge pull request #1323 from t-backoff/ticket/11477
...
Ticket/11477
2013-03-31 15:57:26 -07:00
Tabitha Backoff
5d669ed1c5
Changing effectively_installed function to check if the config var is set.
2013-03-31 18:46:25 -04:00
Nils Adermann
78dc1c84c8
Merge pull request #1316 from nickvergessen/ticket/11405
...
Ticket/11405 Users that are subscribed to a forum, should receive notifications for new replies
2013-03-31 15:02:48 -07:00
Nils Adermann
8ae2ea68a6
Merge pull request #1311 from VSEphpbb/ticket/11461
...
[ticket/11461] - Template Event added to bottom of view topic pages
2013-03-31 14:57:51 -07:00
Nils Adermann
8231b881ad
Merge pull request #1287 from erangamapa/ticket/11106
...
[ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
2013-03-31 14:54:23 -07:00
Nils Adermann
fd7db5cc1f
Merge pull request #1296 from bantu/ticket/11440
...
[ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
2013-03-31 14:42:43 -07:00
Nils Adermann
133307b6bf
Merge pull request #1300 from bantu/ticket/11451
...
[ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
2013-03-29 08:58:40 -07:00
Andreas Fischer
b156b22f35
[ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.
...
PHPBB3-11403
2013-03-29 16:53:50 +01:00
Andreas Fischer
6910d44154
[ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches.
...
PHPBB3-11403
2013-03-29 16:37:04 +01:00
Nils Adermann
1b71779432
Merge pull request #1285 from EXreaction/ticket/11422
...
[ticket/11422] Increment assets when database_update is complete
2013-03-29 08:29:22 -07:00
Tabitha Backoff
a8f5695666
Migration file and change board_home_text to board_index_text
2013-03-28 17:53:14 -04:00
Tabitha Backoff
9e5cde7f66
Ticket# 11477 - Allow customisation of "Board index"
2013-03-28 02:34:36 -04:00
Andreas Fischer
4bd5f279dc
[ticket/11469] Add comment about using bitwise operator.
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
1bd13acb75
[ticket/11469] Use multi insert property from DB. Do not copy value to buffer.
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
4132573088
[ticket/11469] Use buffer with a single element instead of extra code path.
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Joas Schilling
c9f059c4f2
[ticket/11469] Cast $result to boolean in insert_all()
...
|= returns integer values
PHPBB3-11469
2013-03-27 20:55:48 +01:00
Andreas Fischer
53f9e2131c
[ticket/11469] Add note about calling flush() after batch insert is done.
...
PHPBB3-11469
2013-03-27 19:27:27 +01:00
Andreas Fischer
dc766f29b4
[ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.
...
PHPBB3-11469
2013-03-27 19:19:26 +01:00
Andreas Fischer
8c5fcac232
[ticket/11469] Add benefits over collecting huge insert arrays to class doc.
...
PHPBB3-11469
2013-03-27 18:22:59 +01:00
Andreas Fischer
55fb87ff18
Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into 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
2013-03-27 18:11:49 +01:00
Andreas Fischer
43b6ae3fee
Merge remote-tracking branch 'phpbb/develop' into ticket/11469
...
* 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.
2013-03-27 18:11:38 +01:00
Andreas Fischer
94a15f85a6
[ticket/11469] Add example code to class documentation.
...
PHPBB3-11469
2013-03-27 18:11:31 +01:00
Joas Schilling
c629b2c7b3
[ticket/11476] Remove pass-by-reference from sql_mutli_insert
...
The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.
PHPBB3-11476
2013-03-27 15:01:36 +01:00
Joas Schilling
bf6f2c5875
[ticket/11469] Return after sql_multi_insert when multi_insert is false
...
PHPBB3-11469
2013-03-27 14:00:47 +01:00
Nils Adermann
b7778f7fde
Merge remote-tracking branch 'github-bantu/ticket/11460' into develop
...
* github-bantu/ticket/11460:
[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.
2013-03-27 06:31:53 +01:00
David King
6dddc22ec7
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
...
Currently, the $user_id is a parameter but is not used. This patch fixes that.
PHPBB3-11448
2013-03-26 17:07:20 -04:00
Joas Schilling
d8a63047aa
[ticket/11474] Clarify comment with "global" and forum_id = 0
...
Forum ID 0 in permission checks, checks the global moderator permission.
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:51 +01:00
Joas Schilling
1af89968dd
[ticket/11474] Check read permission before sending *_in_queue notifications
...
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:26 +01:00
Joas Schilling
81cf02e057
[ticket/11405] Order users in bookmark, in order to pass postgres tests
...
PHPBB3-11405
2013-03-26 13:54:33 +01:00
Marc Alexander
34cdbd0360
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
...
Conflicts:
phpBB/styles/prosilver/template/timezone.js
2013-03-26 13:18:54 +01:00
Marc Alexander
f0b0978538
[ticket/11314] Modify files to comply with coding standards
...
PHPBB3-11314
2013-03-26 13:13:33 +01:00
Marc Alexander
4870387f3a
[ticket/11314] Fix JSHint issues in adm editor.js
...
This time without changing the behavior.
PHPBB3-11314
2013-03-26 11:19:03 +01:00
Marc Alexander
36168b311e
[ticket/11314] Fix issues mentioned in jshint report
...
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.
PHPBB3-11314
2013-03-26 10:31:28 +01:00
Andreas Fischer
fc8bf3f3c7
[ticket/11469] Add comment about using sql_multi_insert when not buffering.
...
PHPBB3-11469
2013-03-25 17:01:44 +01:00
Joas Schilling
1259117d21
[ticket/11405] Sort $users array in order to prevent issues on postgres
...
PHPBB3-11405
2013-03-25 15:07:06 +01:00
Joas Schilling
a91ffe06c7
[ticket/11405] Send post notifications to forum subscribers
...
Like in 3.0 we should also send notifications about new posts to users
that subscribed to the forum. (Subscriptions are verbose)
PHPBB3-11405
2013-03-25 09:28:53 +01:00
Andreas Fischer
16a6025372
[ticket/11469] Add SQL insert buffer allowing easier handling of multi inserts.
...
1. Tries to prevent going over max packet size by flushing to the database
after a certain number of rows have been added.
2. Because of 1., it is less likely to reach a connection timeout when
inserting a huge number of rows.
3. By flushing the buffer when a certain size is reached, memory usage should
be lower compared to building the whole insert row set first.
PHPBB3-11469
2013-03-21 23:12:31 +01:00
Matt Friedman
940d16b585
[ticket/11463] Add title attribute to topics in search results
...
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
2013-03-20 11:39:06 -07:00
Oleg Pudeyev
8b464e87f0
Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop
...
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
[ticket/11438] Add spaces after # comment start and before \ line breaks
[ticket/11438] Add helpful comments from sample config to ACP output
[ticket/11438] Add empty sql_query_pre to delta-source
[ticket/11438] Move backslash to concatenate the query strings correctly
[ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
2013-03-20 11:43:14 -04:00