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

19105 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andreas Fischer
8428b53087 Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympus 
* Senky/ticket/11112:
  [ticket/11112] updating links to phpbb.com to use SSL
 2012-10-02 17:01:21 +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
1f8f07b998 [feature/soft-delete] Add unit tests for simple cases of set_post_visibility 
These tests require at least one remaining post.

PHPBB3-9657
 2012-10-02 15:32:12 +02:00
Andreas Fischer
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning". 
PHPBB3-11131
 2012-10-02 14:58:20 +02:00
Joas Schilling
c36c69c1d4 [feature/soft-delete] Remove unneeded require_once() 
PHPBB3-9657
 2012-10-02 12:54:47 +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
280619eea9 [feature/soft-delete] Add unit tests for get_visibility_sql() 
PHPBB3-9657
 2012-10-01 17:13:15 +02:00
Joas Schilling
38d83da69e [feature/soft-delete] Remove old unit tests 
PHPBB3-9657
 2012-10-01 16:38:28 +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
Andreas Fischer
0daab4e0ef Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
 2012-09-29 00:26:43 +02:00
Andreas Fischer
27bef015d6 Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympus 
* nickvergessen/ticket/11122:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
 2012-09-29 00:25:00 +02: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
dc2835af78 [feature/soft-delete] Add columns for soft delete details 
PHPBB3-9657
 2012-09-28 16:17:21 +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
521992215c [ticket/11103] Language key needed in the UCP 
PHPBB3-11103
 2012-09-27 19:08:22 -05:00
Nathan Guse
dfb17f444a [ticket/11103] Fix module setup, add explanation to template 
PHPBB3-11103
 2012-09-27 19:04:47 -05:00
Nathan Guse
d07cb7b2af [ticket/11103] UCP Notifications module added to db updater 
PHPBB3-11103
 2012-09-27 18:56:15 -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
Joas Schilling
f7a6169184 [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors 
PHPBB3-11122
 2012-09-27 13:22:43 +02:00
Nathan Guse
544fbe35f4 [ticket/11103] Some tweaks to the template output 
PHPBB3-11103
 2012-09-26 22:59:22 -05:00
Nathan Guse
e66117409c [ticket/11103] More work on the UCP Notifications page 
PHPBB3-11103
 2012-09-26 22:39:12 -05:00
Nathaniel Guse
9b8c48a31c Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103 2012-09-26 21:50:32 -05:00
Nathaniel Guse
b052741fcb [ticket/11103] UCP base files for notification options 
PHPBB3-11103
 2012-09-26 21:50:21 -05:00
Nathan Guse
28c8c0ce46 [ticket/11103] Get subscription types/methods functions in the service 
PHPBB3-11103
 2012-09-26 21:48:59 -05:00
Nathaniel Guse
3242ce0d3a [ticket/11103] Add/delete subscription functions for the service 
PHPBB3-11103
 2012-09-25 10:35:50 -05:00
Nathaniel Guse
a8e53bda36 [ticket/11103] Display number of notifications in the [ Notifications ] link 
PHPBB3-11103
 2012-09-25 10:10:49 -05:00
Nathaniel Guse
aa3f6f4002 [ticket/11103] Fixing some bugs with the post/topic notifications 
PHPBB3-11103
 2012-09-25 10:10:10 -05:00
Nathaniel Guse
3897a442f7 [ticket/11103] Bug fixing 
PHPBB3-11103
 2012-09-20 10:40:18 -05:00
Nathaniel Guse
98731b1277 [ticket/11103] Prettify the output for prosilver. 
Create a way to mark items read from the output list.

PHPBB3-11103
 2012-09-20 10:36:11 -05:00
Nathan Guse
661dd09d6f [ticket/11103] Bug fix 
PHPBB3-11103
 2012-09-16 23:03:00 -05:00
Nathan Guse
a4ec7e2aea [ticket/11103] Delete some notifications when deleting posts/topics 
PHPBB3-11103
 2012-09-15 14:50:05 -05:00
Nathan Guse
b081729f25 [ticket/11103] Revert the changes to functions_display.php 
The css we need to apply to avatars can be applied through css rules.
We don't need to be able to specify a class for the img.

PHPBB3-11103
 2012-09-15 14:47:58 -05:00
Nathan Guse
7454d5c2d5 [ticket/11103] Topic/Post in queue notification 
Also, bug fixes and cleanup

PHPBB3-11103
 2012-09-15 14:33:15 -05:00
Nathan Guse
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications 
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
 2012-09-15 13:51:02 -05:00
Nathan Guse
fc6457140c Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-09-15 12:00:21 -05:00
Nathan Guse
9c54465a13 [ticket/11103] Starting approve_post type notification 
PHPBB3-11103
 2012-09-15 12:00:03 -05:00