Zach Copley
|
cd05fc6aee
|
Remove debugging statement
|
2011-07-07 17:23:41 -07:00 |
|
Zach Copley
|
969a558339
|
Change a few things around for CORS header output
|
2011-07-07 17:19:59 -07:00 |
|
Zach Copley
|
cb183359e2
|
Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157
|
2011-07-07 15:58:28 -07:00 |
flyingmana
|
3c47d158f4
|
make cors header deactivatable
|
2011-06-29 22:39:33 +02:00 |
|
flyingmana
|
253a55846a
|
allow cross-origin requests for host-meta
|
2011-06-21 21:59:34 +02:00 |
|
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
|
13991f7eb9
|
* add/update translator documentation.
* remove superfluous whitespace.
* update punctuation on form validation messages.
* L10n tweaks.
* add fixme for missing class documentation.
|
2011-01-31 18:16:55 +01:00 |
Brion Vibber
|
9df856e667
|
Merge branch '0.9.x' into merge
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
|
2010-12-07 10:50:05 -08:00 |
Evan Prodromou
|
fcc0825b14
|
Make userxrd part of the default hostmeta
|
2010-11-26 21:46:51 -05:00 |
Craig Andrews
|
3f3b38766f
|
move xrd and hostmeta out of the OStatus plugin and into core
add event for setting up hostmeta, and use them in the OStatus plugin
|
2010-11-26 21:12:14 -05:00 |
|
Brion Vibber
|
aa02f6020e
|
Merge branch '0.9.x' into 1.0.x
|
2010-10-08 11:47:50 -07:00 |
|
Craig Andrews
|
8d54809c35
|
move xrd and hostmeta out of the OStatus plugin and into core
add event for setting up hostmeta, and use them in the OStatus plugin
|
2010-09-07 13:45:52 -04:00 |