Commit graph

19105 commits

Author SHA1 Message Date
Joas Schilling
9441774288 [feature/soft-delete] Topic visibility is already synced by sync('topic')
PHPBB3-9567
2012-10-09 11:55:31 +02:00
Vinny
5db30e66fd [ticket/11139] Fix fatal error on colour swatch window
PHPBB3-11139
2012-10-09 00:31:59 -03:00
Joas Schilling
e447a0fa07 [feature/soft-delete] Fix restoring a post via editing
PHPBB3-9567
2012-10-08 23:09:31 +02:00
Joas Schilling
53e01bba19 [feature/soft-delete] Update post counts within set_post_visibility
This is an additional query in some rare cases,
but it makes it much easier to use and understand.
This is mostly a preparation for the restore case.

PHPBB3-9567
2012-10-08 22:47:50 +02:00
Joas Schilling
91398c9e48 [feature/soft-delete] Change order of functions
PHPBB3-9567
2012-10-08 15:03:54 +02:00
Joas Schilling
c525e900d3 [feature/soft-delete] Allow to update multiple posts with set_post_visibility
PHPBB3-9567
2012-10-08 15:01:20 +02:00
Dhruv
305abfde96 [ticket/11051] fix spaces
PHPBB3-11051
2012-10-08 10:58:04 +05:30
Joas Schilling
25804eb8e8 [feature/soft-delete] Add test case for (soft)deleting the only post + fix
PHPBB3-9567
2012-10-06 19:56:52 +02:00
Joas Schilling
44005f338e [feature/soft-delete] Fix delete_post() function
PHPBB3-9567
2012-10-06 16:36:38 +02:00
Joas Schilling
7c09b5b89c [feature/soft-delete] Add some unit tests for delete_post()
PHPBB3-9567
2012-10-06 16:31:05 +02:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Andreas Fischer
281afb8bd6 Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympus
* mvinny/ticket/11135:
  [ticket/11135] Full replacement of credit link to https
2012-10-06 06:12:45 +02:00
Joas Schilling
009bd698fb [feature/soft-delete] Update and simplify the logic on delete_post()
Todo: delete_topic case

PHPBB3-9567
2012-10-06 03:59:49 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Nathan Guse
bafb5b0eca [ticket/11103] Starting work on combining notifications
Just for posts currently and not yet outputted.

PHPBB3-11103
2012-10-05 18:12:48 -05:00
Nathan Guse
6ca2256f77 [ticket/11103] Suppress errors from unlink/rmdir in the test case helpers
PHPBB3-11103
2012-10-05 15:18:26 -05:00
Nathan Guse
a57f207d68 [ticket/11103] More extensive notification tests
PHPBB3-11103
2012-10-05 15:09:29 -05:00
Nathan Guse
948bd69495 [ticket/11103] Move UCP Notification Options to Board Preferences tab
Also rename to "Edit notification options" for consistency

PHPBB3-11103
2012-10-05 13:54:27 -05:00
Nathan Guse
868554cbae [ticket/11103] trigger_error message when preferences updated in UCP
PHPBB3-11103
2012-10-05 13:50:59 -05:00
Nathan Guse
54629aa87d [ticket/11103] Bug fixing
PHPBB3-11103
2012-10-05 13:46:52 -05:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -05:00
Joas Schilling
3088855aa6 [feature/soft-delete] Fix SQL error in search
PHPBB3-9567
2012-10-05 17:46:29 +02:00
Joas Schilling
c22d5bd37c [feature/soft-delete] Clean the code of hide_post() and rely on postcount
PHPBB3-9567
2012-10-05 17:00:14 +02:00
Joas Schilling
05f2366755 [feature/soft-delete] Update docs of can_soft_delete and remove can_restore
PHPBB3-9567
2012-10-05 14:42:11 +02:00
Joas Schilling
526721c7db [feature/soft-delete] Fix set_topic_visibility() so it passes the tests
PHPBB3-9567
2012-10-05 14:26:52 +02:00
Joas Schilling
b9d363f6cc [feature/soft-delete] Add unit tests for set_topic_visibility()
PHPBB3-9567
2012-10-05 14:26:09 +02:00
Joas Schilling
7969cc7319 [feature/soft-delete] Fix docs of set_post_visibility()
PHPBB3-9567
2012-10-05 13:31:47 +02:00
Joas Schilling
01a78907bd [feature/soft-delete] Update set_topic_visibility() with some more logic
By default, when a soft deleted topic is restored. Only posts that were
approved at the time of soft deleting, are being restored. Same applies to
soft deleting. Only approved posts will be marked as soft deleted.

If you want to update all posts, use the force option.

PHPBB3-9567
2012-10-05 13:30:59 +02:00
Joas Schilling
92c5039af9 [feature/soft-delete] Allow forcing the set_visibility for all posts
PHPBB3-9567
2012-10-05 13:18:06 +02:00
Joas Schilling
42bb97a95c [feature/soft-delete] Make use of set_post_visibility() limits when applicable
PHPBB3-9567
2012-10-05 13:15:55 +02:00
Joas Schilling
bfa6a50a4f [feature/soft-delete] Extend functionality for updating a hole topic
Limit the posts to a certain visibility and deletion time
This allows us to only restore posts, that were approved
when the topic got soft deleted. So previous soft deleted
and unapproved posts are still soft deleted/unapproved

PHPBB3-9567
2012-10-05 13:12:36 +02:00
Joas Schilling
63d11c976b [feature/soft-delete] Fix sync('topic') to match the new logic
This also fixes set_post_visibility()

PHPBB3-9567
2012-10-05 12:39:05 +02:00
Joas Schilling
2a81e4b48e [feature/soft-delete] Fix the get functions to match the new logic
PHPBB3-9567
2012-10-05 12:06:36 +02:00
Joas Schilling
959525cebe [feature/soft-delete] Merge functionality of m_approve and m_restore
The problems with having two different permissions are just too big and cause
huge queries, if they are granted differently. Also it's quite hard to decide
what should happen when a moderator has only one permission and the topic has
only posts of the two hidden types. To avoid all this, we merge them so it's a
simple switch: either the user is a moderator, then he can see all posts,
or he is not, then he can only see approved ones.

PHPBB3-9567
2012-10-05 12:05:22 +02:00
Joas Schilling
b8642d7c8a [feature/soft-delete] Test topic visibility as well
PHPBB3-9657
2012-10-05 11:04:56 +02:00
Nathan Guse
2d69707a88 [ticket/11103] Remove extra line break in the header
Was introduced with ff136cc96a

PHPBB3-11103
2012-10-05 00:23:29 -05:00
Nathan Guse
3f2e3ad633 [ticket/11103] Working on test case
Fixing extension type/method naming scheme so they can be autoloaded.

Other bugs

PHPBB3-11103
2012-10-05 00:07:48 -05:00
Nathan Guse
ceb56da965 [ticket/11103] Fixing a few bugs from the previous changes
PHPBB3-11103
2012-10-04 21:39:17 -05:00
Nathan Guse
fa605402f7 [ticket/11103] Create schema files with notification tables
PHPBB3-11103
2012-10-04 20:48:19 -05:00
Nathan Guse
33371effc4 [ticket/11103] Mock notification manager
Fixing delete_user_pms_test.php

PHPBB3-11103
2012-10-04 15:28:51 -05:00
Nathan Guse
ff136cc96a [ticket/11103] Do not use Symfony\...\ContainerBuilder;
It's no longer needed

PHPBB3-11103
2012-10-04 15:21:07 -05:00
Nathan Guse
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
2012-10-04 14:47:13 -05:00
Nathan Guse
07fb66ac10 [ticket/11103] Do not abbreviate template output
PHPBB3-11103
2012-10-04 14:31:00 -05:00
Nathan Guse
cea94d8984 [ticket/11103] Use dependency injection instead of phpbb_container
PHPBB3-11103
2012-10-04 14:27:43 -05:00
Nathan Guse
64820546d7 [ticket/11103] Move notification files to includes/notification/
PHPBB3-11103
2012-10-04 13:42:52 -05:00
Nathan Guse
37e2473605 [ticket/11103] Rename classes
phpbb_notifications_service -> phpbb_notification_manager
phpbb_notifications_ -> phpbb_notification_

PHPBB3-11103
2012-10-04 13:39:54 -05:00
Nathan Guse
1aa5c005cb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-04 13:30:40 -05:00
Dhruv
be884b7e29 [ticket/11051] add common_words variable
PHPBB3-11051
2012-10-04 23:32:50 +05:30
Dhruv
67939192ae [ticket/11051] remove unnecessary comment
PHPBB3-11051
2012-10-04 23:17:18 +05:30
Dhruv
52b25aaf20 [ticket/11051] add get_word_len() in sphinx search
get_word_len() for sphinx search backend returns false always and
triggers proper error.

PHPBB3-11051
2012-10-04 01:51:57 +05:30