Commit graph

2706 commits

Author SHA1 Message Date
Nathan Guse
716635c834 [ticket/11103] Fix some language strings
Newlines at end of email files

PHPBB3-11103
2012-10-14 10:58:23 -05:00
Nathan Guse
c5f280351a [ticket/11103] UCP Notification option grouping
Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
2012-10-13 23:52:49 -05:00
Nathan Guse
cb93784126 [ticket/11103] UCP Notification List
PHPBB3-11103
2012-10-13 20:02:38 -05:00
Nathan Guse
1b56a1d6be [ticket/11103] Finishing up report post/pm and adding report closed
PHPBB3-11103
2012-10-11 22:36:48 -05:00
Nathan Guse
6d53bd4675 [ticket/11103] Finishing up PM Report notifications
PHPBB3-11103
2012-10-09 22:28:41 -05:00
Nathan Guse
9d955507b6 Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103 2012-10-09 22:03:18 -05:00
Nathan Guse
b33e527394 [ticket/11103] Working on report notifications (post/pm)
PHPBB3-11103
2012-10-09 22:02:49 -05:00
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
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
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -05:00
Nathan Guse
07fb66ac10 [ticket/11103] Do not abbreviate template output
PHPBB3-11103
2012-10-04 14:31:00 -05:00
Andreas Fischer
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning".
PHPBB3-11131
2012-10-02 14:58:20 +02: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
48ccc9eb93 [ticket/11103] UCP Notification Options can now be set
PHPBB3-11103
2012-09-27 18:25:37 -05: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
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
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
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Nathan Guse
959c81d00e [ticket/11103] Use appropriate email templates to send notifications
Fixing a number of bugs

PHPBB3-11103
2012-09-14 18:05:13 -05:00
Nathan Guse
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
2012-09-14 16:54:20 -05:00
Nathan Guse
207bbdf48c [ticket/11103] Quote notifications
PHPBB3-11103
2012-09-12 23:55:29 -05:00
Nathan Guse
9b1de1e487 [ticket/11103] Add topic ID to view post URL
PHPBB3-11103
2012-09-12 21:05:11 -05:00
Nathan Guse
3624d2c50a [ticket/11103] Use the language system, topic notifications
PHPBB3-11103
2012-09-09 14:20:14 -05:00
Nathan Guse
ff45c9aa7c [ticket/11103] General notification email template.
PHPBB3-11103
2012-09-09 10:36:22 -05:00
Unknown Bliss
79da1ea592 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
	phpBB/common.php
	phpBB/download/file.php
2012-09-01 21:15:39 +01:00
Nils Adermann
d866624ea7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
2012-09-01 16:11:57 +02:00
Nathan Guse
89f4cf6a8c [ticket/10631] Use exceptions for errors. Build action list dynamically.
PHPBB3-10631
2012-09-01 15:05:34 +01:00
Nathan Guse
2273ae2b34 [ticket/10631] Remove references to delete extension
PHPBB3-10631
2012-09-01 15:05:30 +01:00
Nathan Guse
9c0cd2693f [ticket/10631] Make the enable/disable/purge notices more visable.
PHPBB3-10631
2012-09-01 15:05:28 +01:00
Nathan Guse
8bbab088dd [ticket/10631] Validation for extensions
PHPBB3-10631
2012-09-01 15:05:23 +01:00
Nathan Guse
28ca2d6a5f [ticket/10631] Stagger the enable/disable/purge for extensions
PHPBB3-10631
2012-09-01 15:05:18 +01:00
Nathan Guse
3ba59c6362 [ticket/10631] Various tidbits and cleanup on the acp extensions manager
PHPBB3-10631
2012-09-01 15:05:12 +01:00
Michael Cullum
4cbfa61753 [ticket/10631] A few more extension admin changes
PHPBB3-10631
2012-09-01 15:04:55 +01:00
Michael Cullum
7a954d352e [ticket/10631] Fixing some items mentioned in PR
PHPBB3-10631
2012-09-01 15:04:53 +01:00
Michael Cullum
e768d0066d [ticket/10631] Update extensions language file for some issues found
PHPBB3-10631
2012-09-01 15:04:48 +01:00
Michael Cullum
9cd0e09f5d [ticket/10631] Rename language file to extensions.php
PHPBB3-10631
2012-09-01 15:04:47 +01:00
Michael Cullum
85e871e902 [ticket/10631] Removing ?> at end of customisations language file
PHPBB3-10631
2012-09-01 15:04:43 +01:00
Michael Cullum
a51ef44447 [ticket/10631] Some rewording of extensions admin language
PHPBB3-10631
2012-09-01 15:04:41 +01:00
Michael Cullum
29a9f3e70d [ticket/10631] Update extensions admin language
Added details page information, added a new line at end of file and removed some whitespace.

PHPBB3-10631
2012-09-01 15:04:37 +01:00
Michael Cullum
5e6b4c7192 [ticket/10631] Adding an extensions admin
PHPBB3-10631
2012-09-01 15:04:33 +01:00
Joas Schilling
8a036fa3e4 [feature/soft-delete] Update restoring feature to use ajax if requested.
Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
2012-08-29 18:42:14 +02:00
Josh Woody
fb13ab83e4 [feature/soft-delete] Implement the ability to soft-delete and restore posts
The soft delete feature seems to work.  Tests are pending.  A real icon is pending.  Add the permissions and the interface to soft-delete posts.  Also able to restore posts via the MCP queue

PHPBB3-9657
2012-08-29 17:50:11 +02:00