wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,883 Commits 8 Branches 0 Tags 330 MiB
5868511716
Commit Graph

7883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Copley
5868511716 Move sessions settings to its own panel 2010-01-28 22:06:01 -08:00
Zach Copley
f8ef923aae Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-29 01:54:31 +00:00
Zach Copley
d70be6d2ad Adjust API authentication to also check for OAuth protocol params in the 
HTTP Authorization header, as defined in OAuth HTTP Authorization Scheme.
 2010-01-29 01:54:26 +00:00
Siebrand Mazeland
1001c8ffd7 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-29 00:07:54 +01:00
Zach Copley
8cdb319533 Remove redundant session token field from form (was already being added by base class). 2010-01-28 18:34:25 +00:00
Zach Copley
8d87a1ea3c Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-28 18:12:25 +00:00
Zach Copley
664a82e836 'Sign in with Twitter' button img 2010-01-28 18:11:44 +00:00
Sarven Capadisli
d0f3fee65b Update to aside styles in biz theme 2010-01-28 18:43:56 +01:00
Sarven Capadisli
919dfeeb93 Update to notice item in biz theme 2010-01-28 18:43:56 +01:00
Sarven Capadisli
a8555dc3a6 Update to biz theme button close and minimize styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
325b893bd8 Update to biz theme's input styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
87fad943e6 Updated biz theme entity_actions styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
09b62f0144 Updated biz theme to use dialogbox styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
8add14b046 Updated biz theme notice options 2010-01-28 18:43:56 +01:00
Sarven Capadisli
c88979d359 Updated biz theme to hide form_repeat legend 2010-01-28 18:43:56 +01:00
Sarven Capadisli
ffd2e431a9 Updated biz theme to use the single icons file 2010-01-28 18:43:56 +01:00
Sarven Capadisli
16160ef102 Updated geo sharing styles for biz 2010-01-28 18:43:56 +01:00
Sarven Capadisli
58eccdb5cf Fixed layout when ad plugin is on for biz 2010-01-28 18:43:56 +01:00
Sarven Capadisli
ff99989441 Fixed layout for powered by statusnet in biz 2010-01-28 18:43:55 +01:00
Sarven Capadisli
17f2096d70 Removed avatar from repeat of username (matches noticelist) 2010-01-28 15:08:33 +01:00
Sarven Capadisli
588f5ec36b Removed unused variable assignment for avatar URL and added missing fn 2010-01-28 15:08:18 +01:00
Zach Copley
b6dea910fc Move faceboookapp.js to the Facebook plugin 2010-01-28 04:50:54 +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
dac2231aaa Some adjustments to the way API auth works after merging testing and 0.9.x 2010-01-28 00:41:44 +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
Siebrand Mazeland
b6de415f9d Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-28 01:07:28 +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
Zach Copley
2494d3fa25 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  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
 2010-01-27 14:14:18 -08:00
Michele
b0a325f7d0 HTTP auth provided is evaluated even if it's not required 2010-01-27 14:06:27 -08:00
Brion Vibber
9a54745fcd Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this! 2010-01-27 13:59:58 -08:00
Brion Vibber
47645228da Add new oauth tables and modifications to 'consumer' table for rc4 2010-01-27 13:58:55 -08:00
Evan Prodromou
f650b40706 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-27 16:37:43 -05:00
Sarven Capadisli
5e31ecd82a Centred leaderboard ad 2010-01-27 16:36:57 -05:00
Evan Prodromou
760be76fc0 camelcase the uap param names 2010-01-27 16:34:18 -05:00
Evan Prodromou
ea123800e9 move leaderboard to after the header 2010-01-27 16:34:18 -05:00
Sarven Capadisli
1c875a5395 Moved rectangle ad into aside and leaderboard to the right in header. 
Intention for this layout was to reduce whitespace in header area
 2010-01-27 16:34:18 -05:00
Sarven Capadisli
e3bd97bfe4 Aligning wide skyscraper to the right instead of left 2010-01-27 16:34:17 -05:00
Evan Prodromou
e9feafc3ca CSS ids and classes fixed in UAPPlugin 2010-01-27 16:34:17 -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
7c54591472 make uapplugin an abstract class 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
c51539804a 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!) 2010-01-27 09:24:59 -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