wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,427 Commits 8 Branches 0 Tags 330 MiB
bd6571c2e1
Commit Graph

7427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Prodromou
bd6571c2e1 Merge branch 'diskcache' into 0.9.x 2010-01-11 15:34:27 -08:00
Evan Prodromou
57ac912519 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-11 15:12:13 -08:00
Evan Prodromou
6ef70bf5d9 Merge branch 'sessionidparam' into 0.9.x 2010-01-11 15:12:00 -08:00
Evan Prodromou
3b007934e4 strip out session ID from root URL 2010-01-11 15:10:02 -08:00
Evan Prodromou
5d676352c3 strip out session ID from root URL 2010-01-11 15:09:46 -08:00
Brion Vibber
f397d35527 Regression fix: don't spew notices to log every time we get a non-cached user object 2010-01-11 13:24:52 -08:00
Brion Vibber
be1ac6678d fix long options on deleteuser.php 2010-01-11 13:24:40 -08:00
Sarven Capadisli
60d6d73fca Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-11 16:48:02 +01:00
Sarven Capadisli
c7b768b4c8 Removed period 2010-01-11 16:33:46 +01:00
Sarven Capadisli
70bdaeeb09 Explicitly reseting notice_in-reply-to value 2010-01-11 12:19:53 +00:00
Sarven Capadisli
aaea2b1a96 Apparently, I can't spell my family name. 2010-01-11 13:02:04 +01:00
Evan Prodromou
4afa1ce4f3 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-11 00:45:51 -08:00
Evan Prodromou
8809e577b2 Merge branch 'sessionidparam' into 0.9.x 
Conflicts:
	lib/command.php
 2010-01-11 00:45:26 -08:00
Evan Prodromou
92deb35bc4 inject session before redirect for openid finish login 2010-01-11 08:40:41 +00:00
Evan Prodromou
5ec25a9691 inject session before redirect for login 2010-01-11 08:40:22 +00:00
Evan Prodromou
ae7469a127 accept session from 2010-01-11 08:39:02 +00:00
root
6f9bdc5b8a Merge branch 'sessionidparam' of http://git.gitorious.org/~evan/statusnet/evans-mainline into sessionidparam 2010-01-11 07:53:15 +00:00
Evan Prodromou
e0eb51e4bb add session ID to local URL when server parts differ 2010-01-10 23:51:57 -08:00
Evan Prodromou
dd7195346c Sever -> server in error message 2010-01-10 22:59:50 -08:00
Evan Prodromou
ad63a9518c Sever -> server in error message 2010-01-10 22:59:32 -08:00
Evan Prodromou
54d532e12f remove redirect to OTP on login from login, register 2010-01-10 22:58:33 -08:00
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