16219 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Haakon Meland Eriksen	d7466ade46	Merge remote-tracking branch 'upstream/master'	2016-03-05 10:01:42 +01:00
Haakon Meland Eriksen	01c0e5c46c	Merge remote-tracking branch 'upstream/master'	2016-03-04 23:42:30 +01:00
redmatrix	86f840843f	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-04 14:38:47 -08:00
redmatrix	9a0f0181a5	issues #306 and #307	2016-03-04 14:38:14 -08:00
Mario Vavti	25ebac8d0b	show cover-photo upload link only for the default profile	2016-03-04 16:07:41 +01:00
Mario Vavti	edf6da7189	add cover photo upload link to edit profile	2016-03-04 15:44:33 +01:00
Haakon Meland Eriksen	059da4d017	Merge remote-tracking branch 'upstream/master'	2016-03-04 06:05:47 +01:00
redmatrix	a59d1b22f6	Update the CHANGELOG for V1.3	2016-03-03 18:55:10 -08:00
redmatrix	dd4a66353a	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-03 14:49:34 -08:00
redmatrix	2cf54c465d	remove the markdown feature. Do not re-enable unless you are willing to support it.	2016-03-03 14:47:39 -08:00
Mario Vavti	d3491c9165	fix jot form	2016-03-03 13:46:08 +01:00
Mario Vavti	8ca877bdd3	slide up cover on click	2016-03-03 12:31:49 +01:00
Mario Vavti	b704f977da	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-03 12:08:21 +01:00
Mario Vavti	59e04aed1b	move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template.	2016-03-03 12:07:58 +01:00
redmatrix	436e91a1e1	rename the menu entry and page to 'Profile Fields' to maintain consistency	2016-03-02 16:39:34 -08:00
redmatrix	6f4c45a489	UI cleanup for admin profile field management page	2016-03-02 15:36:14 -08:00
redmatrix	157bbb14b5	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-02 11:35:48 -08:00
redmatrix	5c22f59c4f	issue #305	2016-03-02 11:32:32 -08:00
Jeroen van Riet Paap	aa62bad07b	little nl string fix	2016-03-02 15:33:18 +01:00
Mario Vavti	d3f2d2a2db	small fix to simple cover-photo	2016-03-02 14:30:33 +01:00
Mario Vavti	c5d08fd5fd	add a fade in effect to main while scrolling up cover photo	2016-03-02 13:33:18 +01:00
Mario Vavti	22729da2a2	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-02 12:31:46 +01:00
Mario Vavti	c97cc1487c	a simple cover-photo implementation for redbasic default template	2016-03-02 12:31:25 +01:00
redmatrix	428b4dbad6	sort out the with and howlong dependencies	2016-03-01 22:47:07 -08:00
Haakon Meland Eriksen	264abef817	Merge remote-tracking branch 'upstream/master'	2016-03-02 06:06:39 +01:00