Commit Graph

2529 Commits

Author SHA1 Message Date
Brion Vibber
9fadf8da11 Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Brion Vibber
4a2511139e Initial user role controls on profile pages, for owner to add/remove administrator and moderator options.
Buttons need to be themed.
2010-03-03 15:43:49 -08:00
Zach Copley
337b1aaaa1 Site-wide notice text admin panel 2010-03-03 14:37:30 -08:00
Sarven Capadisli
2a96d1d59d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 16:27:19 -05:00
Sarven Capadisli
6ff994b14c Fix to group join event position. 2010-03-03 16:25:17 -05:00
Brion Vibber
c04c8ae59a quick fix: skip notice from unused variable on group atom feed generation 2010-03-03 13:00:09 -08:00
Sarven Capadisli
13713a09bb Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 15:31:44 -05:00
Sarven Capadisli
2ce9ae004d Added event hooks for before and after user groups content 2010-03-03 15:29:51 -05:00
Zach Copley
09169d6f3c Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Language setting fixes:
2010-03-03 12:11:20 -08:00
Zach Copley
82ea0f7884 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  subscribers list wasn't firing correct events
2010-03-03 12:10:48 -08:00
Brion Vibber
0881eba80e Language setting fixes:
- switch 'en_US' to 'en', fixes the "admin panel switches to Arabic" bug
- tweak setting descriptions to clarify that most of the time we'll be using browser language
- add a backend switch to disable language detection (should this be exposed to ui?)
2010-03-03 12:10:43 -08:00
Zach Copley
2f167f2663 Fix syntax errors 2010-03-03 12:10:21 -08:00
Evan Prodromou
c82efb7fd8 subscribers list wasn't firing correct events 2010-03-03 15:09:07 -05:00
Sarven Capadisli
b65ee23e82 Added event hooks for group subscribe 2010-03-03 12:01:38 -05:00
Brion Vibber
ddf3614c84 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-02 13:38:10 -08:00
Brion Vibber
72460091dd Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 12:21:48 -08:00
Brion Vibber
6b134ae4c7 Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
Sarven Capadisli
350e1289af Added event hook for before and after personal timeline content 2010-03-02 12:33:25 -05:00
Siebrand Mazeland
767d49495d Add translator documentation
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:45:15 +01:00
Siebrand Mazeland
d08fd8254a Document 404 "Page not found" server error for translators. 2010-03-02 17:30:22 +01:00
Siebrand Mazeland
53ac232f91 Documented all but one UI string in actions/accessadminpanel.php to get a feel on what documenting them in code actually means.
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:23:40 +01:00
Siebrand Mazeland
284b1dc014 * Change translator documentation using _m() as designed together with Brion
* Add more translator documentation

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
Brion Vibber
493b5479c1 OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
Plus misc warnings/notices cleanup in the submission path.
2010-03-01 16:43:36 -08:00
Evan Prodromou
656a977016 remove strict check on OMB exception strings 2010-03-01 18:03:18 -05:00
Evan Prodromou
c7d8641e7d return correct HTTP status code for OMB errors 2010-03-01 18:03:18 -05:00
Evan Prodromou
1414b6b849 send smaller error pages for OMB API endpoints 2010-03-01 18:03:18 -05:00
Siebrand Mazeland
8e102da76c Add contextual documentation to allow better localisation. 2010-03-01 22:28:38 +01:00
Siebrand Mazeland
63ff9d86b8 Add content for all 3 Send buttons (2 are the same as far as I can tell) 2010-03-01 15:57:27 +01:00
Siebrand Mazeland
78ea4c711e Add context for Send button on invite.php 2010-03-01 15:49:53 +01:00
Brion Vibber
9b366547d7 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-26 12:33:50 -08:00
Brion Vibber
88ae7f53bb Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-26 12:33:13 -08:00
Christopher Vollick
c95daacfdb Updated ShowGroup to Resolve Aliases Again.
The way we find groups changed with this new Local_group table.
I had to update this too.
2010-02-26 12:30:23 -08:00
Evan Prodromou
fc576562a3 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 12:40:59 -05:00
Evan Prodromou
6781f95c73 Merge branch 'blacklistplus' into testing
Conflicts:
	EVENTS.txt
2010-02-26 12:40:30 -05:00
Brion Vibber
8dfc8f1635 Merge branch 'testing' into 0.9.x 2010-02-26 09:35:28 -08:00
Michele
6ae39da198 Fixed object name 2010-02-26 11:35:55 +01:00
Zach Copley
6cc26a613b Remove unnecessary requires 2010-02-25 22:08:25 -08:00
Zach Copley
e650794300 Remove unnecessary requires 2010-02-25 22:06:31 -08:00
Zach Copley
c49fbb63c5 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  init_conversation.php script to copy old notice conversations into the conversation table
  cache results of webfinger lookups
  Parse an hcard for hints, if available
  use new hcard method for webfinger
  add hkit for hCard parsing
  use new dedicated hcard method for Webfinger profile
  Add an hcard action
2010-02-25 18:13:34 -08:00
Zach Copley
792f0942f7 Fix atom feed IDs in user and group atom feeds 2010-02-25 18:13:06 -08:00
Evan Prodromou
4aa82f75ed Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 18:45:32 -05:00
Evan Prodromou
76216af806 Add an hcard action
A dedicated hcard action for users. Our profile page includes
an hcard, but it's so full of other hcards that it's ambiguous which
one is the "real" one. So, this one make sense for meaning, "This is
my hcard."
2010-02-25 18:39:55 -05:00
Brion Vibber
e254c660f6 Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject 2010-02-25 15:22:23 -08:00
Brion Vibber
b5b5184c88 OStatus: fix remote groups to work with new user_groups/local_groups split.
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
  while the rest of the groups UI remains limited to local groups
  (plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
Evan Prodromou
d53b4b9b84 save mainpage element for groups 2010-02-25 12:05:22 -05:00
Evan Prodromou
e6858d7203 modify group actions so they use Local_group to look up by nickname 2010-02-25 08:44:15 -05:00
Craig Andrews
c187bf5597 Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
2010-02-24 20:52:45 -05:00
Brion Vibber
59be4b8cae Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-24 15:47:51 -08:00
Evan Prodromou
1bffe42413 Drop user-only requirement for subscribe action
I removed the check for local users in the subscribe button. I replaced
it with a more specific check for OMB 0.1 remote profiles, which you
can't use with this action.

I also took the opportunity to split the handle() method into
prepare() and handle(), and added PHPCS clean documentation.
2010-02-23 08:38:23 -05:00
Brion Vibber
d410df0406 OStatus group delivery initial implementation.
- added rel="ostatus:attention" links for group delivery
- added events for plugins to override group profile/permalink pages
- pulled Notice::saveGroups up to save-time so we can override;
  it's relatively cheap and gives us a clean list of target
  groups for distrib time even with customized delivery.
- fixed notice::getGroups to return group objects as expected
- added some doc on new parameters to Notice::saveNew
 - 'groups' list of group IDs to push to in place of parsing
- messages that come in via PuSH and contain local group targets
  are delivered to local group members
- messages that come in via PuSH and contain remote group targets
  are delivered to local members of the remote group

Todo:
- handle group posts that only come through Salmon
- handle conflicts in case something comes in both through Salmon and PuSH
- better source verification
- need a cleaner interface to look up groups by URI
- need a way to handle remote groups with conflicting names
2010-02-23 00:44:45 +00:00
Sarven Capadisli
c88507fe11 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-22 17:08:54 +01:00
Evan Prodromou
13ad48fab3 Merge branch 'master' into testing 2010-02-22 11:04:11 -05:00
Evan Prodromou
5a6967db6c clear the site owner when profile changes 2010-02-22 11:03:56 -05:00
Sarven Capadisli
8ccc9e2c38 Added before and after event hooks for subscriptions content 2010-02-22 17:03:28 +01:00
Brion Vibber
3c61f45de1 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-21 18:56:41 -08:00
Brion Vibber
f6ebe81538 Performance fix for FriendFeed sup interface: MySQL query optimizer was doing a table scan on notice; explicit subquery makes it run much more efficiently, only scanning items within the period under consideration. Standard subquery should be PostgreSQL-compatible. 2010-02-21 15:21:18 -08:00
Brion Vibber
85528ccb1f Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-21 11:12:56 -08:00
Brion Vibber
3e7a2a4014 Fix for doc action on systems that return false for globbing in a non-existing dir 2010-02-21 11:11:37 -08:00
Evan Prodromou
a3de4caf49 make sure argument to Fave::addNew() is a profile 2010-02-20 20:31:06 -05:00
Evan Prodromou
f3b08461bd Change to use TagURI::base() instead of common_config()
I changed the way that tag: URIs are minted, so we now use the right
base. Ideally most of these would use HTTP URIs instead, but for
now at least they use the right base.
2010-02-20 13:31:20 -05:00
Evan Prodromou
b0a75a2ab2 replace calls to subs_(un)subscribe_user with Subscription methods 2010-02-19 08:31:20 -05:00
Brion Vibber
5a6cbb248f Merge branch 'testing' into 0.9.x 2010-02-17 10:14:08 -08:00
Brion Vibber
880acb05b0 OStatus: temporary output mode hack for apitimelineuser until PuSH feed generation is updated to use the shared code instead of output buffering 2010-02-16 22:04:57 +00:00
Craig Andrews
20d6a7caed Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
	lib/xmppmanager.php
	plugins/Xmpp/Fake_XMPP.php
	scripts/imdaemon.php
2010-02-16 13:15:09 -05:00
Brion Vibber
d5cbfe8071 Merge branch 'testing' into 0.9.x
Conflicts:
	lib/iomaster.php
2010-02-16 09:25:09 -08:00
Craig Andrews
32084e33a2 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-02-16 10:25:57 -05:00
Zach Copley
f3a82e787c Add OStatus PuSH hub and Salmon links back into user and group feeds 2010-02-12 19:02:27 -08:00
Brion Vibber
f8a459a88a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-12 15:32:12 -08:00
Zach Copley
506c2d7491 Initial upgraded Atom output for group timelines 2010-02-12 12:24:29 -08:00
Brion Vibber
122c8677b7 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-12 11:18:35 -08:00
Zach Copley
c465f675d9 Make Atom timelines in the API use Atom10feed 2010-02-11 13:56:05 -08:00
Zach Copley
e2c0f59414 Some upgrades to Atom output for OStatus 2010-02-11 13:56:05 -08:00
Zach Copley
ce3c3be1bf Utility classes for atom feeds 2010-02-11 13:56:05 -08:00
Brion Vibber
c4557d4d07 Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-02-10 11:12:11 -08:00
Brion Vibber
8449256817 OStatus partial support for group subscriptions:
* detection of group feeds is currently a nasty hack based on presence of '/groups/' in URL -- should use some property on the feed?
* listing for the remote group is kinda cruddy; needs to be named more cleanly
* still need to establish per-author profiles (easier once we have the updated Atom code in)
* group delivery probably not right yet
* saving of group messages still triggering some weird behavior

Added support for since_id and max_id on group timeline feeds as a free extra. Enjoy!
2010-02-09 18:32:52 -08:00
Zach Copley
70d5f39ed6 Better checking for duplicate app names 2010-02-08 21:57:29 -08:00
Zach Copley
2600ad9643 Better checking for duplicate app names 2010-02-08 21:56:47 -08:00
Zach Copley
602b01a755 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Pull GeoRSS locations over OStatus feeds
  Allow scripts/decache.php to blow out cache for objects that don't exist (anymore).
  OStatus cleanup...
  readme and version for beta5
  Delete old Twitter user record when user changes screen name instead of updating. Simpler.
  Store Twitter screen_name, not name, for foreign_user.nickname when saving Twitter user.
  Actually store the timestamp on each nonce
  OAuth app name should not be null
  Fix issue with OAuth request parameters being parsed/stored twice when
  - Fix cache handling in TwitterStatusFetcher
  Added right margin for notice text. Helps Conversation notices look
  Confirm dialog for reset OAuth consumer key and secret button
  Always check for an OAuth request. This allows OAuth clients to set an
  Linkify notice source when posting from registered OAuth apps
  Suppress notice input box on OAuth authorization page
  Better token revocation
  Allow developers to delete OAuth applications
  OAuth app names should be unique.
  Prevents app statistic text from wrapping around avatar
  Sentence case for app statistics
2010-02-08 21:55:32 -08:00
Zach Copley
b56b154b51 Better checking for duplicate app names 2010-02-08 21:52:05 -08:00
Brion Vibber
bc4e843f39 Disable deprecated 'since' parameter on public_timeline API; causes performance problems. (since_id will work cleanly) 2010-02-08 19:22:55 -08:00
Brion Vibber
b2e8d8407c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-08 15:48:52 -08:00
Brion Vibber
384387c9b0 OStatus cleanup...
* Treat linkless feed posts as status updates; drop the "New post:" prefix and quotes on them.
* Use stable user IDs for atom/rss2 feed links instead of unstable nicknames
* Pull Atom feed preferentially when subscribing -- can now put the remote user's profile page straight into the feed subscription form and get to the right place.
* Clean up naming for push endpoints
2010-02-08 14:58:12 -08:00
Brion Vibber
dc09453a77 First steps on converting FeedSub into the pub/sub basis for OStatus communications:
* renamed FeedSub plugin to OStatus
* now setting avatar on subscriptions
* general fixes for subscription
* integrated PuSH hub to handle only user timelines on canonical ID url; sends updates directly
* set $config['feedsub']['nohub'] = true to test w/ foreign feeds that don't have hubs (won't actually receive updates though)
* a few bits of code documentation
* HMAC support for verified distributions (safest if sub setup is on HTTPS)

And a couple core changes:
* minimizing HTML output for exceptions in API requests to aid in debugging
* fix for rel=self link in apitimelineuser when id given

This does not not yet include any of the individual subscription management (Salmon notifications for sub/unsub, etc) nor a nice UI for user subscriptions.
Needs some further cleanup to treat posts as status updates instead of link references.
2010-02-08 11:15:29 -08:00
Evan Prodromou
a092aac32d add events to fine-tune user deletion 2010-02-06 12:59:41 +01:00
Evan Prodromou
5fdcd88176 Moderator can make users admins of a group 2010-02-06 11:36:59 +01:00
Zach Copley
ff509feff0 Updated /api/statusnet/config.xml to show new config params potentially relevant to client devs 2010-02-05 13:40:00 -08:00
Michele
b65ed56c7a API config return textlimit value 2010-02-05 13:12:49 -08:00
Zach Copley
23802e58d6 Merge branch 'temp' 2010-02-05 03:19:12 +00:00
Zach Copley
4379027432 Fix issue with OAuth request parameters being parsed/stored twice when
calling /api/account/verify_credentials.:format
2010-02-05 03:18:45 +00:00
Zach Copley
7931875bbb Confirm dialog for reset OAuth consumer key and secret button 2010-02-05 03:18:44 +00:00
Zach Copley
e9ecd8062a Suppress notice input box on OAuth authorization page 2010-02-05 03:18:44 +00:00
Zach Copley
b31c79cee1 Better token revocation 2010-02-05 03:18:43 +00:00
Zach Copley
e495ac356c Allow developers to delete OAuth applications 2010-02-05 03:18:43 +00:00
Zach Copley
dc183f23cf OAuth app names should be unique. 2010-02-05 03:18:43 +00:00
Sarven Capadisli
52397f1474 Sentence case for app statistics 2010-02-05 03:18:43 +00:00
Zach Copley
6cf5df505a Fix issue with OAuth request parameters being parsed/stored twice when
calling /api/account/verify_credentials.:format
2010-02-05 02:09:50 +00:00
Zach Copley
8d320d7cc2 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-05 02:08:37 +00:00
Zach Copley
5e0cc07b0e Fix issue with OAuth request parameters being parsed/stored twice when
calling /api/account/verify_credentials.:format
2010-02-05 01:13:23 +00:00
Eric Helgeson
2eadeca745 Missed change when refactoring groups. Thanks macno 2010-02-04 14:00:46 -08:00
Eric Helgeson
37f3a3d558 Missed change when refactoring groups. Thanks macno 2010-02-04 14:00:06 -08:00
Brion Vibber
0d0749e224 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-04 13:12:18 -08:00
Brion Vibber
ed8553eea8 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-04 13:11:41 -08:00
Brion Vibber
239b88025e Should fix spurious 'nickname taken' and 'email taken' errors on registration. Form's checks for existing nicks & emails would incorrectly return true on the second lookup due to bad interaction with negative caching.
(was checking $obj !== false but we return null now on negative cache hits, with false for cache misses)
2010-02-04 13:08:34 -08:00
Brion Vibber
c59eee72a8 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-04 12:23:56 -08:00
Brion Vibber
a020e23086 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-04 11:56:07 -08:00
Brion Vibber
5a1cbdc6f1 Add time-based cutoffs for public tag cloud, favorited lists to speed up those queries.
Defaulting to only looking at last 90 days of activity, can be adjusted up or down.

$config['tag']['cutoff'] = 86400 * 90;
$config['popular']['cutoff'] = 86400 * 90;

Per-user and per-group tag clouds do not use the cutoff (and it doesn't help with indexing on them).
2010-02-04 11:06:01 -08:00
Sarven Capadisli
48782ee1d9 Fixes minor remote subscription profile layout 2010-02-04 17:55:24 +01:00
Sarven Capadisli
d2dc3e41c5 Fixes minor remote subscription profile layout 2010-02-04 16:27:34 +00:00
Zach Copley
ac8a4a7e56 Confirm dialog for reset OAuth consumer key and secret button 2010-02-03 05:43:08 +00:00
Zach Copley
03e8ba144e Confirm dialog for reset OAuth consumer key and secret button 2010-02-03 01:43:59 +00:00
Craig Andrews
057ec1fcea Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
Brion Vibber
f4c81fa1e1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-02 09:57:50 -08:00
Zach Copley
3906713b2a Suppress notice input box on OAuth authorization page 2010-02-02 08:50:45 +00:00
Zach Copley
8191273078 Better token revocation 2010-02-02 08:50:33 +00:00
Zach Copley
f0875ceea1 Allow developers to delete OAuth applications 2010-02-02 08:50:18 +00:00
Zach Copley
df2a081265 OAuth app names should be unique. 2010-02-02 08:50:01 +00:00
Zach Copley
c03883fc88 Suppress notice input box on OAuth authorization page 2010-02-02 07:59:28 +00:00
Zach Copley
f1094185e4 Better token revocation 2010-02-02 07:35:54 +00:00
Zach Copley
38bebb4c0d Allow developers to delete OAuth applications 2010-02-02 06:26:03 +00:00
Sarven Capadisli
803c6d954c Revert "Removed hAtom pattern from registration page."
This reverts commit d6fe865133.

Screws up list rendering when registration is complete.
2010-02-01 23:10:44 +00:00
Zach Copley
59d16cf16a OAuth app names should be unique. 2010-02-01 20:58:30 +00:00
Sarven Capadisli
95e70f5e53 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-01 20:32:48 +01:00
Sarven Capadisli
0e49b3525d Sentence case for app statistics 2010-02-01 20:31:56 +01:00
Brion Vibber
c14ac57b19 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-01 10:30:45 -08:00
Brion Vibber
1625a13b93 Merge remote branch 'statusnet/master' into testing 2010-02-01 09:04:13 -08:00
Brion Vibber
6159edcebb Improve name validation checks on local File references 2010-02-01 08:49:59 -08:00
Evan Prodromou
0787daff2c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-01 11:49:50 -05:00
Brion Vibber
d9e7d4c4ad Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-01 08:49:19 -08:00
Brion Vibber
84ab0156b4 Improve name validation checks on local File references 2010-02-01 08:48:31 -08:00
Evan Prodromou
7390b1d1ac Merge branch 'master' into testing 2010-02-01 11:21:50 -05:00
Evan Prodromou
57d8f22a3a fix local file include vulnerability in doc.php
Conflicts:

	actions/doc.php
2010-02-01 11:20:22 -05:00
Evan Prodromou
d264db6119 fix local file include vulnerability in doc.php
Conflicts:

	actions/doc.php
2010-02-01 11:10:36 -05:00
Sarven Capadisli
d6fe865133 Removed hAtom pattern from registration page. 2010-02-01 13:14:35 +01:00
Evan Prodromou
779204b194 Merge branch 'testing' into 0.9.x
Conflicts:
	actions/apioauthauthorize.php
2010-01-31 15:27:58 -05:00
Evan Prodromou
30268cff78 Add Really Simple Discovery (RSD) support
Anil Dash suggested that all implementers of the Twitter API include
support for the remedial RSD format. This commit adds an RSD action
that returns the API root and additional API data to help client
developers discover and use our Twitter-compatible API.

http://dashes.com/anil/2009/12/the-twitter-api-is-finished.html
http://tales.phrasewise.com/rfc/rsd
2010-01-31 15:16:59 -05:00
Evan Prodromou
dc62246443 Add a robots.txt URL to the site root
Adds a robots.txt file to the site root. Defaults defined by
'robotstxt' section of config. New events StartRobotsTxt and
EndRobotsTxt to let plugins add information. Probably not
useful if path is not /, but won't hurt anything, either.
2010-01-31 10:12:26 -05:00
Evan Prodromou
def5d56ce1 add lat, lon, location and remove closing tag from geocode.php 2010-01-30 12:47:21 -05:00
Evan Prodromou
1b7cc3393a Use passed-in lat long in geocode.php
Don't rewrite the lat-long for a location in geocode.php.
2010-01-30 12:43:00 -05:00
Zach Copley
5868511716 Move sessions settings to its own panel 2010-01-28 22:06:01 -08:00
Zach Copley
440ee00b1e Move sessions settings to its own panel 2010-01-28 22:04:14 -08:00
Craig Andrews
d14651706c Merge branch '0.9.x' into 1.0.x 2010-01-28 16:13:06 -05:00
Sarven Capadisli
17f2096d70 Removed avatar from repeat of username (matches noticelist) 2010-01-28 15:08:33 +01:00
Sarven Capadisli
5b1245a32a Removed avatar from repeat of username (matches noticelist) 2010-01-28 15:06:03 +01:00
Craig Andrews
914bc9f9c5 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-01-27 22:07:04 -05:00
Zach Copley
5182cc686d Numbered format specifiers 2010-01-28 01:39:18 +00:00
Zach Copley
420ae06faf These API methods should return true for ->isReadOnly($args)! 2010-01-28 00:44:55 +00:00
Zach Copley
9589985e29 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-28 00:43:24 +00:00
Zach Copley
77aed28f17 These API methods should return true for ->isReadOnly($args)! 2010-01-28 00:40:44 +00:00
Siebrand Mazeland
fcc48155ed L10n updates:
* app -> application
* number parameters when using more than one in a message
2010-01-28 01:32:48 +01:00
Zach Copley
78079f34e2 Merge branch 'testing' into -1.9.x
* testing: (130 commits)
  HTTP auth provided is evaluated even if it's not required
  Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this!
  Add new oauth tables and modifications to 'consumer' table for rc4
  Centred leaderboard ad
  camelcase the uap param names
  move leaderboard to after the header
  Moved rectangle ad into aside and leaderboard to the right in header.
  Aligning wide skyscraper to the right instead of left
  CSS ids and classes fixed in UAPPlugin
  wrong height for rectangle in BlankAd
  Add the moved BlankAdPlugin
  make BlankAd dir and change to use a 1x1 image
  move BlankAdPlugin to its own dir
  Add BlankAdPlugin to test ad layout in different themes
  make uapplugin an abstract class
  move UAP plugin to core
  Lowercased switch cases in UAP Plugin
  Plugin for Universal Ad Package. Outputs four most widely used ad types.
  Add persistent:true property to Stomp messages so ActiveMQ doesn't decide to discard them even though persistence is enabled on the broker. :) (Thanks Aric!)
  quick fix: use common_path() on realtime update JS so it works with the new JS path code (will pull from main server for now)
  ...

Conflicts:
	actions/apioauthaccesstoken.php
	actions/apioauthauthorize.php
	actions/apioauthrequesttoken.php
	actions/editapplication.php
	actions/newapplication.php
	lib/apiauth.php
	lib/queuemanager.php
	lib/router.php
2010-01-27 14:27:22 -08:00