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 |
|
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 |
|
redmatrix
|
c19a1a6b82
|
revup
|
2016-03-01 14:13:38 -08:00 |
|
jeroenpraat
|
8b61e546fe
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-01 22:09:06 +01:00 |
|
jeroenpraat
|
7206e8af3a
|
Small fix for deleted forum channels showing in the forum widget (had this after migration from RM on 1 or 2 channels)
|
2016-03-01 22:08:50 +01:00 |
|
Mario Vavti
|
7808689198
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-01 20:40:33 +01:00 |
|
Mario Vavti
|
966d1586c0
|
fix js error and add id to field input block
|
2016-03-01 20:40:11 +01:00 |
|
redmatrix
|
edffd9f183
|
Merge pull request #304 from phormanns/master
fix typo in postgres schema
|
2016-03-02 06:22:46 +11:00 |
|
Peter Hormanns
|
7edc505c2f
|
fix typo in postgres schema
|
2016-03-01 17:54:52 +01:00 |
|
Mario Vavti
|
4df78b06cf
|
fix padding
|
2016-03-01 15:11:15 +01:00 |
|