16444 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	fbcb711945	we've come a long way since this faq entry on the limits of cloning was written	2016-03-09 19:03:09 -08:00
redmatrix	e95a494041	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-09 16:23:46 -08:00
redmatrix	7732532964	handle UNO move channel operation	2016-03-09 15:56:51 -08:00
jeroenpraat	bb09b8a385	Update doc	2016-03-09 23:25:37 +01:00
redmatrix	b9b46a3f88	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-09 14:18:11 -08:00
redmatrix	7bb461380e	issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel	2016-03-09 14:15:50 -08:00
redmatrix	f5f79b39b8	Merge pull request #318 from git-marijus/master ... should have probably done that on tag release	2016-03-10 09:03:59 +11:00
Mario Vavti	14e55e8bd6	should have probably done that on tag release	2016-03-09 13:06:24 +01:00
redmatrix	bc9d5f5a48	Merge pull request #317 from git-marijus/master ... Issue #316 make /display updates work. Basically copy and paste what …	2016-03-09 20:10:48 +11:00
Mario Vavti	c2cdd41e81	Issue #316 make /display updates work. Basically copy and paste what we do on load and add $simple_update to the query.	2016-03-09 10:04:33 +01:00
redmatrix	256cd6baac	work on implementing account/channel move (as opposed to clone)	2016-03-09 00:46:17 -08:00
redmatrix	843cc1481a	isue #315	2016-03-08 16:46:47 -08:00
redmatrix	cf4dc2caa8	move "generator" to HttpMeta	2016-03-08 16:21:35 -08:00
redmatrix	1258f9bb21	turn 'OpenGraph' into a more general purpose HTTP meta facility for setting any meta header	2016-03-08 16:06:58 -08:00
redmatrix	5f41d06bb9	revup	2016-03-08 15:50:34 -08:00
Wave	8f4fe106ef	Merge pull request #314 from wave72/master ... Updated Italian strings	2016-03-08 15:54:54 +01:00
Paolo Tacconi	d74274c7e4	Updated Italian strings	2016-03-08 15:51:21 +01:00
Mario Vavti	d59268a5d8	removed id by mistake - add it again	2016-03-08 11:47:17 +01:00
Mario Vavti	f364343b55	add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl	2016-03-08 11:43:21 +01:00
redmatrix	9debfa348a	add syslog loglevels to dba functions	2016-03-07 20:43:52 -08:00
redmatrix	32e903e956	a bit of page cleanup for edit profiles	2016-03-07 18:49:17 -08:00
redmatrix	bd8fe768d3	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-07 16:55:12 -08:00
redmatrix	848c038970	issue #313	2016-03-07 16:54:58 -08:00
jeroenpraat	24fa201218	Small, but important fix for Dutch	2016-03-08 01:47:01 +01:00
redmatrix	1a77fb4c1d	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-07 15:12:09 -08:00
redmatrix	76467b5a35	allow modules/addons to override the og:title field	2016-03-07 15:11:11 -08:00
redmatrix	d5db25808a	Facebook scraper "OpenGraph" support; modules will need to set the required fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild.	2016-03-07 15:03:53 -08:00
Mario Vavti	6824fb9f93	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-07 21:48:12 +01:00
Mario Vavti	b2216f8203	prevent page jumping if the narrow navbar setting is used	2016-03-07 21:47:52 +01:00
jeroenpraat	0799a0a3be	Spanish and Dutch strings + fix es>es-es link	2016-03-07 20:29:14 +01:00
redmatrix	a2e0574fce	Merge pull request #312 from jeroenpraat/master ... Redbasic: Fix the issue with derived themes and schemas	2016-03-08 06:03:55 +11:00
Jeroen van Riet Paap	68d7ab6b55	Merge pull request #308 from HaakonME/master ... Updated Norwegian strings for Hubzilla. @HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96	2016-03-07 19:53:58 +01:00
Jeroen van Riet Paap	4a2c805270	Merge pull request #310 from einervonvielen/updated_homeinstall_instructions ... Updated readme.md for homeinstall script	2016-03-07 19:49:58 +01:00
Jeroen van Riet Paap	7d5b266227	Merge pull request #309 from tluther/master ... Doco / EMail templates	2016-03-07 19:47:47 +01:00
Jeroen van Riet Paap	1f56ff5407	Update DerivedTheme1.md	2016-03-07 17:07:34 +01:00
Jeroen van Riet Paap	95f5f3d44d	Show only schema selector when Redbasic (so not a derived theme)	2016-03-07 17:06:10 +01:00
Jeroen van Riet Paap	7a5213cc8e	Set the schema to the default schema in derived themes. ... See the documentation for creating derived themes how to override this.	2016-03-07 17:03:02 +01:00
Jeroen van Riet Paap	f1f19372ad	Update config.php	2016-03-07 17:01:12 +01:00
Haakon Meland Eriksen	276f44328e	Merge remote-tracking branch 'upstream/master'	2016-03-07 06:00:26 +01:00
redmatrix	da3f1326e0	revup	2016-03-06 15:32:46 -08:00
Tobias Luther	a013ddbb91	Doc: Minor correction cloud URL in cloud.bb	2016-03-06 21:32:36 +01:00
Tobias Luther	1c6faa3a00	Added Link to TOS to EMail templates targeting members	2016-03-06 18:45:43 +01:00
einervonvielen	b7f15ccac1	Update of readme according to the last changes ... The homeinstall script was changed recently. To reflect these changes the readme.md was updated to.	2016-03-06 18:40:49 +01:00
www-data	1fb7b9baae	Doco: corrected git URL in git for non-developers	2016-03-06 18:34:50 +01:00
Haakon Meland Eriksen	a1e4940bea	Merge remote-tracking branch 'upstream/master'	2016-03-06 18:33:28 +01:00
root	287ffe93f6	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-06 17:24:15 +01:00
root	2407379623	Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://github.com/einervonvielen/hubzilla	2016-03-06 17:19:33 +01:00
jeroenpraat	7162403292	Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more	2016-03-06 17:02:58 +01:00
jeroenpraat	004468f231	Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it's not clear that you can click on it to show something (the channel in this case).	2016-03-06 16:21:26 +01:00
Haakon Meland Eriksen	2d7e307e74	Updated Norwegian strings for Hubzilla	2016-03-05 14:11:56 +01:00