keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21409 commits 4 branches 0 tags 179 MiB
Commit graph

182 commits

Author SHA1 Message Date
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
rabuzarus
8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Zach Prezkuta
bde68bd8ca add colorbox 2013-02-04 18:09:57 -07:00
Zach Prezkuta
e0dd8944ce some deleted files for tinymce update 2013-01-27 17:34:10 -07:00
Zach Prezkuta
d39a2e8a9d TinyMCE 3.5.8 update; some fixes 2013-01-27 14:26:43 -07:00
Fabrixxm
a875bec75c update fancybox, remove tiptip from head.tpl 2013-01-22 08:17:23 -05:00
friendica
891bfd9f91 further jenkins include fixes 2012-11-22 05:09:28 -08:00
Domovoy
a31c779a15 Transform prefixed elements to classic ones 2012-09-14 07:59:54 +02:00
Domovoy
09413a0f0a Better integration with the existing code 2012-09-14 05:50:35 +02:00
Domovoy
f9a9b70123 Detect the namespace uri from token name 2012-09-14 05:30:21 +02:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica
5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica
fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
friendica
f0db196288 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
friendica
e39014a3a7 update tinymce to 3.5.0.1 2012-05-15 17:18:46 -07:00
friendica
62727012d3 language detection library 2012-05-12 01:55:18 -07:00
friendica
547007e199 add photos to PM autocomplete, improved appearance 2012-05-10 19:29:01 -07:00
friendica
851264161f mail autcomplete testing 2012-05-06 19:55:39 -07:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
friendica
63ea378d92 document tinymce fixes/workarounds 2012-04-01 04:13:27 -07:00
friendica
03b95c9a09 translate br with extra elements 2012-03-26 16:56:44 -07:00
friendica
86d8d3f442 private file in repository 2012-03-21 00:34:12 -07:00
tony baldwin
e5c29fcc78 Merge remote branch 'upstream/master' 2012-03-21 01:36:23 -04:00
tony baldwin
cf17606d0f added Vijay's theme from facepark.in 2012-03-21 01:33:48 -04:00
friendica
b4a2dae085 added README to mcefixes to explain what is going on. 2012-03-20 21:04:09 -07:00
friendica
f55779fd83 update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks 2012-03-20 20:47:31 -07:00
friendica
4bb280bc2f lost changes to tinymce/bbcode 2012-03-17 22:18:21 -07:00
friendica
9e731506c2 remove admin view of local directory 2012-03-17 22:14:17 -07:00
Tobias Hößl
7868e3897b In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better. 2012-03-13 21:46:57 +00:00
friendica
3da97e2393 finalise spam storage model, begin driver changes. 2012-03-05 23:20:42 -08:00
Alexander Kampmann
dd9432903d Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
Alexander Kampmann
e0c659b34b Enabled automated doc building. Changes: 
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
 2012-03-01 11:44:33 +01:00
friendica
53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
Alexander Kampmann
9986fc1910 fixed syntax errors 2012-02-27 14:12:44 +01:00
friendica
cb9d0993f1 waitman gobble fix for escaping code blocks in tinymce 2012-02-24 20:07:57 -08:00
friendica
58a9c652de Merge pull request #45 from annando/master 
New HTML to BBCode converter, changes to BBCode, nginx support, ...
 2012-02-22 20:21:05 -08:00
Abinoam P. Marques Jr
6e2ae7bf1e library/OAuth1 - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
root
b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
friendica
d8b82b24a4 Documentation on Friendica changes to B8 and notice of source availability in accordance with LGPL 2012-02-15 23:02:05 -08:00
fabrixxm
16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00
Fabio Comuni
22cfb77173 events: first test for full-javascript events calendar 2012-02-14 16:19:48 +01:00
friendica
803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
Keith Fernie
2c9cfb1fe9 modified: library/slinky.php Set up tabs in code correctly. 2012-02-09 21:44:52 +00:00
Keith Fernie
955022e7dc modified: library/slinky.php Added a custom YourLS shortener to the available shorteners 2012-02-09 20:45:38 +00:00
friendica
f57fa90228 more work on Friendica db driver for b8 2012-02-01 20:37:05 -08:00
friendica
64d0616762 add uid variable to b8 classes 2012-02-01 19:23:05 -08:00
friendica
c8c062d960 add spam engine 2012-01-31 15:54:41 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
792e957842 symbolic bbcode icon 2012-01-11 18:54:10 -08:00
zottel
720787b772 Switch to jquery 1.7.1 2011-12-12 08:11:35 -08:00
friendica
335c0cddcf diaspora reshared lists rendering as html 2011-11-23 01:44:07 -08:00