9702 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
friendica	019781f626	more tasks	2014-02-27 23:10:21 -08:00
friendica	7cb295bbe6	over-ride code tags within pre blocks as bootstrap which puts a border around pre tags, which messes up markdown code blocks which have yet another border.	2014-02-27 20:55:25 -08:00
friendica	102521844b	put schemas in Comanche (this requires theme support (!))	2014-02-27 20:48:10 -08:00
friendica	d2bc7c606a	minor fixes to suggested chatrooms	2014-02-27 17:10:26 -08:00
friendica	642da17b86	chatroom suggestions	2014-02-27 17:07:11 -08:00
friendica	402d44e2f4	fix photos in private mail	2014-02-27 16:01:44 -08:00
Thomas Willingham	5cf0e74501	Capitalise $a->page['title'] in doco pages.	2014-02-27 17:50:36 +00:00
zottel	f8b3f032a9	change page title for bbcode help files	2014-02-27 18:50:14 +01:00
zzottel	05882df43a	Merge pull request #342 from zzottel/master ... German help	2014-02-27 18:35:54 +01:00
zottel	6c0fdbebeb	some new German files	2014-02-27 18:35:03 +01:00
Thomas Willingham	c66313af88	Merge pull request #343 from beardy-unixer/master ... Doc update (just formatting and typos)	2014-02-27 16:35:46 +00:00
Thomas Willingham	ac383cf07b	Can't type today	2014-02-27 16:33:36 +00:00
Thomas Willingham	9488bc0631	Who reverted that?	2014-02-27 16:31:25 +00:00
Thomas Willingham	46a3c4d804	Doc update	2014-02-27 16:28:29 +00:00