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
rabuzarus
8064ff6ecb
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 16:04:53 +02:00
867ebeb661
PHP7 needs an integer value for the length
2016-07-28 08:59:16 +02:00
rabuzarus
0167a2bd61
port of Hubzillas code highlight feature
2016-06-16 11:38:12 +02:00
root
3c402b6a6c
Remove debug log
2016-05-24 22:37:40 +02:00
rabuzarus
dd2a8fd852
jquery.textcomplete update to v1.3.4
2016-04-29 14:31:09 +02:00
rabuzarus
bbab3f590a
rework autocomplete: update jquery.textcomplete to v1.3.3
2016-04-15 02:02:54 +02:00
rabuzarus
01b02dbcaa
Merge develop into 1404_reworked_autocomplete
...
Conflicts:
include/text.php
view/templates/head.tpl
view/theme/duepuntozero/style.css
view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
Michael Vogel
88018b6e73
Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie
2016-02-14 20:57:57 +01:00
Michael Vogel
b0548018d8
Simplepie is removed since we don't use it anymore
2016-02-14 19:50:59 +01:00
Fabrixxm
c28109ca94
Update HTMLPurifier to v4.7.0
2016-02-09 11:06:17 +01:00
rabuzarus
24d4716204
perfect-scrollbar: update to 0.6.10
2016-02-02 15:56:06 +01:00
rabuzarus
9fba5041a0
rework autocomplete: update query-textcomplete
2016-01-30 16:42:46 +01:00
rabuzarus
39a849c113
rework autocomplete: new ac for poke, contacts, prv_messages
2016-01-22 17:47:48 +01:00
rabuzarus
16e4e94b29
rework autocomplete: initial commit
2016-01-19 18:11:40 +01:00
8e7d53cd41
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
Michael Vogel
771d0c4bfa
Merge pull request #2224 from rabuzarus/2812_js_scrollbars
...
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
2016-01-03 14:09:17 +01:00
rabuzarus
77a230342f
perfect-scrollbar: added Source link to the lib
2015-12-30 16:26:57 +01:00
rabuzarus
466968952c
colorbox: update library to 1.6.3
2015-12-30 14:53:02 +01:00
rabuzarus
8a51e470e7
perfect scrollbars: added README
2015-12-30 14:22:13 +01:00
rabuzarus
e93156427e
use perfect-scrollbars for nav-notifications-menu (and in vier aside)
2015-12-28 23:16:34 +01:00
Fabrixxm
6fbb02fb93
RINO 2 based on php-encryption
...
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
2015-06-23 16:13:09 +02:00
rabuzarus
2ad8fdc40b
port of red matrix datepicker implementation
2015-05-22 18:53:18 +02:00
thorsten23
a665ebafa4
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
Michael Vogel
59fa1c9453
New version of the library for the detection of mobiles.
2015-02-24 11:26:52 +01:00
Michael Vogel
d4b0a9ea2a
Solving parsing problems with the markdown library and html elements.
2015-02-24 10:21:09 +01:00
Michael Vogel
e0d3594933
Added the markdown parser to the time measurement system
2015-02-24 00:08:17 +01:00
Michael Vogel
884b8b03db
Cleaned up the Markdown files.
2015-02-23 12:47:57 +01:00
Michael Vogel
b710c8bbfd
Tests with new markdown library
2015-02-23 08:27:35 +01:00
Michael Vogel
70615d7f78
New versions.
2015-02-22 20:26:56 +01:00
Michael Vogel
4a6a6ca937
Bugfix for spaces in links
2015-02-22 20:06:13 +01:00
Michael Vogel
2f46675a89
New routines for markdown to html and html to markdown.
2015-02-22 17:38:28 +01:00
Michael Vogel
a86c143e24
The "scrape" bugfix lead to partly damaged encodings. This is fixed now.
2015-01-04 11:56:41 +01:00
Michael Vogel
04106ff6f5
Moving the clean up code to a central place.
2014-12-08 22:37:49 +01:00
hauke
baabb5ba8b
removed fancybox as it is not used anywhere
2014-09-07 14:54:10 +02:00
hauke
bc8df42dcc
update of fullcalender to v1.6.4
2014-09-07 14:31:01 +02:00
hauke
0e1f8f6486
reverting tinymce changes, updating smarty to 3.1.19
2014-09-07 13:38:28 +02:00
hauke
386eadde3a
updated tinymce to 3.5.11
2014-09-07 12:51:05 +02:00
hauke
87fa2ee2af
updated jquery to version 1.11, updated themes frost and diabook where necessary
2014-09-06 16:21:03 +02:00
Michael Vogel
e2f9ae3970
Removing of some warnings
2014-07-24 22:53:09 +02:00
Michael Vogel
405dd794fe
New database system that uses PDO if present/Test script for doing database upgrades.
2014-04-28 23:55:47 +02:00
Michael Vogel
aed28a24f1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/crepair.php
2014-01-05 16:22:42 +01:00
Michael Vogel
7770317f1e
Preparations for a more visible reshare when exporting to twitter, statusnet or facebook.
...
The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt.
2013-07-28 20:38:48 +02:00
Zach Prezkuta
127b7a589e
eliminate Cropper conflicts with jQuery
2013-06-01 10:42:51 -06:00
Zach Prezkuta
35358baac9
update to v4.0.0; point to local host of SWF
2013-05-11 10:55:09 -06:00
Zach Prezkuta
fec4581f34
basic video playback support using VideoJS
2013-05-03 18:17:56 -06:00
Carsten Pfeiffer
7e5ec9fceb
Wrap class OAuthException with !class_exists
...
Same problem and solution as discussed on
https://drupal.org/node/1334528
2013-04-27 21:08:45 +02:00
86eec2e0fa
Twitter API 1.1
2013-03-05 03:48:29 +01:00
Olaf Conradi
77f4a36d90
Ignore invalid tokens when scraping an URL
2013-03-03 21:41:27 +01:00
Zach Prezkuta
0e67ba2bd4
update minified javascripts
2013-02-04 18:16:13 -07:00
