eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,083 Commits 8 Branches 0 Tags 309 MiB
Commit Graph

796 Commits

Author SHA1 Message Date
Brion Vibber f4c81fa1e1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-02 09:57:50 -08:00
Sarven Capadisli 245610d2e1 Removed entity flag stylesheet and icons from plugin to core. 2010-02-02 16:27:58 +01:00
Sarven Capadisli 65c5d7813b Added icon to Clear label for UserFlag plugin 2010-02-02 16:06:22 +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
Sarven Capadisli 0c838f82b0 Added missing concat of </li> in Realtime response 2010-01-31 23:57:35 +01:00
Sarven Capadisli 9f36c10001 Updated XHR binded events to work better in jQuery 1.4.1. Using 
.live() for event delegation instead of jQuery.data() and checking to
see if an element was previously binded.
 2010-01-31 22:37:22 +00: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 ebf4e497f6 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-31 15:20:57 -05:00
Evan Prodromou a1c9874a61 better handling of null responses from geonames.org 2010-01-30 12:40:11 -05:00
Craig Andrews 61d4709eb8 Pass username and nickname to autoregister so auth plugins can set the nickname correct when creating a new user. 
Continues fixing what Eric Helgeson pointed out in 01eb4e8f00
 2010-01-29 20:43:16 -05:00
Evan Prodromou 8318f195a2 plugin to limit number of registered users 2010-01-29 18:29:51 -05:00
Sarven Capadisli b68a21d4f7 Adds notice author's name to @title in Realtime response 2010-01-29 15:43:37 +00:00
Zach Copley 558bf0f489 'Sign in with Twitter' button img 2010-01-28 18:15:45 +00:00
Zach Copley 664a82e836 'Sign in with Twitter' button img 2010-01-28 18:11:44 +00:00
Zach Copley b6dea910fc Move faceboookapp.js to the Facebook plugin 2010-01-28 04:50:54 +00:00
Zach Copley 794fe16d69 Merge branch 'facebook-js-fix' into testing 2010-01-28 04:47:21 +00:00
Zach Copley c2c262e4b4 Move faceboookapp.js to the Facebook plugin 2010-01-28 04:46:10 +00:00
Brion Vibber f026ecec32 fix for fix for bad realtime JS load 2010-01-27 19:50:52 -08:00
Brion Vibber 5c0560a7fc fix for fix for bad realtime JS load 2010-01-27 19:50:08 -08:00
Brion Vibber 84e7c7783c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-27 19:49:26 -08:00
Evan Prodromou dd413ff4fa move script into OpenXPlugin::showAd() so it works 2010-01-27 18:44:46 -05:00
Evan Prodromou 97a1ef14d2 using an action for output in OpenX plugin 2010-01-27 18:39:55 -05:00
Evan Prodromou 0373ab6fa4 Plugin to enable OpenX ads 2010-01-27 18:35:02 -05:00
Evan Prodromou 2aba2eeeaf width and height should be integers in AdsensePlugin 2010-01-27 17:55:33 -05:00
Evan Prodromou 00d9b215f4 Plugin to support Google Adsense 
A plugin to easily add Google Adsense blocks to a StatusNet site.
 2010-01-27 17:29:36 -05: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
Evan Prodromou f650b40706 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-27 16:37:43 -05:00
Evan Prodromou 4ad931ad38 wrong height for rectangle in BlankAd 2010-01-27 16:34:17 -05:00
Evan Prodromou e4393ee6db Add the moved BlankAdPlugin 2010-01-27 16:34:17 -05:00
Evan Prodromou b2b95bd21f make BlankAd dir and change to use a 1x1 image 2010-01-27 16:34:17 -05:00
Evan Prodromou b412ebab11 move BlankAdPlugin to its own dir 2010-01-27 16:34:17 -05:00
Evan Prodromou 9decd9806c Add BlankAdPlugin to test ad layout in different themes 2010-01-27 16:34:17 -05:00
Evan Prodromou 1758ed453b move UAP plugin to core 2010-01-27 16:34:17 -05:00
Sarven Capadisli 58fde0dcb5 Lowercased switch cases in UAP Plugin 2010-01-27 16:34:17 -05:00
Sarven Capadisli 61a7a7b36b Plugin for Universal Ad Package. Outputs four most widely used ad types. 2010-01-27 16:34:17 -05:00
Brion Vibber b1402896e7 Set default 24-hour expiry on Memcached objects where not specified. 2010-01-27 09:13:21 -08:00
Brion Vibber 7aeb03f727 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) 2010-01-27 08:53:55 -08: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
Sarven Capadisli 7695daebb7 Updated geolocation sharing in notice form for Realtime pop 2010-01-26 19:15:33 +01:00
Sarven Capadisli e05c325722 Updated geolocation sharing in notice form for Realtime pop 2010-01-26 19:13:05 +01:00
Zach Copley d6a0dec765 Add Julien C to author comments 2010-01-26 00:41:49 -08:00
Zach Copley 7a0a133401 - Remove redundant function 
- clean up log msgs
 2010-01-26 00:41:49 -08:00
Zach Copley 7064d15e67 Use "Sign in with Twitter" auth pattern and official Twitter button for Twitter-based login. 
See: http://apiwiki.twitter.com/Sign-in-with-Twitter
 2010-01-26 00:41:49 -08:00
Zach Copley e5bd707055 Ask the user to set a password before disconnecting from Twitter 2010-01-26 00:41:49 -08:00
Zach Copley d429710fe1 - Twitter username wasn't getting stored in Foreign_user when linking Twitter account (fixed) 
- Updates to comments
 2010-01-26 00:41:49 -08:00
Julien C 3fc3a2b326 Allow logging in using Twitter 
Signed-off-by: Julien C <chaumond@gmail.com>
 2010-01-26 00:41:49 -08:00
Zach Copley 02957d2854 Add Julien C to author comments 2010-01-26 00:19:46 -08:00
Zach Copley f7450d2ca8 - Remove redundant function 
- clean up log msgs
 2010-01-26 00:19:20 -08:00
Zach Copley ce44008d13 Use "Sign in with Twitter" auth pattern and official Twitter button for Twitter-based login. 
See: http://apiwiki.twitter.com/Sign-in-with-Twitter
 2010-01-26 00:19:09 -08:00
Zach Copley 1c1abfc284 Ask the user to set a password before disconnecting from Twitter 2010-01-26 00:18:55 -08:00