GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
9,622 Commits 8 Branches 4 Tags 310 MiB
1e1f405795
Commit Graph

9622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brion Vibber
9235c1437e Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-09-26 15:23:17 -07:00
Sarven Capadisli
2b6dfbdf2b A different go at the realtime button location. Button is in a 
prominent location.
 2009-09-26 20:25:47 +00:00
Sarven Capadisli
81aada2144 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-26 19:33:15 +02:00
Zach Copley
ccc7caf932 Merge branch 'refactor-api' of git@gitorious.org:~zcopley/statusnet/zcopleys-clone into refactor-api 2009-09-25 16:59:51 -07:00
Zach Copley
de5ff19713 Moved basic auth stuff into its own classes 2009-09-25 16:58:35 -07:00
CiaranG
bc2a0f550b Updated Piwik plugin documentation to new addPlugin() installaation method 2009-09-25 21:25:20 +01:00
Sarven Capadisli
d3d9913be0 Added hook for notice item. After <li> and Before </li>. Allows 
authors to include aside data to their notice items
 2009-09-25 12:47:14 +00:00
Evan Prodromou
ced6bb1c4e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-24 22:26:51 -04:00
Evan Prodromou
ecb75561af Move configuration defaults to new module and variable 
Moved the default values of $config to $default. The code for
setting up $default is moved to lib/default.php.
 2009-09-24 22:25:30 -04:00
Zach Copley
150cf8c045 Merge branch '0.9.x' into refactor-api 
* 0.9.x: (88 commits)
  Left a couple debugging statements in (removed)
  Output If-Modified-Since header for all RSS 1.0 feeds (again)
  Revert "move scripts to just before </body>, add event for scripts that need to be in <head>"
  Implemented join and leave groups api methods
  implemented etag and last modified
  Fixed broken Piwik plugin - was not using the supplied site code
  move scripts to just before </body>, add event for scripts that need to be in <head>
  some UI fixes
  Using timeline string instead of title for WindowName because IE doesn't
  Added JavaScript to initialize the poped Window
  Some layout and rendering adjustment for Realtime plugin
  Created addPop() for Realtime plugin and added param to include iconurl
  move some stuff around for realtime
  hack around address hack in util.js
  Add some more realtime feeds
  Do realtime popup with PHP instead of Javascript
  JavaScript fixes for IE
  Revert "Added realtime streams for all and showstream timelines"
  Revert "Fixed indenting"
  Revert "Made it slighly more compact with less jQuery selection"
  ...
 2009-09-24 18:18:26 -07:00
Zach Copley
ed9ba9d945 Reorganize, make bare auth work, output If-Modified-Since header 2009-09-24 18:13:46 -07:00
Zach Copley
b617c608ea Left a couple debugging statements in (removed) 2009-09-24 15:28:25 -07:00
Zach Copley
e566219299 Output If-Modified-Since header for all RSS 1.0 feeds (again) 2009-09-24 15:10:55 -07:00
Evan Prodromou
93b7e60115 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
 2009-09-24 17:24:15 -04:00
Evan Prodromou
78cec7ab87 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	install.php
	lib/noticeform.php
 2009-09-24 17:22:51 -04:00
Craig Andrews
49bce941a9 Merge remote branch 'statusnet/0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php
 2009-09-24 17:15:54 -04:00
Evan Prodromou
b5b3690eef Merge branch 'master' into 0.8.x 2009-09-24 17:15:36 -04:00
Evan Prodromou
dfff99ecc8 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 2009-09-24 17:14:38 -04:00
Evan Prodromou
d7e43c732e Revert "move scripts to just before </body>, add event for scripts that need to be in <head>" 
This reverts commit a5ed805aea.

It shouldn't have gone on the stable branch.
 2009-09-24 17:14:04 -04:00
Craig Andrews
3d30ad83f8 Implemented join and leave groups api methods 2009-09-24 16:52:32 -04:00
Brion Vibber
987f7ead94 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-09-24 12:09:01 -07:00
Craig Andrews
5323956e38 implemented etag and last modified 2009-09-24 13:48:38 -04:00
CiaranG
55fb322288 Fixed broken Piwik plugin - was not using the supplied site code 2009-09-24 11:01:18 +01:00
Evan Prodromou
a5ed805aea move scripts to just before </body>, add event for scripts that need to be in <head> 2009-09-23 23:23:13 -04:00
Evan Prodromou
543e3e7972 some UI fixes 2009-09-23 23:04:25 -04:00
Evan Prodromou
3449843f83 use schema tool to create a table 2009-09-23 22:24:35 -04:00
Sarven Capadisli
d86155ad94 Using timeline string instead of title for WindowName because IE doesn't 
like names with whitespace.
 2009-09-23 22:04:39 +00:00
Sarven Capadisli
1f12993a4d Added JavaScript to initialize the poped Window 2009-09-23 22:02:42 +00:00
Sarven Capadisli
ddb9518c99 Some layout and rendering adjustment for Realtime plugin 2009-09-23 22:00:22 +00:00
Sarven Capadisli
4d4bb089a5 Created addPop() for Realtime plugin and added param to include iconurl 2009-09-23 21:58:35 +00:00
Zach Copley
49b701f9ec Started refactoring API into individual actions 2009-09-23 13:45:51 -07:00
Evan Prodromou
bdbc2cb8de move some stuff around for realtime 2009-09-23 15:24:12 -04:00
Evan Prodromou
36e009349d hack around address hack in util.js 2009-09-23 14:58:42 -04:00
Evan Prodromou
480eeb1b80 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 
Conflicts:
	plugins/Realtime/realtimeupdate.js
 2009-09-23 13:51:41 -04:00
Evan Prodromou
5152d31d2a Add some more realtime feeds 2009-09-23 17:28:14 -04:00
Evan Prodromou
1fe11eabb6 Do realtime popup with PHP instead of Javascript 
Move the realtime detection code to PHP extension rather than
JavaScript.
 2009-09-23 17:07:20 -04:00
Sarven Capadisli
13976f5796 JavaScript fixes for IE 2009-09-23 17:22:51 +00:00
Evan Prodromou
6cb2f89983 Revert "Added realtime streams for all and showstream timelines" 
This reverts commit 49e91ec7d0.
 2009-09-23 11:08:35 -04:00
Evan Prodromou
35eb33fe2b Revert "Fixed indenting" 
This reverts commit 182257cbbf.
 2009-09-23 11:08:12 -04:00
Evan Prodromou
87ff03890e Revert "Made it slighly more compact with less jQuery selection" 
This reverts commit c9bc390090.
 2009-09-23 11:07:56 -04:00
Evan Prodromou
e6cbe3a269 Revert "Added a check for any URL param. If found, strips them out before" 
This reverts commit 13de845e95.
 2009-09-23 11:07:22 -04:00
Evan Prodromou
8284b3cb82 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php
 2009-09-23 09:45:22 -04:00
Evan Prodromou
bef4a8b6ba Revert "When viewing a page in https, all links to non-actions (links to CSS, JS, etc) should be https. Fixes the mixed content warnings that browsers display." 
This reverts commit 20997619b3.

The commit doesn't take into account having different servers (theme
server, avatar server) and being able to set HTTPS for some but not all.
 2009-09-23 09:34:55 -04:00
Evan Prodromou
42ba05de5f revert output buffering (costly) for ETags (low priority) 2009-09-23 09:33:40 -04:00
Evan Prodromou
c01a5b8f2e Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 2009-09-23 09:29:02 -04:00
Evan Prodromou
e206324f24 statusize schema-related modules 2009-09-23 09:20:04 -04:00
Evan Prodromou
bd8a2dbfd6 test script for schema code 2009-09-23 09:17:01 -04:00
Evan Prodromou
f31653ca5b make table def method of schema code work 2009-09-23 09:17:01 -04:00
Evan Prodromou
4f833531dd start a module for schema management 2009-09-23 09:17:01 -04:00
Craig Andrews
2cabfba767 Allow some punctuation instead of just spaces before @user, !group, and #tag 2009-09-22 19:34:10 -04:00