diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 11:21:39 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 11:21:39 +0100 |
| commit | ba56222349781fd8e3938ab18127d46f3c1e0061 (patch) | |
| tree | 1e39e4e2960462ea06ae55a993512bf18ce4aa25 /inc/lang/no | |
| parent | 1285aa3a44c9fdf49bfd8992f33bac068bae8226 (diff) | |
| parent | c38b7fab9eeb9456aaf5fe8e4481c3b8569e5644 (diff) | |
| download | rpg-ba56222349781fd8e3938ab18127d46f3c1e0061.tar.gz rpg-ba56222349781fd8e3938ab18127d46f3c1e0061.tar.bz2 | |
Merge branch 'subscription' Pull Request #125
* subscription: (25 commits)
link directly to subscription management in mails
only use mailfromnobody for bulk mails
added missing context for list mails
readded mailfromnobody to subscription sending
correctly escape diffs in HTML mails
fixed lists in HTML mails
simplified subscription->add() code a bit
comment adjusted
removed unused vars
removed data parameter in subscription_handle_post()
fixed tests
some reformatting
added compatibility function
moved registration notification to subscription class
fixed merge error in inc/auth.php
consolidate more notification code in subscription class
minor cleanup
initialize new subscriptions with current time
fixed subscription management
correctly check if subscriptions are enabled
...
Diffstat (limited to 'inc/lang/no')
| -rw-r--r-- | inc/lang/no/subscr_digest.txt | 2 | ||||
| -rw-r--r-- | inc/lang/no/subscr_list.txt | 2 | ||||
| -rw-r--r-- | inc/lang/no/subscr_single.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt index 6afd0cc5c..670d39d32 100644 --- a/inc/lang/no/subscr_digest.txt +++ b/inc/lang/no/subscr_digest.txt @@ -12,7 +12,7 @@ Ny versjon: @NEWPAGE@ For å avslutte varslingen, logg inn på @DOKUWIKIURL@ og gå til -@NEWPAGE@ +@SUBSCRIBE@ og avslutt abonnementet på endringer av siden eller i navnerommet. -- diff --git a/inc/lang/no/subscr_list.txt b/inc/lang/no/subscr_list.txt index 72cd307cb..860d88d2a 100644 --- a/inc/lang/no/subscr_list.txt +++ b/inc/lang/no/subscr_list.txt @@ -9,7 +9,7 @@ Her er endringene: For å avslutte varslinga, logg inn på @DOKUWIKIURL@ og gå til -@NEWPAGE@ +@SUBSCRIBE@ og avslutt abonnementet på endringer av sida eller i navnerommet. -- diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt index 25296da58..b26b3a879 100644 --- a/inc/lang/no/subscr_single.txt +++ b/inc/lang/no/subscr_single.txt @@ -15,7 +15,7 @@ Ny versjon: @NEWPAGE@ For å avslutte varslingen, logg inn på @DOKUWIKIURL@, gå til -@NEWPAGE@ +@SUBSCRIBE@ og avslutt abonnementet på endringer av siden eller i navnerommet. -- |