Commit graph

109 commits

Author SHA1 Message Date
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
Christian Vogeley
25a533bd72 New modal dialog for item expiry 2013-12-22 14:21:57 +01:00
marijus
6a9432c725 editor_plugin_src.js compressed at jscompress.com 2013-12-09 11:30:32 +01:00
Christian Vogeley
b61658ee73 bootbox 2013-12-08 19:37:41 +01:00
Christian Vogeley
7b248e0b89 Merge branch 'bootstrap' 2013-12-08 16:45:23 +01:00
Christian Vogeley
18defb2984 Include bootstrap 2013-12-08 15:26:02 +01:00
friendica
c8334fae82 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
marijus
3311fe4813 make autocomplete better themable by adding an id 2013-11-14 18:03:16 +01:00
friendica
3a9cbcaf01 Wankers. 2013-11-07 23:25:13 -08:00
friendica
09ca39fd08 provide an html src converter 2013-10-31 22:08:10 -07:00
friendica
043042428c add font_awesome 2013-10-08 16:11:20 -07:00
friendica
963e0cefbb get rid of pink search bar when not using redbasic "red" 2013-10-03 02:20:09 -07:00
Stanislav Lechev [0xAF]
24128a4e1f Add colorpicker jquery plugin for themes 2013-09-28 12:23:55 +03:00
friendica
9bff739d96 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
git-marijus
6f7e61d42a port to spin.js 2013-07-13 18:28:26 +02:00
friendica
7dfea2c70d 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
Thomas Willingham
60721f4292 Colorbox 2013-04-26 22:31:50 +01:00
Olivier Migeot
2941925782 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
Thomas Willingham
2dafe2952d Remove Twatter/Facebook shit. 2013-03-23 21:14:03 +00:00
Thomas Willingham
6b3fb662cb Add prettyPhoto library. 2013-03-23 20:12:42 +00:00
friendica
1b41ce8fa7 tweaks 2013-03-05 19:03:22 -08:00
friendica
4cfbdfa6db cleanup affinity tool 2013-03-03 23:38:08 -08:00
friendica
b4057cfeb4 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
friendica
9725dcf41d distributed directory search from the navbar 2013-01-19 00:43:05 -08:00
friendica
60d21716da alternate wysiwyg bbcode editor 2012-12-10 15:07:45 -08:00
friendica
e17ba14696 DB: do the mail table again. Mail almost working onsite, still needs to zot though 2012-12-04 18:24:46 -08:00
friendica
67a7d440d9 usability improvements 2012-11-13 02:57:15 -08:00
friendica
a7abe24382 more file cleanup 2012-10-22 19:46:18 -07:00
friendica
6fcb3b4415 add jquery.i18n for client side translations 2012-08-13 04:28:12 -07:00
friendica
02cc436ec7 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
friendica
6a24904799 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
friendica
2534075afe see if this works for getting rid of scrollbars 2012-07-24 23:33:42 -07:00
friendica
f535554cfa zentity is currently just a screen mockup until the page spec is complete 2012-07-24 21:06:23 -07:00
friendica
3decf67e6d realtime updates of "6 minutes ago" with fallback to iso8601 timestamps (available on tooltip) 2012-07-23 04:11:59 -07:00
friendica
9299050fcb add js relative date calculator so that "3 minutes ago" will be updated when it gets to 4 minutes. 2012-07-22 19:49:49 -07:00
friendica
6e08f39820 simplify 2012-07-21 03:48:59 -07:00
friendica
a20a637727 merge upstream, slider work, refactor ping module, language selection work 2012-07-13 07:09:29 -07: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