Commit graph

8119 commits

Author SHA1 Message Date
Joas Schilling
44005f338e [feature/soft-delete] Fix delete_post() function
PHPBB3-9567
2012-10-06 16:36:38 +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
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
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
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
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
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
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
Andreas Fischer
fca0811943 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11112] updating links to phpbb.com to use SSL

Conflicts:
	phpBB/adm/index.php
2012-10-02 17:03:06 +02:00
Joas Schilling
5b64ebc11d [feature/soft-delete] Fix a bug in sync() and set_post_visibility()
PHPBB3-9657
2012-10-02 15:34:18 +02:00
Joas Schilling
a84e4029e4 [feature/soft-delete] Update doc blocks to proper format
PHPBB3-9657
2012-10-02 12:51:59 +02:00
Joas Schilling
b629b2cd95 [feature/soft-delete] Add unit tests for get_global_visibility_sql()
PHPBB3-9657
2012-10-01 22:44:39 +02:00
Joas Schilling
4a65940e62 [feature/soft-delete] Add unit tests for get_forums_visibility_sql()
PHPBB3-9657
2012-10-01 22:14:04 +02:00
Joas Schilling
1943de36f3 [feature/soft-delete] Comment out user_posts update for the moment
It should rely on the permissions of the post not the current user.

PHPBB3-9657
2012-10-01 16:25:05 +02:00
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02:00
Nathan Guse
51862f151d [ticket/8796] Prevent setting post_time greater than time() in markread
PHPBB3-8796
2012-09-30 10:29:43 -05:00
Joas Schilling
e5377e98c7 [feature/soft-delete] Allow setting the visibility change reason
PHPBB3-9657
2012-09-28 16:53:38 +02:00
Joas Schilling
8b2181eb85 [feature/soft-delete] Comment out stuff about f_restore for performance reason
PHPBB3-9657
2012-09-28 16:14:44 +02:00
Nathan Guse
25b9ea24bf [ticket/11103] Note on the add_notifications function about the last change
PHPBB3-11103
2012-09-27 20:11:28 -05:00
Nathan Guse
2a5baad61b [ticket/11103] Only notify a user once for a single item
Note: The user may be notified multiple times IF they use different
notification options. e.g They are subscribed to topics they have
bookmarked by a notification and subscribed to the topic by
an email notification. In this case, they would receive two notifications.
This occurs because we do not want to omit any more direct types of
notifications (if they want an email, they should _always_ get at least one
email).

PHPBB3-11103
2012-09-27 20:05:06 -05:00
Nathan Guse
07616bfa92 [ticket/11103] UCP Notifications Options Form Key
PHPBB3-11103
2012-09-27 19:21:57 -05:00
Nathan Guse
ba7289b9d2 [ticket/11103] Use PM Notification Preferences from Notification Options
Remove all PM Notification preferences from UCP Board Preferences

PHPBB3-11103
2012-09-27 19:19:38 -05:00
Nathan Guse
c841aa34b6 [ticket/11103] A couple to-dos
PHPBB3-11103
2012-09-27 18:48:13 -05:00
Nathan Guse
cbe0d478f1 [ticket/11103] Bug (using wrong variable)
PHPBB3-11103
2012-09-27 18:44:31 -05:00
Nathan Guse
858201cc1f [ticket/11103] Types now all send notifications as per user setting
PHPBB3-11103
2012-09-27 18:41:07 -05:00
Nathan Guse
48ccc9eb93 [ticket/11103] UCP Notification Options can now be set
PHPBB3-11103
2012-09-27 18:25:37 -05:00
Nathaniel Guse
f062087f30 [ticket/11103] Approve/disapprove notification options
PHPBB3-11103
2012-09-27 10:42:50 -05:00
Nathaniel Guse
ae91a0a846 [ticket/11103] Allow grouping of multiple types in ucp notification options
Ability to hide notification types from UCP Notification options
(if users do not have permission to use the notification type, or for
whatever reason they should not see it)

PHPBB3-11103
2012-09-27 10:37:37 -05:00
Nathan Guse
e66117409c [ticket/11103] More work on the UCP Notifications page
PHPBB3-11103
2012-09-26 22:39:12 -05:00