Zach Copley
|
b7d0746694
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
|
2011-02-28 15:39:43 -08:00 |
|
Siebrand Mazeland
|
8f776ec12d
|
* update/add translator documentation.
* fix L10n issues.
* update comments and tag missing documentation on some classes.
* remove superfluous whitespace
*
|
2011-01-31 16:39:54 +01:00 |
|
Evan Prodromou
|
a319b40c97
|
common_cache_key() -> Cache::key()
|
2010-09-06 10:07:43 -04:00 |
|
Evan Prodromou
|
8f81762d68
|
common_memcache() => Cache::instance()
|
2010-09-06 09:56:45 -04:00 |
|
Brion Vibber
|
84ab0156b4
|
Improve name validation checks on local File references
|
2010-02-01 08:48:31 -08:00 |
|
Craig Andrews
|
250bcfa8dc
|
Require users to login to view attachments on private sites
Thank you jeff-themovie for this implementation!
|
2010-01-05 17:49:28 -05:00 |
|
Evan Prodromou
|
d7da76ab6d
|
Revert "Revert "Actually commit the file this time""
This reverts commit ba89c89176.
|
2009-10-31 14:43:13 -04:00 |
|