7666 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	8c007ef9b5	fix template syntax	2013-07-17 22:02:03 -07:00
friendica	94e87c0a84	update friends/followers API so Friendica Android client won't choke	2013-07-17 21:53:35 -07:00
friendica	fc265a8e3a	block duplicate channels	2013-07-17 21:38:37 -07:00
friendica	15a614e158	Merge https://github.com/friendica/red into zpull	2013-07-17 18:16:04 -07:00
friendica	e147bb80de	usability improvements on abook permissions settings - keep advanced dialogue open, make quick links clear relevant settings before setting each, and don't auto submit. This shows you exactly what happens with the quick settings and allows you to change/correct it if it isn't what you want.	2013-07-17 18:12:50 -07:00
Thomas Willingham	d286081381	Merge pull request #80 from git-marijus/patch-1 ... Update style.css	2013-07-17 13:23:21 -07:00
git-marijus	1fd4d0a605	Update style.css ... wall-item-arrowphoto-wrapper z-index should not be higher than nav z-index otherwise arrow scroll above the nav area...	2013-07-17 22:19:41 +02:00
friendica	2323e946ee	Merge https://github.com/friendica/red into zpull	2013-07-17 02:02:54 -07:00
friendica	d6133c861c	configurable theme precedence rules, and passing the page owner to the pcss theme settings.	2013-07-17 02:01:35 -07:00
friendica	4c30cddbfc	provide a controlling user for theme settings, not necessarily local_user() - can't test on my test site so moving into production and I'll debug it there.	2013-07-16 22:48:05 -07:00
friendica	6d447ace5c	define some photo types; primarily profile photos and things, but there is room for others. Also move the "decoration" out of the mod_page.css and into fancy.css - mod_xxx.css should only specify element positions and basic layout, not "decoration". Once we get more positioning stuff moved into module and basic layout files, we can trim down the style.css a lot - as it will theoretically only have decoration. And if we use macro substitution (pcss) we should be able to ultimately change the colour, size or background in one place and be done with it. This will make life easier for theme developers.	2013-07-16 21:56:02 -07:00
Thomas Willingham	3743d5ca79	Observer permissions (but not ACL yet) for webpages.	2013-07-16 18:48:53 +01:00
Thomas Willingham	328ebda77a	Kill autogenerated warnings, plus a typo.	2013-07-16 18:08:26 +01:00
Thomas Willingham	cc91036350	Whitespace making smarty fart	2013-07-16 16:07:06 +01:00
friendica	de734bbea8	photo_flags - for adding taxonomy photos and other stuff.	2013-07-16 04:46:01 -07:00
friendica	26fa2b105d	parse_url: add missing scheme unless url begins with '/'	2013-07-16 01:14:23 -07:00
friendica	d875bbb022	theme the page link title	2013-07-15 23:10:26 -07:00
friendica	4de52e601c	add channel_name to delivery logs because it is a bit more useful than an xchan_hash	2013-07-15 19:04:23 -07:00
friendica	2cfd9a3fa9	Merge https://github.com/friendica/red into zpull	2013-07-15 18:08:03 -07:00
friendica	3bd7c1af23	fix some issues that showed up in the logs.	2013-07-15 18:07:23 -07:00
friendica	1ace84a564	Merge pull request #78 from git-marijus/master ... some more spin.js porting	2013-07-15 17:37:41 -07:00
marijus	c1739fa879	style updates due to spin.js porting	2013-07-15 19:50:42 +02:00
marijus	b536116791	more spin.js porting	2013-07-15 18:43:34 +02:00
friendica	f384695e3d	more diagnostics	2013-07-15 03:12:51 -07:00
friendica	d571ac02b2	provide a way to search the directory by modification date	2013-07-14 22:53:28 -07:00
friendica	4e69119d58	implement the other part of ITEM_NOCOMMENT - which means an item is not commentable. Useful for pages - that is if they use the conversation() function to render the post.	2013-07-14 21:09:19 -07:00
friendica	9e28318e4d	more error checking	2013-07-14 20:42:06 -07:00
friendica	12c2cea36f	fix xtag	2013-07-14 18:52:24 -07:00
friendica	0fd83f3fec	Merge https://github.com/friendica/red into zpull	2013-07-14 18:33:07 -07:00
friendica	75af9b8cd1	more logging on hubloc import - figure out why it did not get stored.	2013-07-14 18:32:20 -07:00
Thomas Willingham	c5133f3745	Nobody died, so remove not-needed logging.	2013-07-15 00:57:49 +01: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
friendica	5b6294dbc0	Merge https://github.com/friendica/red into zpull	2013-07-14 01:23:07 -07:00
friendica	25ed8788e9	install typo	2013-07-14 01:22:56 -07:00
friendica	873c1f381e	Merge pull request #77 from git-marijus/master ... add spin.js a themable js spinner to red	2013-07-14 01:19:24 -07:00
friendica	5b73755af7	Merge https://github.com/friendica/red into zpull	2013-07-14 01:14:03 -07:00
friendica	8154268d0a	new doc pages	2013-07-14 01:13:38 -07:00
friendica	39856f7cb1	Add self to recipient lists. Sure we already have a copy but it's possible our nomadic channel clones don't.	2013-07-14 01:12:05 -07:00
Thomas Willingham	ba5803bebc	Give prettyphoto it's own template to make themeing it less annoying.	2013-07-14 02:36:59 +01:00
git-marijus	6abaa37fe3	port jot to spin.js	2013-07-13 23:35:38 +02:00
git-marijus	3ca93a2b9e	port jot to spin.js	2013-07-13 23:33:21 +02:00
git-marijus	7e00a1662d	port jot to spin.js	2013-07-13 23:31:34 +02:00
git-marijus	9cb151fe27	port jot to spin.js	2013-07-13 23:28:44 +02:00
git-marijus	e1a1fc9a5e	port jot to spin.js	2013-07-13 23:25:31 +02:00
git-marijus	a0f2d20e20	port like button to spin.js	2013-07-13 21:47:06 +02:00
git-marijus	ec0d460dc5	port like button to spin.js	2013-07-13 21:43:50 +02:00
git-marijus	34364fd1ed	port like button to spin.js	2013-07-13 21:42:38 +02:00
git-marijus	33d1736228	port like button to spin.js	2013-07-13 21:40:53 +02:00