Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php

2013-02-17 12:35:40 +01:00

..

colorbox

update minified javascripts

2013-02-04 18:16:13 -07:00

cropper

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

fancybox

Merge remote-tracking branch 'upstream/master'

2013-02-17 12:35:40 +01:00

fullcalendar

events: first test for full-javascript events calendar

2012-02-14 16:19:48 +01:00

HTML5

Transform prefixed elements to classic ones

2012-09-14 07:59:54 +02:00

HTMLPurifier

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

jgrowl

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

jquery_ac

Modify Javascript to improve page loading times

2012-07-28 09:57:16 -06:00

langdet

further jenkins include fixes

2012-11-22 05:09:28 -08:00

mcefixes

fix !@#$ tinymce linebreaks for the thousandth time

2012-07-04 17:15:43 -07:00

Mobile_Detect

changes to support a mobile theme

2012-07-23 20:37:00 -06:00

oauth2-php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

phpsec

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

simplepie

iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources

2012-06-20 05:04:51 -07:00

Smarty

add smarty engine, remove some obsolete zot1 stuff

2012-07-03 22:23:08 -07:00

spam

finalise spam storage model, begin driver changes.

2012-03-05 23:20:42 -08:00

tinymce

update minified javascripts

2013-02-04 18:16:13 -07:00

tiptip

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

asn1.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

ASNValue.class.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

facebook.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.auto.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.autoload.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.func.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.includes.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.kses.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.path.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

HTMLPurifier.safe-includes.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

markdown.php

New version of markdown. Playing with stylesheet. Testing line breaks.

2012-02-19 22:47:32 +01:00

OAuth1.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

oauth.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

openid.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

slinky.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

twitteroauth.php

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00