Commit graph

9716 commits

Author SHA1 Message Date
friendica
f2c8559170 minor template and doc fixes 2014-03-04 03:27:53 -08:00
friendica
66f754c4c7 !@#$% pay~!@#$pal 2014-03-04 01:43:39 -08:00
friendica
3d49bf0320 directory sync issues 2014-03-03 21:00:42 -08:00
friendica
cdd2e9cd95 layout export to file 2014-03-03 20:05:23 -08:00
friendica
bfd9f5ec87 enable network/matrix expiration, this should be functional but the options have been reduced/restricted so we're only looking at network posts and ignore anything that is filed, starred, or is resource_type 'photo' (which should not be possible in non-wall posts, but we just want to be sure). Will require the adventurous tester(s) to set 'channel_expire_days' in their channel record. 2014-03-03 19:15:11 -08:00
friendica
12480a13cd item widget - displays one (webpage) item by mid. This is how you could put multiple content blobs on a page without turning them all into blocks. 2014-03-03 18:20:52 -08:00
friendica
5c08713ee5 remove test menu 2014-03-03 15:22:54 -08:00
friendica
d16324685a implement horizontal menu class in redbasic 2014-03-03 15:21:43 -08:00
friendica
a36014f011 Merge https://github.com/friendica/red into zpull 2014-03-03 14:39:42 -08:00
friendica
81c439bc7d revert the temporary fix for the missing hdr.tpl and add the ability to provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated. 2014-03-03 14:33:49 -08:00
friendica
f8de124244 Merge pull request #353 from git-marijus/master
little css fixes
2014-03-04 09:27:52 +11:00
friendica
002a86fb71 Merge https://github.com/friendica/red into zpull 2014-03-03 11:34:15 -08:00
friendica
608c7501fe missing file 2014-03-03 11:33:42 -08:00
marijus
64b32d9146 var update 2014-03-03 19:56:38 +01:00
marijus
239550b0c9 one got lost and a typo 2014-03-03 19:48:16 +01:00
marijus
ad10eb2875 little css fixes 2014-03-03 19:14:35 +01:00
Thomas Willingham
c028d9b1d0 Partially revert 895c9411d9
Not entirely sure why the lines in question were removed, but this is
required as a quick fix for broken notifications.
2014-03-03 17:16:25 +00:00
friendica
7baeb45183 some anomolies found when viewing connections in various cases. 2014-03-02 19:40:59 -08:00
friendica
b98ddc69de disable the right_aside on choklet two-column layouts 2014-03-02 17:21:06 -08:00
friendica
7cdfe48bb4 add choklet to the comanche docs 2014-03-02 17:15:33 -08: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
eb2b2f504c Merge pull request #350 from git-marijus/master
make navbar themable again
2014-03-03 09:25:37 +11:00
marijus
57cc77f6d5 make navbar themable again 2014-03-02 22:50:53 +01:00
marijus
2313736e92 Merge branch 'master' of https://github.com/friendica/red 2014-03-02 10:27:08 +01:00
friendica
bf401a5afa allow templates to have multiple styles - this would be a bit like having a schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense. 2014-03-02 00:24:29 -08:00
friendica
1920873c34 s/layout/template/g *.pdl 2014-03-01 19:28:21 -08:00
friendica
4c2224e952 Merge https://github.com/friendica/red into zpull 2014-03-01 17:55:15 -08:00
friendica
cc77538c69 change the docs for template tag 2014-03-01 17:53:57 -08:00
friendica
247cb85c94 it's unfortunate that we use the term "layout" to refer both to a template file and to Comanche .PDL files. I think we should probably refer to the template file as "template" just to avoid confusion. For the moment we'll provide both, since the 'layout' is already in the wild. But please use "template" going forward. 2014-03-01 17:49:28 -08:00
friendica
52c2085176 Merge pull request #347 from solstag/master
Update pt-br translation.
2014-03-02 12:46:14 +11:00
friendica
36e823e5b5 Merge pull request #346 from git-marijus/master
css fixes
2014-03-02 12:45:51 +11:00
friendica
c402f39cf8 first draft of creating templates documentation 2014-03-01 17:44:18 -08:00
marijus
db266958c4 Merge branch 'master' of https://github.com/friendica/red 2014-03-01 11:35:02 +01:00
Alexandre Hannud Abdo
1bdea24238 Update pt-br translation. 2014-03-01 03:00:35 -03:00
friendica
9a5a2146a2 Merge https://github.com/friendica/red into zpull 2014-02-28 16:01:25 -08:00
friendica
429022e116 allow one to ignore pending connections 2014-02-28 16:00:29 -08:00
marijus
6b6052d5a9 Revert "a little fix against bootstrap 3.1.1"
This reverts commit e82c9eb176.
2014-02-28 23:34:52 +01:00
marijus
e82c9eb176 a little fix against bootstrap 3.1.1 2014-02-28 23:23:19 +01:00
marijus
b390336016 add hover effect to usermenu caret 2014-02-28 23:04:38 +01:00
zzottel
745f20ccbf Merge pull request #345 from zzottel/master
correct bbcode link in German docs
2014-02-28 14:04:32 +01:00
zottel
8ae986b9c6 correct bbcode link in German docs 2014-02-28 14:00:50 +01:00
friendica
ed1e975faf It's no longer simply "Red" and the jury is still out on whether or not it's a "project". Most of the time it doesn't seem like one or act like one. It doesn't seem to be anything cohesive that you can put your finger on and everybody involved is mostly doing their own thing and marching to their own drummer. It is however the RedMatrix, whatever that means to you. 2014-02-28 01:53:39 -08:00
friendica
2d487f306d more doc 2014-02-28 01:31:08 -08:00
friendica
096cc726b7 dang - you really have to bludgeon this thing to get youtube to use https 2014-02-28 01:30:05 -08:00
friendica
46f0de7120 try to fix youtube mixed content warnings 2014-02-28 00:57:35 -08:00
friendica
2a7e43c08f more to-to 2014-02-27 23:25:23 -08:00
zottel
d2304cf168 trying to get back to upstream state 2014-02-28 08:22:23 +01:00
zottel
0144ac1662 Merge remote-tracking branch 'upstream/master' 2014-02-28 08:19:40 +01:00
zottel
4bb8e294a1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/help.php
2014-02-28 08:16:56 +01:00