e36399974e
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
lib/action.php
plugins/OStatus/actions/ostatusinit.php
2010-12-20 15:19:33 -05:00
e79034e163
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
cf824621b9
Localisation updates from http://translatewiki.net .
2010-12-16 16:30:30 +01:00
0330bad688
Cleaner code to avoid a couple PHP notices from accessing uninitialized variables in ostatus profile discovery (these cases hit checking diaspora accounts)
2010-12-15 12:14:25 -08:00
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
6bdce2b1e5
Localisation updates from http://translatewiki.net .
2010-11-30 21:35:25 +01:00
ee67a0673d
Localisation updates from http://translatewiki.net .
2010-11-30 18:53:04 +01:00
adb98ce5d1
updated
2010-11-29 16:02:17 -05:00
675d902cab
updated
2010-11-29 16:01:19 -05:00
3277523448
updated
2010-11-29 16:00:54 -05:00
4da41d95ee
updated
2010-11-29 16:00:17 -05:00
f4dd6c2916
updated
2010-11-29 15:58:41 -05:00
67db18d30b
updated
2010-11-29 15:57:28 -05:00
432237178f
updated
2010-11-29 15:55:58 -05:00
ed0e91c7a1
Localisation updates from http://translatewiki.net .
2010-11-29 20:28:28 +01:00
005a14272d
Make OStatusPlugin define push feed rel
2010-11-26 22:10:18 -05:00
fcc0825b14
Make userxrd part of the default hostmeta
2010-11-26 21:46:51 -05:00
0a4911552e
Move user xrd action to core and use hooks to extend
...
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
2010-11-26 21:38:38 -05:00
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
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
ec79572964
Localisation updates from http://translatewiki.net .
2010-11-03 00:04:26 +01:00
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
0229c22d23
Merge branch '1.0.x' into schema-x
2010-11-02 15:02:55 -07:00
04ca706601
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
2010-11-02 15:02:10 -07:00
5a9bb0adc4
Tossing in a basic i18n message export to script code. Plugins can hook StartScriptMessage/EndScriptMessage, or directly add needed mappings in Action::getScriptMessages(). Exported entries are accessible as SN.msg(key) at runtime.
...
StatusNet core code now sets the tooltip text on .attachment.more links when they receive their attachment-expansion magic; this will override the hardcoded tooltip text saved from OStatus plugin when displaying timelines in the web UI.
2010-11-02 13:05:16 -07:00
e7c7fd39fc
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-28 16:27:53 -07:00
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
7a564276a9
Localisation updates from http://translatewiki.net .
2010-10-28 01:58:43 +02:00
b483a0549f
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-25 13:14:33 -07:00
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
1545c1228b
Localisation updates from http://translatewiki.net .
2010-10-23 20:50:55 +02:00
3b6f738ab7
Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema
2010-10-19 17:25:56 -07:00
a67160e01e
Merge branch '1.0.x' into schema-x
...
Conflicts:
lib/common.php
2010-10-19 15:19:46 -07:00
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07:00
3c10602561
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-18 22:11:33 +02:00
e6df1b19df
Localisation updates from http://translatewiki.net
2010-10-18 22:03:29 +02:00
140308bb03
Merge branch '0.9.x' into 1.0.x
2010-10-18 12:49:20 -07:00
aa80d8fee3
Clean up edge cases in OStatus FeedDiscoveryTest
2010-10-18 12:45:55 -07:00
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
e04a6ef93e
Make HTTP timeout configurable on OStatus's remote-tests.php (needs to be pumped up a fair amount when doing Salmon pings with queues off on the test boxes, especially without the fast math library)
2010-10-18 11:27:22 -07:00
4c3aebd396
Merge branch '1.0.x' into schema-x
2010-10-15 11:40:40 -07:00
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
ecb582e419
accept profile URL as a LRDD identifier
2010-10-14 11:07:37 -04:00
23ac961624
Show Webfinger, URI and profile page as subject and aliases
2010-10-14 11:06:57 -04:00
4101de7dd7
Merge branch '1.0.x' into schema-x
2010-10-13 15:46:45 -07:00
bca215563f
Clean up remote avatar temporary files if we fail before saving them into avatars directory (OMB core, OStatus, WikiHowProfile, YammerImport)
2010-10-13 11:10:04 -07:00
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
5215423ea9
Localisation updates from http://translatewiki.net .
2010-10-09 16:15:48 +02:00
aa02f6020e
Merge branch '0.9.x' into 1.0.x
2010-10-08 11:47:50 -07:00
Ian Denhardt
Brion Vibber
Siebrand Mazeland
Matt Lee
Evan Prodromou
Craig Andrews