Commit Graph

7387 Commits

Author SHA1 Message Date
Evan Prodromou
ad63a9518c Sever -> server in error message 2010-01-10 22:59:32 -08:00
Evan Prodromou
15b88697a7 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-10 14:18:54 -08:00
Evan Prodromou
866dfa6822 Merge branch 'master' into 0.9.x
Conflicts:
	classes/Memcached_DataObject.php
2010-01-10 14:18:19 -08:00
Evan Prodromou
7aa43f3c93 defaultDesign was undefined; fixed that 2010-01-10 14:10:31 -08:00
Evan Prodromou
6fdd52467d catch exceptions from snapshot 2010-01-10 14:06:52 -08:00
Zach Copley
63eddf216f Fix routes for social graph API methods -- this takes care of Ticket #2151 2010-01-10 14:03:10 -08:00
Evan Prodromou
8cf1ef862d catch exceptions from snapshot 2010-01-10 13:54:26 -08:00
Evan Prodromou
2e42d3336a check before saving a thumbnail 2010-01-10 13:25:16 -08:00
Evan Prodromou
f463329b9a check before inserting File_oembed and File_thumbnail 2010-01-10 13:18:53 -08:00
Evan Prodromou
9d3893255a don't put Users with object IDs in the cache, and don't fetch them 2010-01-10 12:31:43 -08:00
Evan Prodromou
30409f7bad debugging code to find passed-in objects in munge_password 2010-01-10 12:07:49 -08:00
Evan Prodromou
91760ae2ae Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-10 11:15:45 -08:00
Siebrand Mazeland
5ad01a7bea Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-10 12:33:03 +01:00
Siebrand Mazeland
4af6b7f5c3 Lots of tiny message changes.
* Mostly punctuation updates so that the same message is used consistently in all of StatusNet.
* Some cases of "Title Case" removed, because that does not appear to be used consistently.
2010-01-10 12:26:24 +01:00
Brenda Wallace
26b0324027 Merge commit 'mainline/0.9.x' into 0.9.x 2010-01-10 14:06:15 +13:00
Brenda Wallace
42896ac1fb fixed stray comma 2010-01-10 14:04:18 +13:00
Brenda Wallace
dc89adb36d Revert "fixed stay comma"
This reverts commit 2b273be400.
2010-01-10 14:04:01 +13:00
Brenda Wallace
2b273be400 fixed stay comma 2010-01-10 14:03:42 +13:00
Siebrand Mazeland
40847ea1b5 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-10 01:52:13 +01:00
Siebrand Mazeland
0c4dbf1588 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2010-01-10 01:46:39 +01:00
Siebrand Mazeland
b0aea3f9c1 * L10n updates: consistent puctuation
* i18n updates: number parameters if more than one are being used
2010-01-10 01:45:58 +01:00
Craig Andrews
a07d8dab25 i18n in the imap plugin 2010-01-09 19:04:53 -05:00
Craig Andrews
7dde17862a i18n work in the mail handler 2010-01-09 19:04:53 -05:00
Craig Andrews
c758b1b1d4 Add version information to a bunch of plugins 2010-01-09 19:04:53 -05:00
Siebrand Mazeland
954335fa5e Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-10 00:51:16 +01:00
Sarven Capadisli
f396701b64 Updated Cloudy theme for geo 2010-01-09 13:33:13 +01:00
Craig Andrews
055f3fdddb Add an IMAP daemon so StatusNet can process incoming user posts via catch-all mailbox (in addition to the pre-existing script alias method) 2010-01-08 18:52:43 -05:00
Evan Prodromou
e22af049a8 persistent connection flag, default false on cli 2010-01-08 13:21:29 -08:00
Sarven Capadisli
8901e01692 Added i18n text for @title values in geo sharing actions 2010-01-08 18:07:02 +00:00
Sarven Capadisli
febe64625e Focus on the notice textarea after share, minimize, close button actions 2010-01-08 16:51:18 +00:00
Sarven Capadisli
17913d4427 Makes sure that if geo location sharing is disabled, it doesn't use
the HTML output. If cookie is set, use those values for XHR notice post
2010-01-08 16:43:03 +00:00
Sarven Capadisli
064f13f3ab Stores geo view's minimized state in a cookie 2010-01-08 14:23:37 +00:00
Sarven Capadisli
54c18e68da Some code cleaning for geo UI 2010-01-08 13:58:23 +00:00
Sarven Capadisli
69f567c7be Using cookies to minimize lookups to Geonames 2010-01-08 13:36:52 +00:00
Sarven Capadisli
647bbb916c Updated RealtimePlugin to use core json2.js 2010-01-08 13:36:31 +00:00
Sarven Capadisli
0fcd91cf1e Using json2.js 2010-01-08 13:26:48 +00:00
Sarven Capadisli
835a3f1e53 Added minified version of json2.js to parse and stringify JSON objects 2010-01-08 13:21:55 +00:00
Sarven Capadisli
336e67c6d2 Rearranged instructions, system_notice list-style-position 2010-01-08 11:52:59 +00:00
Sarven Capadisli
ce761c7142 Updated plugin info for PoweredByStatusNet 2010-01-08 11:42:03 +00:00
Sarven Capadisli
8d1ee38087 Updated styles for versions page 2010-01-08 11:41:36 +00:00
Sarven Capadisli
5d04e45886 Updated markup for versions page 2010-01-08 11:41:12 +00:00
Sarven Capadisli
a7e73d318a Added Brigitte Schuster (http://brigitteschuster.com) as one of the
contributors to StatusNet. She created the identi.ca, laconi.ca, and
status.net logos.
2010-01-08 10:20:51 +00:00
Evan Prodromou
2aa0ab9777 let system administrators disallow certain admin panels 2010-01-08 01:00:29 -08:00
Evan Prodromou
4f62d685d0 Mapstraction PluginVersion 2010-01-08 00:38:20 -08:00
Evan Prodromou
c57fe7fbf5 PluginVersion for WikiHashtags 2010-01-08 00:29:09 -08:00
Evan Prodromou
87043797bf Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-08 00:21:58 -08:00
Evan Prodromou
054aaa40bf add versions for url-shortener plugins 2010-01-08 00:20:38 -08:00
Zach Copley
20af83d316 Add version info for Facebook, TwitterBridge and RSSCloud plugins 2010-01-08 00:09:23 -08:00
Evan Prodromou
505cd382f3 ptiturl.com correct name 2010-01-07 23:38:19 -08:00
Evan Prodromou
11b19788f5 add version information to GeoURL 2010-01-07 17:58:48 -08:00