marijus
|
b32f8f0ba7
|
move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again
|
2014-03-13 19:50:22 +01:00 |
|
marijus
|
e8da840eec
|
remove aside on navbar collapse and add button to toggle visibility
|
2014-03-07 13:36:49 +01:00 |
|
friendica
|
895c9411d9
|
add choklet template with several defined flavours, two and three column fluid layouts with optional side margins and a region for a blog-style header photo
|
2014-03-02 16:46:34 -08:00 |
|
friendica
|
e931af8307
|
first cut at choklet template
|
2014-03-02 15:47:01 -08:00 |
|
friendica
|
9a2e73ae15
|
move bootstrap to theme and out of core.
|
2014-02-25 16:29:00 -08:00 |
|
friendica
|
d6a9497e4a
|
cleanup include/menu in preparation for the next phase of bookmarking
|
2014-01-27 14:46:39 -08:00 |
|
friendica
|
3869b16298
|
prettyphoto (js|css) not found
|
2014-01-24 14:35:32 -08:00 |
|
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 |
|
friendica
|
98b0e0221d
|
more comanche stuff
|
2013-12-17 20:03:45 -08: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
|
eb3d8e2cd7
|
provide a page template "none" which lets a webpage take over the entire page. Everything. The application is essentially bypassed. You'll need doctype and html and head and body tags in your content as none of them are supplied. There are no page regions. Nada. We should probably restrict this to those who have code exec in their account_roles but other folks won't be able to do very much useful with it anyway as their HTML is filtered.
|
2013-11-20 16:28:17 -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
|
3f79a9581a
|
clean up the default page definition - get rid of right_aside which is illegal
|
2013-09-29 21:55:40 -07:00 |
|
friendica
|
9b8e3e41f1
|
get rid of ugly article wrapper
|
2013-07-21 20:19:05 -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 |
|
Thomas Willingham
|
3cfde2c177
|
Add an article to default.php to allow for fixed width themes, without breaking anything we've already got.
|
2013-05-29 02:20:44 +01: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
|
ef360f0a5c
|
dang - this is almost testable. Still have to figure out the best way to deal with the profile photo. Otherwise if you're really brave you could give it a go and see what happens. The worst that could happen is that it destroys the universe. Not a big deal. More likely you could end up with a bunch of imported things that have to be cleaned up. Less likely but entirely possible is that nothing useful will happen at all and it'll white screen.
|
2013-02-19 19:08:04 -08:00 |
|
friendica
|
a96d3ac66f
|
The rest of the front end for the new notifications - now only missing "mark all seen" for some types, ajax loader for a couple of types, and perhaps a birthday cake icon if any birthdays today, a bit of css cleanup of duplicated or obsolete stuff
|
2013-01-08 11:59:29 -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
|
dca20f4227
|
zchannel rename to new_channel
|
2012-10-29 21:59:49 -07:00 |
|
friendica
|
3b394ea43f
|
comments sort of working again but now need to fix the threading which was ported when it was only half working
|
2012-10-25 18:42:42 -07:00 |
|
friendica
|
ceeb4db6e3
|
Give the UI a little love after all the backend mods
|
2012-10-24 19:13:29 -07:00 |
|
friendica
|
fbafd92f7f
|
moving a lot of structure around. 'entity' is now 'channel'
|
2012-09-25 17:57:20 -07:00 |
|