Commit graph

18570 commits

Author SHA1 Message Date
David King
5e89ce1898 [ticket/11334] Make url helper method public
PHPBB3-11334
2013-03-15 09:18:08 -04:00
David King
d3e2fae66d [ticket/11334] Add a test for the controller helper URL method
PHPBB3-11334
2013-03-15 09:18:07 -04:00
David King
8c512b0d2d [ticket/11334] Properly generate controller URL until paths issue gets fixed
PHPBB3-11334
2013-03-15 09:18:06 -04:00
Joas Schilling
02fd181198 Merge remote-tracking branch 'bantu/ticket/11439' into develop
* bantu/ticket/11439:
  [ticket/11439] Add _test suffix to notification test filename.
2013-03-15 10:31:59 +01:00
Joas Schilling
2cd1c62403 [ticket/11443] Add _test suffix to migration test filenames
PHPBB3-11443
2013-03-15 10:23:14 +01:00
Andreas Fischer
15cade3dc5 [ticket/11439] Add _test suffix to notification test filename.
PHPBB3-11439
2013-03-15 10:21:09 +01:00
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
Joas Schilling
ef63c2db8b [ticket/11438] Add empty sql_query_pre to delta-source
PHPBB3-11438
2013-03-15 08:19:50 +01:00
Joas Schilling
8fe776dff7 [ticket/11438] Move backslash to concatenate the query strings correctly
Was broken in 03d2c6413c

PHPBB3-11438
2013-03-15 08:16:37 +01:00
Joas Schilling
dc7afd05eb [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
PHPBB3-11438
2013-03-15 08:06:45 +01:00
Andreas Fischer
ba460d98f1 [ticket/11441] Split user loader tests into multiple test methods.
PHPBB3-11441
2013-03-15 01:36:05 +01:00
Andreas Fischer
ef1caf6933 [ticket/11441] Use setUp() in phpbb_user_loader_test.
PHPBB3-11441
2013-03-15 01:32:33 +01:00
Andreas Fischer
e1e9138c3b [ticket/11441] Update/correct copyright year of user loader test.
PHPBB3-11441
2013-03-15 01:28:27 +01:00
Andreas Fischer
3c09612d36 [ticket/11441] Correct/fix class name of user loader test.
PHPBB3-11441
2013-03-15 01:26:26 +01:00
Andreas Fischer
eabcbb9baf [ticket/11441] Add _test prefix to user loader test filename.
PHPBB3-11441
2013-03-15 01:25:10 +01:00
Andreas Fischer
1694dc6e28 [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
PHPBB3-11440
2013-03-15 01:22:00 +01:00
Andreas Fischer
b17c0aa098 [ticket/11440] Remove useless/incorrect comment.
PHPBB3-11440
2013-03-15 01:21:12 +01:00
Matt Friedman
a38a92424d [ticket/10155] Update jQuery to 1.8.3
Currently included jQuery is old by now, v1.6.2. We should update to
1.8.3. This allows us to take advantage of the latest form of jQuery
event delegation ($.on). I don't think it wise to update to jQuery
1.9.x yet, as many 3rd party scripts still need to be updated to cope
with its deprecated features ($.browser). Therefor, 1.8.3 is the latest
and most widely compatible stable version right now.

PHPBB3-10155
2013-03-14 10:45:17 -07:00
Joas Schilling
d41cf293e1 [ticket/9657] Check for post visibility when searching with Sphinx
This update will require admins to manually update their Sphinx config
file aswell as to delete the index and rebuild it from scratch. Before
this is done the search will not be usable anymore.

PHPBB3-9657
2013-03-14 12:10:07 +01:00
Joas Schilling
1fd5be859e [ticket/11362] Add unit test for ../ in directory paths
PHPBB3-11362
2013-03-12 22:45:44 +01:00
Joas Schilling
567eefb2bd [ticket/11362] Correctly sanitise the directory path
We need to correctly remove ../ form the path if possible by removing the
previous folder aswell. Otherwise the finder is unable to locate /adm/style
directories in extensions as he is looking for /adm/../adm/style instead.

PHPBB3-11362
2013-03-12 22:35:31 +01:00
Nathan Guse
d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
  [ticket/11404] Remove version ID from manager_test.php file header
  [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
  [ticket/11404] Convert manager_test to UNIX line endings
  [ticket/11404] Use a default data row if $row is empty in clean_row()
  [ticket/11404] Return empty array of avatar data if $row is empty
2013-03-12 14:48:07 -05:00
Nathan Guse
739dbd9e31 Merge remote-tracking branch 'remotes/Marc/ticket/11433' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11433:
  [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
2013-03-12 14:41:54 -05:00
Nathan Guse
04aceaecb6 Merge remote-tracking branch 'remotes/nickv/ticket/11310' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11310:
  [ticket/11310] Add hashes to action links to prevent CSRF attacks
2013-03-12 11:41:21 -05:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
2013-03-12 15:15:21 +01:00
Joas Schilling
74f4fd724e [ticket/9657] Correctly determine the users permissions when deleting posts
PHPBB3-9657
2013-03-12 12:39:00 +01:00
Joas Schilling
759086e654 [ticket/9657] Remove AJAX from delete button and approval/restore form
When a post is being deleted and the user goes to the next page, the first
post of that next page is now on the page before. So the user performing
the action will skip the post. Until we found a good solution to fix this,
we just remove the AJAX from these features.
For more information see http://tracker.phpbb.com/browse/PHPBB3-11340

PHPBB3-9657
2013-03-12 11:45:36 +01:00
Joas Schilling
d9e9490366 [ticket/9657] Add note about post being soft deleted in subsilver2
PHPBB3-9657
2013-03-12 11:39:16 +01:00
Joas Schilling
db12214279 [ticket/9657] Fix typo in subsilver2 condition
PHPBB3-9657
2013-03-12 11:38:23 +01:00
Joas Schilling
d44a0a17df [ticket/9657] Provide option to restore post in mcp_post
PHPBB3-9657
2013-03-12 11:37:36 +01:00
Joas Schilling
b712cff496 [ticket/9657] Populate data about post's delete status in mcp_post
PHPBB3-9657
2013-03-12 11:36:40 +01:00
Joas Schilling
a67daa8c8a [ticket/9657] Fix some more subsilver2
PHPBB3-9657
2013-03-12 11:10:44 +01:00
Joas Schilling
74b731f0f7 [ticket/9657] Fix some minor issues in prosilver
PHPBB3-9657
2013-03-12 11:09:34 +01:00
Joas Schilling
5da250148b [ticket/9657] Finish subsilver2 viewforum and viewtopic
PHPBB3-9657
2013-03-12 09:14:39 +01:00
erangamapa
df98de971c [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
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
2013-03-12 10:19:29 +05:30
Joas Schilling
1970ee9854 [ticket/9657] Fix softdelete for subsilver2 - part1
PHPBB3-9657
2013-03-11 23:28:39 +01:00
Joas Schilling
4e9cf27394 [ticket/9657] Remove softdelete reason field when permanent delete is selected
PHPBB3-9657
2013-03-11 23:08:40 +01:00
Joas Schilling
b727e1eeda [ticket/9657] Correctly split disapproving from perma deleting posts
PHPBB3-9657
2013-03-11 16:37:43 +01:00
Joas Schilling
f6dd688e72 [ticket/9657] Fix missing global $phpbb_container
PHPBB3-9657
2013-03-11 12:40:33 +01:00
Joas Schilling
cd95d3abf7 [ticket/9657] Include poster name in "deleted post" message
Also switched from passive to active form

PHPBB3-9657
2013-03-11 12:22:47 +01:00
Joas Schilling
8b24ccb894 [ticket/9657] Fix some language problems and inconsistences
PHPBB3-9657
2013-03-11 12:13:59 +01:00
Joas Schilling
4bd5d6c097 [ticket/9657] Remove line with unused variable
PHPBB3-9657
2013-03-11 11:51:11 +01:00
Marc Alexander
4ad8fcbd58 [ticket/11404] Remove version ID from manager_test.php file header
PHPBB3-11404
2013-03-11 10:35:18 +01:00
Marc Alexander
fb1984dadb [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
PHPBB3-11404
2013-03-11 10:34:25 +01:00
Marc Alexander
2ec0dc5b34 [ticket/11404] Convert manager_test to UNIX line endings
PHPBB3-11404
2013-03-11 10:34:12 +01:00
Joas Schilling
d6d7acef04 [ticket/9657] Remove already fixed todo
PHPBB3-9657
2013-03-10 23:48:53 +01:00
Joas Schilling
147c98fa32 [ticket/9657] Fix newly added empty line
PHPBB3-9657
2013-03-10 22:21:38 +01:00
Joas Schilling
cc5ba36a06 [ticket/9657] Cast IDs to integer
PHPBB3-9657
2013-03-10 22:18:37 +01:00
Joas Schilling
7db5eec5d2 [ticket/9657] Correctly increase users post count when approving posts
PHPBB3-9657
2013-03-10 22:15:29 +01:00