This repository has been archived on 2024-08-19. You can view files and clone it, but cannot push or open issues or pull requests.

Christian Vogeley 870df76463 Merge remote-tracking branch 'upstream/master' into bootstrap ...

Conflicts:
	view/php/theme_init.php

2013-12-22 14:31:27 +01:00

..

bbedit

alternate wysiwyg bbcode editor

2012-12-10 15:07:45 -08:00

bootstrap

bootbox

2013-12-08 19:37:41 +01:00

bootstrap-datetimepicker

New modal dialog for item expiry

2013-12-22 14:21:57 +01:00

colorbox

Colorbox

2013-04-26 22:31:50 +01:00

colorpicker

Add colorpicker jquery plugin for themes

2013-09-28 12:23:55 +03:00

cropper

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

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

cryptojs

Wankers.

2013-11-07 23:25:13 -08:00

fancybox

get rid of jquery.browser warnings by removing msie hacks in two places, live update and fancybox

2013-05-09 18:24:52 -07:00

font_awesome

add font_awesome

2013-10-08 16:11:20 -07:00

fullcalendar

Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keeping old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him).

2013-04-10 13:16:41 +02:00

HTML5

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

2012-04-05 13:39:15 +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

make autocomplete better themable by adding an id

2013-11-14 18:03:16 +01:00

jquery.divgrow

At this moment, of the content pages only the network page partially works and not all that well as the ajax loading gets sorted. This checkin is just to push the current state of the code, good bad and ugly.

2012-07-25 04:17:34 -07:00

jquery.i18n

add jquery.i18n for client side translations

2012-08-13 04:28:12 -07:00

jslider

get rid of pink search bar when not using redbasic "red"

2013-10-03 02:20:09 -07:00

langdet

language detection library

2012-05-12 01:55:18 -07:00

markdownify

more file cleanup

2012-10-22 19:46:18 -07:00

mcefixes

fix !@#$ tinymce linebreaks for the thousandth time

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

Mobile_Detect

zentity is currently just a screen mockup until the page spec is complete

2012-07-24 21:06:23 -07:00

oauth2-php

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

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

prettyphoto

Remove Twatter/Facebook shit.

2013-03-23 21:14:03 +00: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

editor_plugin_src.js compressed at jscompress.com

2013-12-09 11:30:32 +01:00

tiptip

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

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

urlify

Added urlify to try and create webbie auto-suggestions out of whatever unicode stuff gets thrown in as a name. Currently this will only work for latin/european/cyrillic/russian, but possible to extend to ideographic forms.

2012-07-30 18:51:44 -07: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

cacert.pem

use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches.

2013-02-13 20:09:30 -08: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

IXR_Library.php

will be doing some stuff for which handcrafting xmlrpc requests is too bloody painful. xmlrpc is long dead, but it's the language of wordpress - which is far from dead.

2013-11-26 00:06:56 -08:00

jquery.timeago.js

realtime updates of "6 minutes ago" with fallback to iso8601 timestamps (available on tooltip)

2012-07-23 04:11:59 -07:00

markdown.php

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

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

OAuth1.php

several oauth fixes - shred doesn't completely work yet, but it also doesn't completely NOT work, so at least there's some improvement

2013-09-16 21:35:52 -07: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