GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
7,529 Commits 8 Branches 4 Tags 310 MiB
28329bd2b3
Commit Graph

7529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siebrand Mazeland
f182d613aa Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-11 01:24:20 +01: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
root
bed903d61c Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin 2010-01-10 08:24:00 +00:00
Evan Prodromou
8c6ec0b59e fix check for ssl diff in login 2010-01-10 00:23:26 -08:00
root
ef0e0116c2 Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin 2010-01-10 08:20:29 +00:00
Evan Prodromou
e2dee5fedb always set site/server to hostname if it exists 2010-01-10 00:20:08 -08:00
Evan Prodromou
06ed0bc791 correctly check for ssl enabled 2010-01-10 00:19:46 -08:00
Evan Prodromou
304f3b4f18 correctly check for ssl enabled 2010-01-10 00:18:17 -08:00
root
d636bee4c0 Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin 2010-01-10 06:49:48 +00:00
Evan Prodromou
3d723ed1ed allow hostname with SSL 2010-01-09 22:49:26 -08:00
Evan Prodromou
e8d85a1ef5 use nickname, not sitename, in domain for SSL 2010-01-09 22:48:05 -08: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
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