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

14593 commits

Author SHA1 Message Date
Oleg Pudeyev
3fa0ab7073 Merge PR #1004 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11131] Correctly use indefinite article for "warning".
 2012-10-09 19:41:25 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus 
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
 2012-10-09 17:42:23 -04:00
Nathaniel Guse
7411d1d1bd [ticket/11103] Starting work on the reported posts notification 
PHPBB3-11103
 2012-10-09 10:30:55 -05:00
Nathaniel Guse
7a92594bc0 [ticket/11103] Fix the issue of time changing when editing items 
PHPBB3-11103
 2012-10-09 10:09:10 -05:00
Nathaniel Guse
98a7ce2360 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-09 09:38:08 -05:00
Vinny
5db30e66fd [ticket/11139] Fix fatal error on colour swatch window 
PHPBB3-11139
 2012-10-09 00:31:59 -03:00
Dhruv
305abfde96 [ticket/11051] fix spaces 
PHPBB3-11051
 2012-10-08 10:58:04 +05:30
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
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
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
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
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
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
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning". 
PHPBB3-11131
 2012-10-02 14:58:20 +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
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