 friendica
|
45df73d456
|
add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly.
|
2014-09-18 17:06:15 -07:00 |
|
 marijus
|
8835f646ae
|
Revert "Revert "Merge pull request #583 from git-marijus/master""
This reverts commit 08638f3ec8.
|
2014-09-11 10:35:19 +02:00 |
|
|
friendica
|
08638f3ec8
|
Revert "Merge pull request #583 from git-marijus/master"
autoload broken - even after clearing cache and retrying.
This reverts commit 13e7a8f123, reversing
changes made to 4712b78e52.
|
2014-09-10 16:09:01 -07:00 |
|
|
marijus
|
c1c2214b47
|
photo justification
|
2014-09-10 17:10:39 +02:00 |
|
 Jeroen
|
010d4071ad
|
Introducing page template Redable (sic). A template for making it easier to read long texts on a wide range of devices. Using rem and em for font sizes and region widths. Regions: aside, content, right_aside and footer. Advised to only use the middle content region as much as possible (but left and right can be used for indexes if you like). Based on the default template. Maybe later I will add some alternative css's.
|
2014-07-16 18:09:46 +00:00 |
|
|
friendica
|
0bfd08b547
|
fix fluid layout for choklet_bannertwo
|
2014-05-14 18:07:01 -07:00 |
|
|
friendica
|
b31aa49a43
|
this doesn't really work
|
2014-05-14 16:33:48 -07:00 |
|
|
friendica
|
ca7888b7ce
|
choklet tweaks
|
2014-05-13 22:35:33 -07:00 |
|
|
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 |
|