Zach Copley
9d87313eae
Merge branch '0.9.x' into pluginize-twitter-bridge
...
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
2009-09-08 16:02:57 -07:00
Craig Andrews
beae3db413
Pluginize the URL shorteners
2009-09-03 14:58:50 -04:00
Craig Andrews
5db43f4655
Merge remote branch 'brion/fixlinks' into 0.9.x
2009-09-02 16:48:33 -04:00
Craig Andrews
a535ccdc4e
Merge remote branch 'laconica/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
lib/twitter.php
2009-09-02 16:42:15 -04:00
Zach Copley
8b040eba40
Fixed bug in which you cannot turn off importing friends timelines flag
2009-09-02 00:24:30 +00:00
Brion Vibber
e929bdc2ba
fix some double-escaped %s leading to broken links right smack on the main page
2009-09-01 19:43:56 -03:00
Carlos Perilla
aa7bda4677
Fixes foaf notices, use Profile for information that's missing in Remote_profile
2009-09-01 17:52:03 -04:00
Craig Andrews
70fc32c5b9
added my email address next to my name at the top of the files
2009-08-27 22:56:54 -04:00
Craig Andrews
6ff00c9404
Implement the is_member and membership group api's
2009-08-27 22:55:32 -04:00
Evan Prodromou
5d09b6b3f0
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
df86aa7214
define LACONICA and accept LACONICA for backwards compatibility
2009-08-26 10:41:36 -04:00
Evan Prodromou
3567b9d708
global search and replace for laconica -> statusnet
2009-08-25 18:53:24 -04:00
Evan Prodromou
865b716f09
change LACONICA to STATUSNET
2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b
change controlyourself.ca to status.net
2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c
change laconi.ca to status.net
2009-08-25 18:16:46 -04:00
Evan Prodromou
4737563b95
a distributed -> the distributed
2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1
change Laconica and Control Yourself to StatusNet in PHP files
2009-08-25 18:12:20 -04:00
Evan Prodromou
c87e1de017
Rename Laconica to StatusNet
2009-08-25 17:56:10 -04:00
Zach Copley
9b9d80cd97
Pluginized Twitter settings stuff
2009-08-25 14:52:25 -07:00
Evan Prodromou
ff87732053
Merge branch '0.8.x' into testing
...
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
2009-08-24 16:55:49 -04:00
Zach Copley
ee006dbb0e
Moved some stuff to a base class
2009-08-24 11:53:21 -04:00
Zach Copley
590f21c6a9
Allow removal of Twitter account. Deleted dead code.
2009-08-24 11:53:09 -04:00
Zach Copley
500f0c7072
Make the TwitterQueuehandler post to Twitter using OAuth
2009-08-24 11:52:28 -04:00
Zach Copley
e9edaab358
Twitter OAuth server dance working
2009-08-24 11:52:15 -04:00
Evan Prodromou
c9f9b011c8
use array for events
2009-08-21 16:58:02 -04:00
Evan Prodromou
9aa39c7573
add hooks to allow loading custom help documentation
2009-08-21 16:54:35 -04:00
Evan Prodromou
59beff6b46
Revert "Added configuration option to only allow OpenID logins."
...
This reverts commit 14b46e2183
.
This functionality will need to be rewritten to work with the new
OpenIDPlugin.
Conflicts:
index.php
lib/logingroupnav.php
2009-08-21 16:45:42 -04:00
Evan Prodromou
bacef32aac
Revert "Added a configuration option to disable OpenID."
...
This reverts commit 7dc3a90d12
.
Conflicts:
actions/login.php
actions/register.php
lib/accountsettingsaction.php
lib/common.php
lib/logingroupnav.php
2009-08-21 16:38:39 -04:00
Evan Prodromou
9f356b55c6
Merge branch '0.9.x' into openidplugin
...
Conflicts:
actions/login.php
actions/register.php
2009-08-21 16:27:43 -04:00
Evan Prodromou
b2664e1ae2
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
2009-08-21 15:42:11 -04:00
Evan Prodromou
c78772b274
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
...
Conflicts:
actions/postnotice.php
2009-08-21 08:29:51 -04:00
Evan Prodromou
cb2184ed44
api update correctly checks max length of notices
2009-08-21 08:27:21 -04:00
Evan Prodromou
3565383f77
postnotice for OMB correctly checks max notice size
2009-08-21 08:14:37 -04:00
Evan Prodromou
3eeb9deffb
Web UI for notices correctly shows and checks max content length
2009-08-21 08:13:17 -04:00
Evan Prodromou
2b30d7fffb
register checks Profile bio length correctly
2009-08-21 08:03:40 -04:00
Evan Prodromou
d51d83434d
check and show max bio length in profilesettings
2009-08-21 07:48:30 -04:00
Evan Prodromou
2b2541e4b4
API for direct messages correctly checks length
2009-08-21 07:32:08 -04:00
Evan Prodromou
de5382d4ca
message input form correctly shows and check max length
2009-08-21 07:23:27 -04:00
Evan Prodromou
cd688acceb
allow configurable length for user group description
2009-08-21 06:33:22 -04:00
Adrian Lang
70235d7f05
Update libomb, fix some omb handling stuff, improve error handling.
2009-08-21 12:13:24 +02:00
Marcel van der Boom
418a5a95ab
Change the notice type defines all into class constants and adapt all files.
2009-08-20 13:11:22 -04:00
Christopher Vollick
b4c3453923
Resolve Group Aliases in showgroup.php
...
For Example, let's say 'alias' was an alias for the group 'group'.
Previously, if you went to '/group/group' it'd work, but '/group/alias' it'd say "No Such Group".
This was untrue.
Now it checks aliases when it can't find a group with a given name.
If it finds one it redirects you to the original group.
2009-08-19 09:37:27 -04:00
Craig Andrews
136a69a387
Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x
2009-08-16 19:50:37 -04:00
brion
46c77b83b1
Fix bug bug 1563 "opensearch content type incorrectly set"
...
http://laconi.ca/trac/ticket/1563
OpenSearch description info is now sent with correct Content-Type: application/opensearchdescription+xml instead of text/html.
2009-08-16 19:46:44 -04:00
Evan Prodromou
b936a5166d
Revert "Revert "Return a 404 when a page is request that has no notices""
...
This reverts commit 1b204fde39
.
2009-08-16 10:37:15 -04:00
Evan Prodromou
e0815de960
Revert "Revert "Return a 404 when a page is request that has no notices""
...
This reverts commit 6c597eabec
.
2009-08-16 10:37:04 -04:00
Evan Prodromou
6c597eabec
Revert "Return a 404 when a page is request that has no notices"
...
An empty list still exists; we should not return a 404 for empty lists.
This reverts commit 355effe631
.
2009-08-14 13:05:57 -07:00
Evan Prodromou
1b204fde39
Revert "Return a 404 when a page is request that has no notices"
...
An empty list still exists; we shouldn't return a 404.
This reverts commit c29892c875
.
2009-08-14 13:05:29 -07:00
Jeffery To
7dc3a90d12
Added a configuration option to disable OpenID.
...
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.
If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
2009-08-13 22:18:06 +08:00
Evan Prodromou
7d33478e86
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-12 10:50:46 -07:00