Shashi Gowda 31c1177970 Merge branch '1.0.x' into people_tags_rebase ...

Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php

2011-03-22 07:56:25 +05:30

..

css/smoothness

load jquery-ui css and js by default

2011-03-10 10:28:08 -06:00

farbtastic

Moved farbtastic's stylesheet to use relative paths for its own images

2010-01-24 00:21:01 +01:00

jcrop

last scrub of Laconica -> StatusNet

2009-08-26 03:33:43 -04:00

ui

add jquery-ui js and css

2011-03-10 10:18:35 -06:00

emailsettings.js

Ticket #2912 further cleanup: use JS on emailsettings form to help connect the 'I want to post by email' checkbox with the controls for adding or removing a post-by-email alias.

2010-12-01 14:23:56 -08:00

geometa.js

Break xbImportNode.js and geometa.js back out of util.js; the Makefile in js has been updated to combine them with util.js source when building util.min.js

2010-12-22 15:22:02 -08:00

identica-badge.js

Fixed innerHTML problem in IE7 and 8 for badge script

2010-01-22 21:08:51 +01:00

install.js

Added site path field to installer + fancy URL javascript auto-detection.

2009-05-17 00:05:07 -04:00

jquery-ui.min.js

slim down the name of the jquery file

2011-03-10 10:19:50 -06:00

jquery.cookie.js

Implement user interface for user to preview what location they are sharing with a notice

2009-12-29 16:18:52 -05:00

jquery.cookie.min.js

use minified version of jquery.cookie.js

2010-11-17 12:32:11 -05:00

jquery.form.js

Revert jQuery Form to r2.17 -- the latest fails with our Meteor stuff the way it tweaks document.domain (which also causes other AJAX-related problems and needs to be destroyed one of these days...)

2011-02-08 22:28:23 -08:00

jquery.form.min.js

Revert jQuery Form to r2.17 -- the latest fails with our Meteor stuff the way it tweaks document.domain (which also causes other AJAX-related problems and needs to be destroyed one of these days...)

2011-02-08 22:28:23 -08:00

jquery.joverlay.js

Upgrade to joverlay 0.8 (needed the html option)

2009-11-19 19:13:55 -05:00

jquery.joverlay.min.js

Upgrade to joverlay 0.8 (needed the html option)

2009-11-19 19:13:55 -05:00

jquery.js

upgrade to JQuery 1.4.4

2010-11-17 12:14:50 -05:00

jquery.min.js

upgrade to JQuery 1.4.4

2010-11-17 12:14:50 -05:00

jquery.tagInput.js

styling for people tag UI

2011-03-07 00:44:21 +05:30

jquery.timers.js

styling for people tag UI

2011-03-07 00:44:21 +05:30

json2.js

Remove json2 author's "don't hotlink my script pls" alert line from our local copy of json2.js :D

2011-01-05 09:39:36 -08:00

json2.min.js

Remove json2 author's "don't hotlink my script pls" alert line from our local copy of json2.js :D

2011-01-05 09:39:36 -08:00

Makefile

Remove json2 author's "don't hotlink my script pls" alert line from our local copy of json2.js :D

2011-01-05 09:39:36 -08:00

userdesign.go.js

Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x

2009-08-27 14:52:32 -07:00

util.js

Merge branch '1.0.x' into people_tags_rebase

2011-03-22 07:56:25 +05:30

util.min.js

Merge branch '1.0.x' into people_tags_rebase

2011-03-22 07:56:25 +05:30

xbImportNode.js

Break xbImportNode.js and geometa.js back out of util.js; the Makefile in js has been updated to combine them with util.js source when building util.min.js

2010-12-22 15:22:02 -08:00