makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 17:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
18932 commits 18 branches 192 tags 207 MiB
Commit graph

8146 commits

Author SHA1 Message Date
Oleg Pudeyev
fd6ee50e06 [ticket/11162] Extract existing behavior into a function and add a test. 
PHPBB3-11162
 2012-11-02 16:05:53 -04:00
Joas Schilling
6999d776d4 [feature/soft-delete] Correctly manage soft deleting via MCP 
PHPBB3-9567
 2012-11-02 14:23:17 +01:00
Joas Schilling
63e3baf0eb [feature/soft-delete] Correctly manage softdeleting via posting.php 
PHPBB3-9567
 2012-11-02 14:14:20 +01:00
Joas Schilling
bed82bf2bd [feature/soft-delete] Invert the logic on confirm box 
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
 2012-11-01 22:23:35 +01:00
Andreas Fischer
969369254f [ticket/10875] Add comment about cache's sql_load() method. 
PHPBB3-10875
 2012-10-31 18:14:52 -04:00
Joas Schilling
8d05dad634 [feature/soft-delete] Display message when the posts are already soft deleted 
PHPBB3-9567
 2012-10-31 21:28:06 +01:00
Joas Schilling
18dec1026a [feature/soft-delete] Fix restoring/approving posts with mcp moderation 
PHPBB3-9567
 2012-10-31 14:09:23 +01:00
Andreas Fischer
4e83cd461c [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save(). 
Previously (develop-olympus) $query_result was passed via reference into
sql_save(). Now the (possibly changed) result is returned by value.
Adjust logic to take this change into account correctly.

PHPBB3-10875
 2012-10-30 18:50:26 -04:00
Andreas Fischer
e28f0aa336 [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save(). 
phpbb_cache_driver_null::sql_save() has to return $query_result as is instead
of null.

PHPBB3-10875
 2012-10-30 18:50:25 -04:00
Andreas Fischer
4f65a00334 [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory. 
sql_save() no longer takes $query_result as a reference, thus this assignment
is a no-op.

PHPBB3-10875
 2012-10-30 18:50:25 -04:00
Andreas Fischer
a1524a69d6 [ticket/11099] Mark acp_ban::display_ban_options() as static. 
It is called statically from mcp_ban.

PHPBB3-11099
 2012-10-30 18:43:00 -04:00
Andreas Fischer
1f248dab6f Merge remote-tracking branch 'p/ticket/11157' into develop 
* p/ticket/11157:
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
 2012-10-30 18:19:44 -04:00
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
Nathan Guse
05e74b82ac [ticket/11103] enable/disable notifications functions 
disable_notifications
This should be called when an extension which has notification types
is disabled so that all those notifications are hidden and do not
cause errors

enable_notifications
This should be called when an extension which has notification types
that was disabled is re-enabled so that all those notifications that
were hidden are shown again

PHPBB3-11103
 2012-10-29 23:34:51 -05:00
Nathan Guse
6c213bd5fa [ticket/11103] Make sure post/topic approved notifications are always unread 
PHPBB3-11103
 2012-10-29 23:20:59 -05:00
Nathan Guse
b1ba7b27ad [ticket/11103] _get_avatar -> get_user_avatar 
PHPBB3-11103
 2012-10-29 18:37:07 -05:00
Nathan Guse
b60ae30b02 [ticket/11103] More cleanup 
PHPBB3-11103
 2012-10-29 18:20:07 -05:00
Nathan Guse
a811e65147 [ticket/11103] Revert an overwrite that occured on merging from develop 
PHPBB3-11103
 2012-10-29 18:18:33 -05:00
Nathan Guse
ecf6f1eb8c [ticket/11103] Code cleanup 
PHPBB3-11103
 2012-10-29 18:15:01 -05:00
Nathan Guse
e549b7663d [ticket/11103] Set basic notifications to be enabled by default 
Now, if there is no row for the user in the user_notifications table,
the user will receive basic notifications. If the user wishes to not
receive notifications, a row must be added with notify = 0.

For other methods besides the basic (e.g. email, jabber) a row must
still be added with notify = 1 for them to receive notifications

PHPBB3-11103
 2012-10-29 18:09:20 -05: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
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
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
f21fd469bc [feature/soft-delete] Handle soft deleting via Delete Icon 
PHPBB3-9567
 2012-10-24 19:52:16 +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
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
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP 
PHPBB3-9567
 2012-10-21 22:30:20 +02:00
Nathan Guse
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences 
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
 2012-10-20 22:11:41 -05:00
Nathan Guse
bc18e368c3 [ticket/11103] Correct the test case 
Fix a bug that broke it and make sure to set the needed config/auth settings

PHPBB3-11103
 2012-10-20 21:55:58 -05:00
Nathan Guse
7e6f31b51d [ticket/11103] Correct the comments on the notification classes 
PHPBB3-11103
 2012-10-20 21:45:15 -05:00
Nathan Guse
f62e55091a [ticket/11103] PM notifications are not available if users cannot read them 
PHPBB3-11103
 2012-10-20 21:28:37 -05:00
Nathan Guse
de7e17b732 [ticket/11103] Notifications for subscriptions/bookmarks must obey ACP options 
If bookmarks/subscriptions are disabled, they should not be listed in the UCP

PHPBB3-11103
 2012-10-20 21:22:06 -05:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method 
This is going to require you recreate the db tables.

PHPBB3-11103
 2012-10-20 20:58:53 -05:00
Nathan Guse
52bb4a1bd6 [ticket/11103] Do not have empty queue in the interface 
This is not needed as it is not public.

PHPBB3-11103
 2012-10-20 19:00:37 -05:00
Nathan Guse
0ac9079d1c [ticket/11103] Replace $email_template with get_email_template() 
PHPBB3-11103
 2012-10-20 18:55:13 -05:00