Commit graph

91 commits

Author SHA1 Message Date
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
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