10327 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	6ac50faaa2	doc updates	2014-05-16 02:13:27 -07:00
friendica	6d4d8ec42d	icons	2014-05-15 22:49:42 -07:00
friendica	95f4103a9f	some photos	2014-05-15 22:29:07 -07:00
friendica	659714956c	add hover tips - except we need a way to translate the things	2014-05-15 20:58:26 -07:00
friendica	07fbf0d5de	this is how to link photos to apps	2014-05-15 20:46:41 -07:00
friendica	420540fc94	login app	2014-05-15 20:39:49 -07:00
friendica	a2b4187a08	add directory	2014-05-15 20:36:09 -07:00
friendica	2fdc13e91d	some sidebar content (doesn't yet do anything)	2014-05-15 20:20:20 -07:00
friendica	2dee303d92	more base apps	2014-05-15 20:09:28 -07:00
friendica	2450caa161	add the theme file	2014-05-15 19:58:23 -07:00
friendica	2237c39c94	first apd files	2014-05-15 19:56:31 -07:00
friendica	077b97eac4	the app menu takes form	2014-05-15 19:54:37 -07:00
friendica	99d97170de	apps: provide a default photo if none was set. For now it's the default profile photo until we have a default app photo	2014-05-15 17:15:22 -07:00
friendica	e68bb132a7	some backend stuff for apps	2014-05-15 16:43:42 -07:00
friendica	8b233723c5	clear the jot-nets float	2014-05-14 20:49:33 -07:00
friendica	e5e479b405	doc updates	2014-05-14 18:21:43 -07:00
friendica	7a78da7982	major cleanup of choklet+bannertwo	2014-05-14 18:12:18 -07:00
friendica	7c4503968d	Merge branch 'navbacker'	2014-05-14 18:07:43 -07:00
friendica	0bfd08b547	fix fluid layout for choklet_bannertwo	2014-05-14 18:07:01 -07:00
friendica	5660e31459	Merge https://github.com/friendica/red into pending_merge	2014-05-14 17:11:35 -07:00
friendica	9af818b133	explain default permissions choices better	2014-05-14 17:11:05 -07:00
friendica	b31aa49a43	this doesn't really work	2014-05-14 16:33:48 -07:00
marijus	ce25601ed0	whitespace	2014-05-14 17:24:01 +02:00
marijus	9bfcc0c5e2	colorpicker: enable rgba for for item and comment colors	2014-05-14 17:16:55 +02:00
friendica	722b6c78cb	fix author delete (non-owner)	2014-05-14 03:10:36 -07:00
friendica	2f1e4a6370	xss prevention	2014-05-14 00:55:32 -07:00
friendica	de550d45ff	more choklet work	2014-05-13 22:39:58 -07:00
friendica	ca7888b7ce	choklet tweaks	2014-05-13 22:35:33 -07:00
friendica	b0dc3d3b4c	add photo widget	2014-05-13 21:33:39 -07:00
friendica	2f5bd7e1b3	add activity_received hook	2014-05-13 20:58:55 -07:00
friendica	2c27ba66a5	zrlify (turn into zmg) any relevant img tags in a post.	2014-05-13 20:17:52 -07:00
friendica	a4869394f4	allow jgrowl 'close all' message to be translated	2014-05-13 17:59:47 -07:00
friendica	e664d6486a	fix ca anomaly	2014-05-13 02:21:01 -07:00
friendica	71ded9388b	missing paren	2014-05-13 02:17:17 -07:00
friendica	8c948f4bbe	forbid redefinition of language plural_select function	2014-05-13 02:10:06 -07:00
friendica	13cf31ae73	update the tagging doco	2014-05-12 18:12:31 -07:00
friendica	b3cc05c41d	try to fix random logouts	2014-05-12 17:04:03 -07:00
jeroenpraat	6f78d4785c	Docu update: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=00eeea0d6df910aa92a02bcd292cf0b9e5f918281e34a771eddc485085e4ba0a@redmatrix.nl&zid=jeroenpraat%40redmatrix.nl	2014-05-12 20:15:25 +00:00
marijus	0bf68af0a7	make comment_indent an option and removeitem_opacity as it is not working properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise.	2014-05-12 20:33:14 +02:00
marijus	0446db8104	fix bootstrap override position issue with dropdown menu	2014-05-12 16:57:13 +02:00
marijus	c7a0891bbe	Typo	2014-05-12 11:27:53 +02:00
RedMatrix	d1841911b3	Merge pull request #458 from pixelroot/master ... modified: view/ru/messages.po	2014-05-12 18:27:05 +10:00
pixelroot	5830e85912	modified: view/ru/messages.po ... modified: view/ru/strings.php	2014-05-12 09:57:48 +02:00
friendica	ef5ffad690	log IP mis-matches even if paranoia isn't set.	2014-05-11 22:01:53 -07:00
friendica	3eae3fd496	a bit more progress on using shred to pick through API results. Commented out because the array storage is kindof weird so the first try (assuming simple arrays) didn't work out. I'll have to rethink how to index these things and may have to rewrite the js() function to do the kinds of things I want.	2014-05-11 18:36:00 -07:00
friendica	045d23a27c	Merge https://github.com/friendica/red into pending_merge	2014-05-11 17:38:22 -07:00
friendica	b5372f8152	button styling mitemlist	2014-05-11 17:37:54 -07:00
RedMatrix	c455663509	Merge pull request #456 from cvogeley/master ... Move "boxy" conversation design into a schema file	2014-05-12 09:43:58 +10:00
Christian Vogeley	3fbac93619	grrr	2014-05-11 13:23:38 +02:00
Christian Vogeley	889aaad668	For the moment last change	2014-05-11 13:16:01 +02:00