Commit Graph

7706 Commits

Author SHA1 Message Date
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
root
ac6762ce38 Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin 2010-01-10 00:31:37 +00:00
Evan Prodromou
deb5ee6154 correct superglobal variable name 2010-01-09 16:31:25 -08:00
root
4ffc28e1a5 Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin 2010-01-10 00:24:20 +00:00
Evan Prodromou
6d66a28b35 Use OTP to set cookies from registration action 2010-01-09 16:23:41 -08:00
Evan Prodromou
5ca41b6870 redirect to sitename.wildcard for SSL 2010-01-09 16:19:45 -08: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
root
1b9fd1fe53 Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin 2010-01-09 23:38:51 +00:00
Evan Prodromou
ed5828f30e Redirect to a one-time-password when ssl and regular server are different 2010-01-09 15:26:06 -08:00
root
d59df6b270 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2010-01-09 23:25:08 +00:00
Evan Prodromou
a180658a3b Merge branch 'inblob' of git@gitorious.org:~evan/statusnet/evans-mainline into inblob
Conflicts:
	classes/Inbox.php
	classes/Notice.php
	classes/Notice_inbox.php
2010-01-09 14:19:59 -08:00
Evan Prodromou
1554510c84 Merge branch '0.9.x' into inblob 2010-01-09 14:03:09 -08:00
Evan Prodromou
2db840b2f5 use Inbox in twitterstatusfetcher 2010-01-09 14:02:01 -08:00
Evan Prodromou
d902de139c change PuSH plugin to use whoGets() 2010-01-09 13:59:39 -08:00
Evan Prodromou
9cfea6d051 use whoGets() for realtime plugin 2010-01-09 13:56:54 -08:00
Evan Prodromou
96e51dad4b whoGets() method for Notice 2010-01-09 13:55:54 -08:00
Evan Prodromou
5e81149e47 create new Inbox from Notice_inbox if not exists at read/write time 2010-01-09 10:26:50 -08:00
Evan Prodromou
920c878221 initialize an Inbox from Notice_inbox records 2010-01-09 10:02:07 -08:00
Evan Prodromou
2272438698 remove triminboxes.php; it's no longer used 2010-01-09 10:02:07 -08:00
Evan Prodromou
1de0f37f0d disable all Notice_inbox functions 2010-01-09 10:02:07 -08:00
Evan Prodromou
72934e9f50 Revert "Replace Notice_inbox with Inbox"
We use Notice_inbox to transition to Inbox.

This reverts commit 7640d3f07b.
2010-01-09 10:02:07 -08:00
Evan Prodromou
1e7ec69190 some formatting changes to make inblobs work 2010-01-09 10:02:07 -08:00
Evan Prodromou
f2a403589c Use inbox instead of notice_inbox 2010-01-09 10:02:07 -08:00
Evan Prodromou
7ec27b657e Replace Notice_inbox with Inbox 2010-01-09 10:02:07 -08:00
Evan Prodromou
475bf6010f flip exe bit 2010-01-09 10:01:21 -08:00
Evan Prodromou
8b2f6c01fb add inbox data class 2010-01-09 10:01:21 -08:00
Evan Prodromou
922db17259 add an inbox blob table 2010-01-09 10:01:20 -08: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