Commit Graph

5512 Commits

Author SHA1 Message Date
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
Craig Andrews 3d30ad83f8 Implemented join and leave groups api methods 2009-09-24 16:52:32 -04: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
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
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 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
Craig Andrews 2cabfba767 Allow some punctuation instead of just spaces before @user, !group, and #tag 2009-09-22 19:34:10 -04:00
Craig Andrews f3c8fcccc1 Link hrefs are the short url, and title is the long url 2009-09-22 11:12:55 -04:00
Craig Andrews ebb52efeb4 Make link href the long url so users can tell where links are going 2009-09-21 22:48:19 -04:00
Craig Andrews 5cccbe987f Use new queue handler event 2009-09-21 16:33:15 -04:00
Craig Andrews 3bdf8423c4 Fix typo is default hub url 2009-09-21 16:29:22 -04:00
Sarven Capadisli acd5a53257 Initial UI to allow certain timelines to be viewed in a new window in
realtime
2009-09-21 19:17:37 +00:00
Evan Prodromou fe4751de50 add the plugin daemon 2009-09-21 14:44:16 -04:00
Evan Prodromou f6c70ea327 have to provide full path for daemons 2009-09-21 14:42:20 -04:00
Evan Prodromou 98924a80d7 'easy' way to handle notices at queue time 2009-09-21 14:39:22 -04:00
Sarven Capadisli 470b34ea47 Escaping internal JavaScript 2009-09-21 18:30:22 +00:00
Evan Prodromou 6a088afd4b you can add a daemon to getvaliddaemons 2009-09-21 14:29:43 -04:00
Evan Prodromou eb41d9e5da add a hook for the unqueuemanager 2009-09-21 14:23:35 -04:00
Evan Prodromou 5b91223ce4 add a hook at point of enqueuing notices 2009-09-21 14:14:55 -04:00
Sarven Capadisli 13de845e95 Added a check for any URL param. If found, strips them out before
going ahead with realtime timeline update.
2009-09-21 14:30:12 +00:00
Sarven Capadisli c9bc390090 Made it slighly more compact with less jQuery selection 2009-09-21 11:35:56 +00:00
Sarven Capadisli 8f84bc88d7 Updated todo comment for pushing notices to Personal and Replies
timelines
2009-09-21 11:32:36 +00:00
Brion Vibber 3c89d31b18 Fixes for posting shortened URLs or uploads
* If no shortener plugin is enabled, fall back to using the long URL instead of trying to load nonexistent ur1.ca plugin and throwing 'Class  does not exist'
* Fix bad call to call_user_func_array() in callback_helper() which broke all shortening
2009-09-21 21:34:59 +12:00
Brion Vibber 0125f29324 Don't trigger E_NOTICE when looking for commands in the notice input
explode() only returns one item if there was no space, leading to an E_NOTICE about an undefined array index in the list($a,$b) pattern.
2009-09-21 16:45:09 +12:00
Sarven Capadisli 182257cbbf Fixed indenting 2009-09-20 15:20:10 +00:00
Sarven Capadisli 49e91ec7d0 Added realtime streams for all and showstream timelines 2009-09-20 15:14:46 +00:00
Sarven Capadisli 44820d296d No need to call farbtastic.go.js because it was moved to userdesign.go.js 2009-09-20 13:44:22 +02:00
Sarven Capadisli 0fa2bbe581 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 2009-09-20 12:55:34 +02:00
Craig Andrews cf8944526e Make the infinite scroll plugin have a non-infinite scroll (button click to scroll) mode 2009-09-19 22:53:39 -04:00
Zach Copley 8aad3154a7 Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method. 2009-09-19 18:41:28 -07:00
Zach Copley 74296fa12c Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method. 2009-09-19 18:34:07 -07:00
Adrian Lang e0ff80f1c7 Add missing parenthesis. 2009-09-19 21:40:48 +02:00
Adrian Lang 8548e1185d Fix merges. 2009-09-19 21:38:52 +02:00