diff options
| author | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
| commit | 5d09b6b3f0595540c66b703ae085f0af904fe30f (patch) | |
| tree | 59269a4dacf90bbab9f0ff63afff4bf1781a1240 /EVENTS.txt | |
| parent | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff) | |
| parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (diff) | |
Merge branch '0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
Diffstat (limited to 'EVENTS.txt')
| -rw-r--r-- | EVENTS.txt | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index a79687bae..05d172585 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -20,10 +20,16 @@ StartShowStyles: Showing Style links; good place to add UA style resets EndShowStyles: End showing Style links; good place to add custom styles - $action: the current action -StartShowLaconicaStyles: Showing Laconica Style links +StartShowStatusNetStyles: Showing StatusNet Style links - $action: the current action -EndShowLaconicaStyles: End showing Laconica tyle links; good place to add handheld or JavaScript dependent styles +EndShowStatusNetStyles: End showing StatusNet Style links; good place to add handheld or JavaScript dependant styles +- $action: the current action + +StartShowLaconicaStyles: backwards compatibility; deprecated +- $action: the current action + +EndShowLaconicaStyles: backwards compatibility; deprecated - $action: the current action StartShowUAStyles: Showing custom User-Agent style links @@ -45,10 +51,16 @@ StartShowJQueryScripts: Showing JQuery script links (use this to link to e.g. Go EndShowJQueryScripts: End showing JQuery script links - $action: the current action -StartShowLaconicaScripts: Showing Laconica script links (use this to link to a CDN or something) +StartShowStatusNetScripts: Showing StatusNet script links (use this to link to a CDN or something) +- $action: the current action + +EndShowStatusNetScripts: End showing StatusNet script links +- $action: the current action + +StartShowLaconicaScripts: backwards compatibility; deprecated - $action: the current action -EndShowLaconicaScripts: End showing Laconica script links +EndShowLaconicaScripts: backwards compatibility; deprecated - $action: the current action StartShowSections: Start the list of sections in the sidebar |