mexon/friendica
1
0
Fork 0
Code Pull requests Activity
friendica/library
History
Roland Häder d489ba1510 Merge remote-tracking branch 'upstream/develop' into develop 
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php
2016-12-13 09:59:43 +01:00
..
Chart.js-1.0.2 added Chart.js 1.0.2 to friendica library and use it instead of CDN version for graphs 2016-01-15 18:19:21 +01:00
colorbox colorbox: update library to 1.6.3 2015-12-30 14:53:02 +01:00
cropper eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
datetimepicker port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
dddbl2 Removing of some warnings 2014-07-24 22:53:09 +02:00
defuse/php-encryption-1.2.1 RINO 2 based on php-encryption 2015-06-23 16:13:09 +02:00
ezyang/htmlpurifier Update HTMLPurifier to v4.7.0 2016-02-09 11:06:17 +01:00
fullcalendar update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
html-to-markdown New versions. 2015-02-22 20:26:56 +01:00
HTML5 The "scrape" bugfix lead to partly damaged encodings. This is fixed now. 2015-01-04 11:56:41 +01:00
jgrowl updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
jquery-textcomplete jquery.textcomplete update to v1.3.4 2016-04-29 14:31:09 +02:00
langdet Merge remote-tracking branch 'upstream/develop' into develop 2016-12-13 09:59:43 +01:00
mcefixes fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
Mobile_Detect New version of the library for the detection of mobiles. 2015-02-24 11:26:52 +01:00
moment update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
oauth2-php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
perfect-scrollbar perfect-scrollbar: update to 0.6.10 2016-02-02 15:56:06 +01:00
php-markdown Cleaned up the Markdown files. 2015-02-23 12:47:57 +01:00
phpsec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
Smarty reverting tinymce changes, updating smarty to 3.1.19 2014-09-07 13:38:28 +02:00
spam finalise spam storage model, begin driver changes. 2012-03-05 23:20:42 -08:00
Text_Highlighter port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
tinymce reverting tinymce changes, updating smarty to 3.1.19 2014-09-07 13:38:28 +02:00
tiptip Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
video-js update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
asn1.php PHP7 needs an integer value for the length 2016-07-28 08:59:16 +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
markdown.php Solving parsing problems with the markdown library and html elements. 2015-02-24 10:21:09 +01:00
oauth.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
OAuth1.php Replaced 'q' by 'pagename' so that the basestring is encoded right. The correct basestring is needed to create the right signature in the OAuth authentication process. 2015-03-14 19:55:36 +01:00
openid.php Remove debug log 2016-05-24 22:37:40 +02:00
slinky.php Merge remote-tracking branch 'upstream/master' 2014-01-05 16:22:42 +01:00
twitteroauth.php Preparations for a more visible reshare when exporting to twitter, statusnet or facebook. 2013-07-28 20:38:48 +02:00