5043 commits

Author	SHA1	Message	Date
Mario Vavti	370a007ee2	more janitor work on profiles	2016-03-13 21:19:15 +01:00
Mario Vavti	2d8deb6082	some janitor work on profiles	2016-03-12 22:13:46 +01: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	cf4dc2caa8	move "generator" to HttpMeta	2016-03-08 16:21:35 -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	32e903e956	a bit of page cleanup for edit profiles	2016-03-07 18:49:17 -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	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	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
Tobias Luther	1c6faa3a00	Added Link to TOS to EMail templates targeting members	2016-03-06 18:45:43 +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
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
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	6f4c45a489	UI cleanup for admin profile field management page	2016-03-02 15:36:14 -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
redmatrix	548bf884a4	profile field admin page (functional only: still needs a lot of HTML/CSS cleanup)	2016-03-01 21:06:27 -08:00
redmatrix	a0baa480e3	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-01 15:01:48 -08:00
redmatrix	765dd5569b	Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page.	2016-03-01 14:55:04 -08:00
Mario Vavti	966d1586c0	fix js error and add id to field input block	2016-03-01 20:40:11 +01:00
Mario Vavti	4df78b06cf	fix padding	2016-03-01 15:11:15 +01:00
Mario Vavti	492609d20b	do not show empty buttons if not logged in	2016-03-01 14:41:14 +01:00
Mario Vavti	0f76af261c	another resize issue	2016-03-01 14:11:42 +01:00
Mario Vavti	9d00db06b2	fix resize issue	2016-03-01 14:03:34 +01:00
Mario Vavti	141f3e21b2	move preview content outside of editor space	2016-03-01 13:40:19 +01:00