Commit Graph

2319 Commits

Author SHA1 Message Date
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
Craig Andrews e9995b0f6a Create IM plugin, Pluginize XMPP, Create AIM plugin 2010-01-27 13:48:35 -05:00
Evan Prodromou c52951cef5 Optionally set a separate Javascript server and path
We have about 10-12 JavaScript pages per Web page. They usually
are based on the same server as the Web pages, but since they're
static files, it makes sense to offload them to a lite server that
handles static files well.

This commit lets you set a separate Javascript server and path for the
default Javascript code in StatusNet.

Squashed commit of the following:

commit 139d1622fdafe5ad00c820224416d9021efc3234
Author: Evan Prodromou <evan@status.net>
Date:   Wed Jan 27 11:30:24 2010 -0500

    modules that call htmloutputter::script() don't prescribe js/ path

commit c6ca3174af73efed55eaed5ff1e2a3bdc77d2d87
Author: Evan Prodromou <evan@status.net>
Date:   Wed Jan 27 11:28:07 2010 -0500

    configurable server and path for javascript files
2010-01-27 11:37:22 -05:00
Zach Copley 756da7bc51 s/LOG_WARN/LOG_WARNING/ 2010-01-27 08:45:56 +00:00
Zach Copley 923b7de3c6 - Check for read-only vs. read-write access to protected API resources (OAuth)
- Some cleanup
2010-01-27 08:41:26 +00:00
Siebrand Mazeland 97e1acdc32 Fix casing for HMAC-SHA1. 2010-01-27 00:56:45 +00:00
Siebrand Mazeland 492950b784 Fix inconsistent title case in page title 2010-01-27 00:56:31 +00:00
Zach Copley aad42427cc New access admin panel for site registration settings 2010-01-26 15:56:19 -08:00
Zach Copley 03685bba1e - Remove redudant/unused 'server' setting from site admin panel
- Move 'fancy urls' checkbox from site admin panel to paths admin panel
2010-01-26 15:11:09 -08:00
Evan Prodromou 663e4e02a1 Merge branch 'master' into testing
Conflicts:
	lib/queuemanager.php
2010-01-25 18:13:09 -05:00
Evan Prodromou b6aa1511eb Merge branch 'master' into 0.9.x 2010-01-25 18:10:59 -05:00