1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-28 22:17:31 +01:00
Commit Graph

13454 Commits

Author SHA1 Message Date
Andreas Fischer
e0e3622ba9 Merge remote-tracking branch 'p/ticket/11159-develop' into develop
* p/ticket/11159-develop:
  [ticket/11159] static public is the currently approved order.
2012-10-30 18:16:16 -04:00
Joas Schilling
f0e2d21f8c [feature/soft-delete] Allow to soft delete posts in the MCP quick moderation
PHPBB3-9567
2012-10-30 21:46:04 +01:00
Andreas Fischer
c9ad0c6f25 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.

Conflicts:
	phpBB/install/database_update.php
	phpBB/ucp.php
2012-10-29 15:16:59 -04:00
Oleg Pudeyev
5f5d395c62 [ticket/11158] Require acl_u_sig for ucp signature module.
PHPBB3-11158
2012-10-29 14:58:25 -04:00
Oleg Pudeyev
88bd7292f1 [ticket/11158] Revert old fix in PHPBB3-10186.
Revert "[ticket/10186] UCP signature panel displays when not authed
for signatures"

This reverts commit f6fa52540c.

PHPBB3-10186
PHPBB3-11158
2012-10-29 14:58:19 -04:00
Oleg Pudeyev
31781adf0c [ticket/11159] static public is the currently approved order.
PHPBB3-11159
2012-10-29 14:57:27 -04:00
Oleg Pudeyev
d602f13d7f [ticket/11157] static public is the currently approved order.
PHPBB3-11157
2012-10-29 14:54:54 -04:00
Oleg Pudeyev
14a6e5ec73 [ticket/11157] Fix remaining captcha spam.
PHPBB3-11157
2012-10-29 14:48:43 -04:00
Oleg Pudeyev
60d9538b14 [ticket/11157] get_captcha_types is an instance method.
It is specific to a particular captcha factory implementation,
instantiate a captcha factory to invoke it.

PHPBB3-11157
2012-10-29 14:48:42 -04:00
RMcGirr83
a9b59bfe03 [ticket/11156] Delete "Misc" tab of forum based permissions + move items
PHPBB3-11156
2012-10-29 08:01:16 -04:00
Joas Schilling
ed602857e6 [feature/soft-delete] Correctly increase topics post counts when posting
PHPBB3-9567
2012-10-28 22:37:00 +01:00
Joas Schilling
4a8d38aab1 [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderation
PHPBB3-9567
2012-10-27 17:12:34 +02:00
Joas Schilling
7b3d794cad [feature/soft-delete] Display post delete reason if one is given
PHPBB3-9567
2012-10-24 19:58:28 +02:00
Joas Schilling
f21fd469bc [feature/soft-delete] Handle soft deleting via Delete Icon
PHPBB3-9567
2012-10-24 19:52:16 +02:00
Joas Schilling
5c6a3d8845 [feature/soft-delete] Revert doc fix from b8c55291
It should be fixed separately

PHPBB3-9567
2012-10-24 09:48:22 +02:00
Joas Schilling
b3d5f2b4e4 [feature/soft-delete] Fix unit tests for delete_posts()
PHPBB3-9567
2012-10-23 23:37:25 +02:00
Joas Schilling
727759c4d8 [feature/soft-delete] Fix disapproving posts/topics in queue
PHPBB3-9567
2012-10-23 22:47:57 +02:00
Joas Schilling
43e6b3a921 [feature/soft-delete] Fix some more topic/post count handling
Only disapproving in queue is missing.

PHPBB3-9567
2012-10-23 16:59:33 +02:00
Joas Schilling
fec72c4b78 [feature/soft-delete] Fix mcp_move_topic() topic/post count handling
PHPBB3-9567
2012-10-23 12:52:31 +02:00
Oleg Pudeyev
6bf60ac5cb Merge PR #971 branch 'nickvergessen/ticket/11018' into develop
* nickvergessen/ticket/11018:
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  [ticket/11014] Fix text for previous/next links in Subsilver2
  [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
  [ticket/11018] Always display previous/next links if we can display one
  [ticket/11014] Restore template vars for next/previous links
  [ticket/11018] Swap prev/next links on pagination to the old order
  [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
  [ticket/11018] Fix minor issues with CSS in prosilver
  [ticket/11018] Attempt to fix li.pagination alignment issue
2012-10-22 17:44:34 -04:00
Joas Schilling
eb9c39971b [feature/soft-delete] Fix forum syncing in ACP and deleting posts
PHPBB3-9567
2012-10-22 17:34:37 +02:00
Joas Schilling
0a07635329 [feature/soft-delete] Fix convertor and one mcp issue
PHPBB3-9567
2012-10-22 17:21:56 +02:00
Joas Schilling
90154db1db [feature/soft-delete] Fix submit_post() topic_replies* usage
PHPBB3-9567
2012-10-22 16:38:53 +02:00
Joas Schilling
5925a17894 [feature/soft-delete] Fix some more uses of topic_replies_real
PHPBB3-9567
2012-10-22 14:55:10 +02:00
Joas Schilling
168dd29f24 [feature/soft-delete] Fix sync() and some more functions to use the new fields
PHPBB3-9567
2012-10-22 14:22:56 +02:00
Joas Schilling
9945561b4b [feature/soft-delete] Correctly calculate the number of replies everywhere
PHPBB3-9567
2012-10-22 11:14:00 +02:00
Joas Schilling
6c39563e9f [feature/soft-delete] Add a function to calculate the actual post/topic count
PHPBB3-9567
2012-10-21 23:38:55 +02:00
Joas Schilling
2fafa54107 [feature/soft-delete] Update the new fields while updating the board.
PHPBB3-9567
2012-10-21 23:38:29 +02:00
Joas Schilling
9c5482317e [feature/soft-delete] Add new fields for topic/post counts for softdelete
We can not use the replies vs replies_real anymore, as we need to be able to
determinate whether the posts are unapproved or softdeleted. So we need to add
a new field and there by change the second one for consistency.
We also add the posts_* fields for forums, which are a missing feature.

PHPBB3-9567
2012-10-21 22:33:28 +02:00
Joas Schilling
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP
PHPBB3-9567
2012-10-21 22:30:20 +02:00
Andreas Fischer
b3fdf8a046 Merge remote-tracking branch 'EXreaction/ticket/8796' into develop
* EXreaction/ticket/8796:
  [ticket/8796] Prevent setting post_time greater than time() in markread
  [ticket/8796] Fix a few issues with the previous commits
  [ticket/8796] Mark read links updated to include time() in url
  [ticket/8796] Revert changes to $user->data['lastmark']
  [ticket/8796] Make function markread obey the $post_time argument
2012-10-18 16:43:46 +02:00
Andreas Fischer
4f3f4a40d6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.

Conflicts:
	phpBB/includes/functions.php
2012-10-18 16:34:59 +02:00
Andreas Fischer
c84268d2f9 Merge remote-tracking branch 'p/ticket/10848' into develop-olympus
* p/ticket/10848:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.
2012-10-18 16:26:54 +02:00
Oleg Pudeyev
b283df8241 [ticket/10848] Move include up.
PHPBB3-10848
2012-10-17 22:35:36 -04:00
Oleg Pudeyev
0a260f80af Merge PR #918 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:31:35 -04:00
Oleg Pudeyev
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:10:49 -04:00
Joas Schilling
b0bfe724fb [ticket/11014] Fix old pagination assignment
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
99dd73aac7 [ticket/11018] Fix several paginations in ACP
PHPBB3-11018
2012-10-17 23:34:37 +02:00
Joas Schilling
7ce43d49d8 [ticket/11014] Fix IF statements for new template pagination
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
7675d72622 [ticket/11014] Fix text for previous/next links in Subsilver2
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
PHPBB3-11023
2012-10-17 23:34:37 +02:00
Joas Schilling
ada2d4c91b [ticket/11018] Always display previous/next links if we can display one
PHPBB3-11018
2012-10-17 23:33:19 +02:00
Joas Schilling
5ea662f649 [ticket/11014] Restore template vars for next/previous links
They were dropped while the function was refactored:

If the block_var_name is a nested block, we will use the last (most inner)
block as a prefix for the template variables. If the last block name is
pagination, the prefix is empty. If the rest of the block_var_name is not
empty, we will modify the last row of that block and add our pagination items.

PHPBB3-11014
2012-10-17 23:33:18 +02:00
Joas Schilling
fa5753de70 [ticket/11018] Swap prev/next links on pagination to the old order
In the old pagination Prev was left of the pagination and Next right of the
pagination. While moving these blocks, I also removed the whitespaces, which
were introduced.

PHPBB3-11023
PHPBB3-11018
2012-10-17 23:33:18 +02:00
Joas Schilling
43a713ea83 [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
PHPBB3-11067
PHPBB3-11018
2012-10-17 23:30:57 +02:00
Joas Schilling
a51aa9b47c [ticket/11018] Fix minor issues with CSS in prosilver
PHPBB3-11018
2012-10-17 23:30:56 +02:00
Drae
e76fd6a395 [ticket/11018] Attempt to fix li.pagination alignment issue
This is somewhat kludgy fix for the vertical alignment issue
for pagination contained within a linklist parented li element.
Tested and doesn't seem to impact anything else negatively. May
need further browser testing.

PHPBB3-11018
2012-10-17 23:30:56 +02:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly.
PHPBB3-10848
2012-10-17 15:08:09 -04:00
Joas Schilling
0822d2bb61 [feature/soft-delete] Split unapproved/soft deleted posts from topics
If a topic is soft deleted through a moderator, the topic_delete_user is set.
If it is passively soft deleted (f.e. while the only approved post is deleted)
the topic_delete_user is not set. This way, we can distinguish between these
two cases. The same also applies to unapproved posts. So we need to set the
topic_delete_user when an unapproved topic is posted.

Topics that were soft deleted/unapproved by a user (rather then passive) are
going to be displayed in the Topics modules, while all others are in the posts
modules of the MCP queue.

PHPBB3-9567
2012-10-17 15:32:57 +02:00