friendica
|
196b3022bd
|
Merge branch 'master' into movejs
Conflicts:
version.inc
|
2014-01-06 02:37:06 -08:00 |
|
friendica
|
0c85c97480
|
move js files from core
|
2014-01-04 03:58:21 -08:00 |
|
Christian Vogeley
|
0f4b6ba371
|
Merge correction
|
2013-12-22 15:05:56 +01:00 |
|
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
|
dd7fea10c1
|
split out widgets.css
|
2013-12-11 21:28:42 +01:00 |
|
marijus
|
860966ce42
|
this reduces pageloadsize by 355,93KB
|
2013-12-09 10:07:24 +01:00 |
|
Christian Vogeley
|
9f185b95f5
|
Minified bootstrap css
|
2013-12-08 19:06:43 +01:00 |
|
Christian Vogeley
|
2dfd65f90b
|
override bootstrap in bootstrap-red
so theme developers are not forced to change anything
|
2013-12-08 18:49:48 +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 |
|
marijus
|
82388465e4
|
split conversation.css out of style.css
|
2013-12-04 23:32:49 +01:00 |
|
friendica
|
e3f5c4458b
|
re-enable jquery migration tool until we sort out all the issues
|
2013-11-27 00:48:17 -08:00 |
|
friendica
|
ed71567e5c
|
create jquery-compat to hold deprecated jquery functions, load it before all the dependent js scripts
|
2013-11-26 13:24:36 -08:00 |
|
friendica
|
95824642a6
|
make font-asewome optional. Also include jquery.browser in js/main.js so we can turn off the migration toolkit.
|
2013-11-25 19:07:58 -08:00 |
|
friendica
|
34f8b21511
|
init_groups_visitor() was still using old array of id output (not the newer array of hash which we need for permission queries)
|
2013-11-22 11:52:38 -08:00 |
|
friendica
|
353f5f049e
|
Empty commit message.
|
2013-11-21 23:11:50 -08:00 |
|
friendica
|
58e0d58489
|
add rabbit and tripledes ciphers - probably need a pconfig to set the default
|
2013-11-11 18:31:34 -08:00 |
|
friendica
|
ca4103debe
|
e2ee
|
2013-11-10 23:19:44 -08:00 |
|
friendica
|
3a10e698c9
|
Didn't finish it. Gotta' pee.
|
2013-11-10 19:58:08 -08:00 |
|
friendica
|
f8d34a2aaf
|
First visit http://fontawesome.io/cheatsheet/, then it's your turn. Please don't leave this for me to fix, because you'll hate it. There are a few icons we'll have to map to something appropriate - such as "matrix"; though there are some interesting options - and you can always dip into unicode if you don't find something appropriate here; though I would suggest that *if* you do this to create an icon-xyz class wrapper to the HTML "i" tag so that it's handled exactly the same.
|
2013-10-08 17:31:49 -07:00 |
|
friendica
|
97df3116ad
|
looks like it actually needs both files.
|
2013-07-14 01:39:52 -07:00 |
|
friendica
|
92335b2e84
|
add the jquery version, not the standalone spinner
|
2013-07-14 01:38:15 -07:00 |
|
friendica
|
033c91868d
|
we need to actually include spin.js or it causes issues
|
2013-07-14 01:33:47 -07: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 |
|
friendica
|
b8569cc27e
|
fix prettyphoto path
|
2013-05-07 00:41:00 -07:00 |
|
Thomas Willingham
|
6383203ebc
|
Stupid mistake
|
2013-04-26 22:45:20 +01: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
|
4b6bc77977
|
Implement prettyPhoto (somewhat).
|
2013-03-23 21:17:44 +00:00 |
|
friendica
|
4cfbdfa6db
|
cleanup affinity tool
|
2013-03-03 23:38:08 -08:00 |
|
friendica
|
c360565d0a
|
get rid of undefined $ error by mangling theme specific JS include order
|
2012-12-13 04:47:06 -08:00 |
|
friendica
|
ceeb4db6e3
|
Give the UI a little love after all the backend mods
|
2012-10-24 19:13:29 -07:00 |
|
friendica
|
5ff6e9348b
|
a few minor changes
|
2012-08-26 23:05:00 -07:00 |
|
friendica
|
f2a7fcf822
|
more theme modularisation and css/js management
|
2012-08-09 19:09:55 -07:00 |
|