wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78079f34e2
gnu-social/classes
History
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
..
Avatar.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Config.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Confirm_address.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
Consumer.php Workflow for registering new OAuth apps pretty much done. 2010-01-24 16:36:02 -08:00
Deleted_notice.php check correct define (not backwards compatible) 2009-09-15 21:12:44 -04:00
Design.php use the new htmloutputter->style() function 2009-12-04 20:20:44 -05:00
Fave.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
File_oembed.php check before saving a thumbnail 2010-01-10 13:25:16 -08:00
File_redirection.php Revert "Remove more contractions" 2009-11-09 20:01:46 +01:00
File_thumbnail.php define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
File_to_post.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
File.php Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure" 2010-01-22 10:12:26 -05:00
Foreign_link.php Take token field out of foreign_link 2009-08-25 15:48:06 -04:00
Foreign_service.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
Foreign_subscription.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
Foreign_user.php change foreign_user.id to bigint (for Twitter, Facebook, etc.) 2009-06-24 14:44:02 -07:00
Group_alias.php define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Group_block.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Group_inbox.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Group_member.php add events for subscribing to people and joining groups 2010-01-13 02:16:13 -08:00
Inbox.php Offload inbox updates to a queue handler to speed up posting online 2010-01-25 18:08:21 -05:00
Invitation.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
Location_namespace.php flip x flag on generated files 2009-10-21 22:43:41 -04:00
Login_token.php Redirect to a one-time-password when ssl and regular server are different 2010-01-09 15:26:06 -08:00
Memcached_DataObject.php Merge branch 'master' into testing 2010-01-25 18:13:09 -05:00
Message.php create a method for notification for new messages, and use it 2009-12-15 10:31:25 -05:00
Nonce.php Fix nonce usage in OAuth store 2009-03-07 12:55:09 -08:00
Notice_inbox.php Fix regressions in XMPP output during inbox refactoring 2010-01-13 18:17:36 +00:00
Notice_source.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
Notice_tag.php Offload inbox updates to a queue handler to speed up posting online 2010-01-25 18:08:21 -05:00
Notice.php Offload inbox updates to a queue handler to speed up posting online 2010-01-25 18:08:21 -05:00
Oauth_application_user.php Remove verifier from Oauth_application_user (not needed there) 2010-01-24 16:36:05 -08:00
Oauth_application.php Can now edit/change application icon 2010-01-24 16:36:04 -08:00
Profile_block.php define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Profile_role.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Profile_tag.php fix problem with dupe tags in profile 2009-02-28 15:17:49 -08:00
Profile.php Revoke access token UI 2010-01-24 16:36:05 -08:00
Queue_item.php XMPP queued output & initial retooling of DB queue manager to support non-Notice objects. 2010-01-22 12:52:36 -08:00
Related_group.php some class files had x bit set 2009-05-22 21:11:46 -04:00
Remember_me.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
Remote_profile.php Fix regression in remote subscription; added hasRole() shadow method on Remote_profile. 2009-11-25 22:23:21 +00:00
Reply.php Ticket #1567 - API: Change before_id parameter to max_id 2009-05-29 16:32:55 -07:00
Session.php don't write session if it's unchanged 2009-10-09 10:39:56 -04:00
Sms_carrier.php change function headers to K&R style 2008-12-23 14:33:23 -05:00
status_network.ini Rename Laconica to StatusNet 2009-08-25 17:56:10 -04:00
Status_network.php Control channel for queue daemons to request graceful shutdown, restart, or update to listen to a newly added or reconfigured site. 2010-01-26 11:49:49 -08:00
statusnet.ini Add verifier and verified callback to token for OAuth 1.0a 2010-01-24 16:36:05 -08:00
statusnet.links.ini Remove relationship: user_openid.user_id -> user.id. I don't think this 2009-11-25 23:55:03 +00:00
Subscription.php ...and drop the unnecessary &reference from child class pkeyGet() overrides. 2010-01-06 14:28:40 -08:00
Token.php Add verifier and verified callback to token for OAuth 1.0a 2010-01-24 16:36:05 -08:00
User_group.php Consolidate group creation into static function in User_group 2009-11-18 15:54:24 -05:00
User_location_prefs.php Add magic formula to keep DB_DataObject from treating location prefs pkey as autoincrement 2009-12-30 08:56:43 -10:00
User_username.php Move Authorization and Authentication plugin structures into core, instead of as plugins. 2010-01-05 13:56:22 -05:00
User.php Offload inbox updates to a queue handler to speed up posting online 2010-01-25 18:08:21 -05:00