Commit Graph

1934 Commits

Author SHA1 Message Date
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
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
Craig Andrews
c29892c875 Return a 404 when a page is request that has no notices 2009-08-11 22:48:35 -04:00
Craig Andrews
355effe631 Return a 404 when a page is request that has no notices 2009-08-11 22:09:02 -04:00
Craig Andrews
7eda7295e4 oEmbed provider does not use the twitter api library classes any more 2009-08-11 21:15:42 -04:00
Evan Prodromou
01dccefccc reformat newnotice.php 2009-08-11 11:18:24 -04:00
Jeffery To
a459313e10 Updated Jcrop to 0.9.8 (avatar cropping wasn't working in IE7 with 0.9.5) 2009-08-11 20:29:45 +08:00
Adrian Lang
77037b3cc3 UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo. 2009-08-10 16:34:56 -04:00
Craig Andrews
e9ed20a69d Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x 2009-08-10 11:53:35 -04:00
Adrian Lang
ec88d2650e Replace own OMB stack with libomb. 2009-08-10 14:48:50 +02:00
Zach Copley
17dcf1c317 Merge branch 'twitter-oauth' into 0.8.x
Conflicts:

	scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
Zach Copley
27548c6903 I forgot that we don't do database upgrades for point releases. So I've
changed Twitter OAuth to store token and token secret in the same field
in foreign_link (credentials).  This should be changed in 0.9.
2009-08-10 07:00:59 +00:00
Zach Copley
fa8433308f Moved some stuff around. More comments and phpcs compliance. 2009-08-10 06:05:43 +00:00
Jeffery To
14b46e2183 Added configuration option to only allow OpenID logins.
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.

The user will still need to set a password to access the API and RSS
feeds.
2009-08-10 13:57:39 +08:00
Zach Copley
df12206421 Broke some stuff out into functions. Ran it through phpcs. 2009-08-08 18:13:19 +00:00
Zach Copley
e3bb64cd6c Merge branch '0.8.x' into twitter-oauth 2009-08-08 18:11:47 +00:00
Sarven Capadisli
fe3ce5b6c4 Fixed typo "thier". Ticket 1606 2009-08-08 17:45:53 +02:00
Craig Andrews
a7a87913be Redirect instead of showing an error when the user visits a non-local notice's url
Use consistent logic in display non-local notice links

Fixes http://laconi.ca/trac/ticket/1788
2009-08-07 18:26:12 -04:00
Craig Andrews
11086c7823 Implemented the list_all and list groups API methods as defined at http://laconi.ca/trac/wiki/ProposedGroupsAPI
Made the Autocomplete plugin also autocomplete groups
2009-08-07 18:00:04 -04:00
Adrian Lang
ee9bfa7158 UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo. 2009-08-07 12:21:36 +02:00
Craig Andrews
91cba7a76f Merge commit 'jeff-themovie/0.8.x-rss-1.0-descriptions' into 0.8.x 2009-08-06 22:45:09 -04:00
Craig Andrews
1c3a1360a9 Merge commit 'jeff-themovie/0.8.x-subsystems-enabled' into 0.8.x 2009-08-06 22:38:06 -04:00
Craig Andrews
26b608d914 Support the 'lite' parameter to statuses/friends and statuses/followers twitter api methods.
http://laconi.ca/trac/ticket/1786
2009-08-06 15:14:27 -04:00
Jeffery To
5f293f0e2f Added configuration option to disable post-by-email.
This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled.
2009-08-07 01:55:31 +08:00
Jeffery To
c261a645a1 Hide subscription controls for disabled services (IM, SMS) 2009-08-07 01:34:36 +08:00
Jeffery To
93f585446e Added configuration options to enable/disable SMS and Twitter integration.
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
2009-08-07 01:18:17 +08:00
Jeffery To
adc5901d21 Make RSS 1.0 channel descriptions more consistent with RSS 2.0 and Atom descriptions 2009-08-06 23:36:24 +08:00
Craig Andrews
304db1d30b Use script() and cssLink() methods everywhere instead of manually writing out javascript and css each time 2009-08-05 19:45:12 -04:00
Craig Andrews
83ff1cecd3 Use NICKNAME_FMT everywhere consistently 2009-08-05 16:26:19 -04:00
Evan Prodromou
5dc1291b59 move openid instructions to OpenIDPlugin 2009-08-04 13:27:22 -04:00
Evan Prodromou
2ed46ce274 move XRDS code from public action to OpenIDPlugin 2009-08-04 13:04:31 -04:00
Evan Prodromou
4586e15f45 fix comment to note that xrds file is for OMB not OpenID 2009-08-04 13:01:23 -04:00
Evan Prodromou
3997682d26 incorrectly moved user xrds to OpenID plugin; fixing 2009-08-04 13:01:23 -04:00
Evan Prodromou
93239adb55 remove unused openid lib from logout action 2009-08-04 13:01:23 -04:00
Evan Prodromou
2b79b4d21f Move OpenID-related files to OpenID plugin directory
As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
2009-08-04 13:01:23 -04:00
Evan Prodromou
a321651a13 use 410 Gone for Twitter API 2009-08-04 06:05:04 -04:00
Evan Prodromou
3ebf817e36 use 410 Gone for deleted notices 2009-08-04 06:05:04 -04:00
Zach Copley
f94ee5597d Moved some stuff to a base class 2009-08-04 00:46:18 +00:00
Zach Copley
1f9d1772c0 Allow removal of Twitter account. Deleted dead code. 2009-08-04 00:02:07 +00:00
Zach Copley
dccd4aa68d Merge branch '0.8.x' into twitter-oauth 2009-08-03 22:47:57 +00:00
Zach Copley
981fa1b33a Make the TwitterQueuehandler post to Twitter using OAuth 2009-08-03 22:46:01 +00:00
Craig Andrews
92ef468fcc Use the same favorite notification function in the API as everywhere else
http://laconi.ca/trac/ticket/873
2009-08-03 11:47:58 -04:00
Jeffery To
20c536fdd4 Fixed PHP Notice "Undefined variable: cnt" 2009-08-02 19:52:27 +08:00
Jeffery To
fe57e2e06b Fixed PHP Notice "Undefined variable: suplink" 2009-08-02 19:47:36 +08:00
Zach Copley
6f4b2f0ac2 Twitter OAuth server dance working 2009-08-01 08:20:44 +00:00
Craig Andrews
ec103b90e3 Implemented the "show" method of the laconica groups api 2009-07-30 22:15:24 -04:00
Evan Prodromou
a79a860d81 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-07-28 10:02:39 -04:00
Craig Andrews
e804b2a500 trim the subject line of invite emails
Thanks semjaza

http://laconi.ca/trac/ticket/1746
2009-07-27 16:02:03 -04:00
Evan Prodromou
7835393c25 change front page to link to max member groups 2009-07-27 15:07:39 -04:00
Eric Helgeson
abae937947 Changed file back to 0644.
Blame: 0adaaa1b9d
2009-07-22 10:21:49 -05:00
Steve Winton
0adaaa1b9d Added hidden input to showRecoverForm() so form can be submitted without error in IE by pressing <return> 2009-07-21 16:40:51 -04:00
Craig Andrews
c74943e598 I can't believe I forgot to commit this as part of 9ed117d... wow. Epic fail. Epic. 2009-07-17 23:16:29 -04:00
Craig Andrews
f1fc392e2d Fix OpenId cancelled / error message
Thanks jeff-themovie
2009-07-17 22:55:59 -04:00
Craig Andrews
3dbbefd5ad Merge branch 'oembed-provider' into 0.8.x 2009-07-17 12:33:56 -04:00
Craig Andrews
9ed117dc3a Move the oembed endpoint to /main/oembed 2009-07-17 12:33:12 -04:00
Evan Prodromou
eb22f06ac6 conversation action is readonly 2009-07-15 16:57:39 -04:00
Craig Andrews
6308539c1d Added oEmbed discovery for attachments and notices 2009-07-15 15:11:29 -04:00
Craig Andrews
e637e5a8a9 Support oembed for attachments and notices 2009-07-15 14:49:41 -04:00
Craig Andrews
0aeea42724 Added stub oembed api endpoint 2009-07-15 10:29:54 -04:00
Craig Andrews
e047ba52c7 Merge branch 'tags-timeline-api' into 0.8.x 2009-07-13 14:58:39 -04:00
Craig Andrews
91324890ae Add timeline tags API (RSS 2.0 and Atom feeds) 2009-07-12 15:07:54 -04:00
Craig Andrews
7654d69022 Fix atom self reference in the groups api 2009-07-12 15:06:37 -04:00
Zach Copley
7621e0e384 Fix link for atom feed in showgroup action 2009-07-10 20:13:12 -07:00
Zach Copley
6b0468358b Group timeline API method doesn't require auth 2009-07-10 18:15:18 -07:00
Zach Copley
7308203065 Update showgroup action RSS 2.0 feed link 2009-07-10 18:11:54 -07:00
Zach Copley
c13dd856c8 Fix alternate link for groups API feed 2009-07-10 18:08:10 -07:00
Zach Copley
544a14d290 Move groups timeline API method into groups API action 2009-07-10 17:56:01 -07:00
Zach Copley
5b3d4f7121 Merge branch 'candrews-review' into 0.8.x
* candrews-review:
  added group status api, located at /api/statuses/group_timeline/ID.rss
2009-07-10 16:11:31 -07:00
Zach Copley
4a1d7ad082 Merge branch 'candrews-review' into 0.8.x 2009-07-10 21:03:44 +00:00
Craig Andrews
08d50655f3 added group status api, located at /api/statuses/group_timeline/ID.rss
http://laconi.ca/trac/ticket/1702
2009-07-10 17:00:27 -04:00
Evan Prodromou
bafa1ab1c5 Merge branch '0.7.x' into 0.8.x
Conflicts:
	README
	actions/twitapiusers.php
2009-07-10 10:03:57 -07:00
Craig Andrews
8250006fbf When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links.
http://laconi.ca/trac/ticket/1685
2009-07-09 18:42:19 -04:00
Zach Copley
c981f5bcec Merge branch 'candrews-review' into 0.8.x
* candrews-review:
  maildaemon makes mail attachments into notice attachments
  File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-09 11:22:07 -07:00
Zach Copley
802b909518 user/show API method needs to fall back to basic auth so that
verify_credentials works correctly.
2009-07-07 14:21:44 -07:00
Craig Andrews
5f72423523 File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web 2009-07-07 15:55:10 -04:00
CiaranG
d846c5fc99 Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x 2009-07-07 20:53:28 +01:00
Zach Copley
4fffe1874f Fix redundant page display for group design settings 2009-07-06 16:44:35 -07:00
Zach Copley
195ec6820b fix bad function call
Conflicts:

	actions/twitapiusers.php
2009-07-06 15:56:10 -07:00
Dan Moore
a9c1e66570 Bringing users/show in line with Twitter as far as specifying user. 2009-07-06 15:51:17 -07:00
Zach Copley
91684830e5 fix bad function call 2009-07-06 15:49:26 -07:00
Zach Copley
701a237e8c Merge branch 'mgrdcm-review' into 0.7.x
* mgrdcm-review:
  Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:48:14 -07:00
Zach Copley
5e067c2c81 Add special basic auth handling for friendships/show. Other fixups. 2009-07-06 13:21:16 -07:00
Zach Copley
d40075ae9c Support undocumented 'id' parameter in /statuses/show API method 2009-07-06 11:57:21 -07:00
Evan Prodromou
e6c54a59e1 set/get viewdesigns flag and use it 2009-07-05 14:33:12 -04:00
Zach Copley
e3c70cc30c Merge branch 'friendships_show' into 0.8.x
* friendships_show:
  Implement friendships/show API method
  Route and stub for new friendships/show API method
2009-07-03 15:43:14 -07:00
Zach Copley
a2a4cc35f6 Implement friendships/show API method 2009-07-03 15:42:12 -07:00
Evan Prodromou
088fa6befc null for both args in conversation 2009-07-03 10:48:15 -04:00
Evan Prodromou
e2f8b8d65d no limit on conversation stream 2009-07-03 10:40:23 -04:00
Evan Prodromou
04c713e671 fixed limit for conversations 2009-07-03 10:37:39 -04:00
Evan Prodromou
72d0ee4e25 move peoplesearchresults class to action/peoplesearch 2009-07-03 10:10:12 -04:00
Evan Prodromou
f73d93fa7a only show subscription controls to owner 2009-07-03 01:26:21 -04:00
Zach Copley
acb4c78346 Route and stub for new friendships/show API method 2009-07-02 17:32:27 -07:00
Zach Copley
bca3b3d36f Send null as 2nd arg, not 3rd. 2009-07-02 15:09:48 -07:00
Evan Prodromou
d04ab14a5a Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-07-02 08:22:09 -04:00
Evan Prodromou
aea546c122 notice should show user design 2009-07-02 08:21:54 -04:00
Evan Prodromou
b4de1d4636 favorites should show owner design 2009-07-02 08:21:41 -04:00
Zach Copley
0e78e1cc52 Show HTML for thumbnails instead of redirecting. Remove dead code. 2009-07-01 16:24:22 -07:00
Evan Prodromou
90557e9147 correctly return count of notices 2009-07-01 14:45:48 -04:00
Evan Prodromou
0057f3da81 show all the notices, not just latest 20 2009-07-01 14:45:09 -04:00
Evan Prodromou
3b6ff92495 don't redirect on local file for ajax action 2009-07-01 13:50:44 -04:00
Dan Moore
fbb7757c4b Cleaning up comments at top of favor.php. 2009-06-30 17:04:49 -07:00
Zach Copley
ed21af0d1d Merge branch 'mgrdcm-review' into 0.7.x
* mgrdcm-review:
  Cleaning up comments at top of favor.php.
2009-06-30 17:02:51 -07:00
Zach Copley
ccbc5c447d Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes':
  Fix missing max_id in API search calls
  Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
  Fix "Trying to get property of non-object" errors when accessing the people search results page
  Fix "Undefined variable: cnt"
  Fix "Trying to get property of non-object" errors in groupeditform.php
  Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley
b10dba2798 Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Zach Copley
190d45cd05 Merge commit 'jeff-themovie/notice-search-no-results' into 0.8.x
* commit 'jeff-themovie/notice-search-no-results':
  Fixes the notice search RSS feeds / API results for searches that return no matches.
2009-06-30 15:38:14 -07:00
Zach Copley
c2c631d19d Merge commit 'jeff-themovie/group-rss-empty' into 0.8.x
* commit 'jeff-themovie/group-rss-empty':
  Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices.
2009-06-30 15:12:50 -07:00
Zach Copley
907b5f7b40 Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
* commit 'erichelgeson/no-posts-verbage':
  Needed the else. Tested logged in/out ; site closed/inviteonly/both
  Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-30 14:57:19 -07:00
Evan Prodromou
c5ce56b878 calculate date once for SUP 2009-06-30 11:53:50 -04:00
Evan Prodromou
4e6cd42757 conversation code changes 2009-06-30 11:50:16 -04:00
Zach Copley
c01e8c0bd1 Fixed grammar in class comment blocks 2009-06-29 17:04:09 -07:00