Mario Vavti
|
0012030826
|
update upstream lib jusutifiedGallery
|
2016-04-05 15:24:05 +02:00 |
|
redmatrix
|
ec41170121
|
Merge pull request #338 from anaqreon/contextual-help
Contextual help
|
2016-04-05 22:43:15 +10:00 |
|
Mario Vavti
|
1c9f773900
|
Merge branch 'master' into dev
|
2016-04-04 17:13:10 +02:00 |
|
Mario Vavti
|
ec651f219e
|
a simple autocomplete for bbcode or comanche - partly implemented
|
2016-04-04 17:12:23 +02:00 |
|
Mario Vavti
|
ee8a9384d5
|
Merge branch 'master' into dev
|
2016-04-04 10:37:20 +02:00 |
|
Mario Vavti
|
bba34a7a8e
|
do not use dropdown class if there is nothing to dropdown
|
2016-04-04 10:37:07 +02:00 |
|
Mario Vavti
|
dfa12b2919
|
Merge branch 'master' into dev
|
2016-04-04 10:13:30 +02:00 |
|
Mario Vavti
|
9b9f29a0b2
|
whitespace
|
2016-04-04 10:10:19 +02:00 |
|
Mario Vavti
|
4a9aad2a33
|
whitespace
|
2016-04-04 10:09:46 +02:00 |
|
Mario Vavti
|
69617b5c34
|
fullscreen mode for photo albums view
|
2016-04-04 10:09:13 +02:00 |
|
Andrew Manning
|
0523b4b2f1
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
|
2016-04-03 21:36:29 -04:00 |
|
redmatrix
|
a703835b5c
|
Bug: "remember me" doesn't
|
2016-04-03 17:38:17 -07:00 |
|
Mario Vavti
|
f13096a6f3
|
various fixes
|
2016-04-03 18:00:03 +02:00 |
|
Mario Vavti
|
53311a30ad
|
reduce chat-item-title fontsize to match wall-item-ago
|
2016-04-03 15:27:10 +02:00 |
|
Mario Vavti
|
db4e9aeaad
|
fullscreen mode for events
|
2016-04-03 12:19:49 +02:00 |
|
Mario Vavti
|
b8d8be7013
|
show chat expiration time in overview and minor fixes
|
2016-04-03 11:34:07 +02:00 |
|
Mario Vavti
|
3edd4ce78f
|
ease transition between fullscreen and inline view for small screens
|
2016-04-03 00:04:05 +02:00 |
|
jeroenpraat
|
72d995d35f
|
Update nl and es-es strings
|
2016-04-01 23:24:13 +02:00 |
|
Mario Vavti
|
5b55726a93
|
on update only jump to bottom if we actually got a new message
|
2016-04-01 11:13:04 +02:00 |
|
Mario Vavti
|
bbe93d0e1d
|
scroll chat to bottom on fullscreen toggle
|
2016-04-01 10:29:58 +02:00 |
|
Mario Vavti
|
a564f495a7
|
improve scroll to bottom in chat
|
2016-04-01 10:20:10 +02:00 |
|
Mario Vavti
|
60bb8f25f7
|
move fullscreen js code to redbasic.js where it belongs to
|
2016-04-01 08:56:51 +02:00 |
|
Mario Vavti
|
c6d9100649
|
missing template
|
2016-04-01 08:36:02 +02:00 |
|
redmatrix
|
c0b3d7e1b4
|
Merge branch 'static'
|
2016-03-31 17:32:51 -07:00 |
|
redmatrix
|
9abd95fad3
|
static App
|
2016-03-31 16:06:03 -07:00 |
|
Mario Vavti
|
50d9b29347
|
slightly change the way fullscreen works and bring it to mod mail
|
2016-04-01 00:16:39 +02:00 |
|
Mario Vavti
|
90a5ba01a3
|
make fullscreen mode available for other modules and some cleanup
|
2016-03-31 23:13:40 +02:00 |
|
Mario Vavti
|
6c2673ae2a
|
various fixes regarding mod chat
|
2016-03-31 22:42:28 +02:00 |
|
Mario Vavti
|
3fdd110e07
|
mod chat rework continued
|
2016-03-31 13:21:48 +02:00 |
|
redmatrix
|
1cd3b41825
|
deprecate $a->get_baseurl()
|
2016-03-30 22:13:24 -07:00 |
|
Mario Vavti
|
df891f4ad2
|
more work on mod chat
|
2016-03-31 00:37:40 +02:00 |
|
Mario Vavti
|
08461c7049
|
more on mod chat
|
2016-03-30 14:44:03 +02:00 |
|
Mario Vavti
|
5462453bf2
|
some work on mod chat
|
2016-03-30 14:31:55 +02:00 |
|
Mario Vavti
|
ba0812c447
|
highlight table row on hover
|
2016-03-27 22:37:07 +02:00 |
|
jeroenpraat
|
dbde9a0940
|
Update es_es+n. Switch the feeds as requested by Mike.
|
2016-03-27 14:03:02 +02:00 |
|
Mario Vavti
|
97eef2b88c
|
removed link to connected apps by accident
|
2016-03-26 19:34:38 +01:00 |
|
Andrew Manning
|
661b0084f3
|
Added help for post permissions
|
2016-03-26 14:17:53 -04:00 |
|
Mario Vavti
|
f714e97d63
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-26 18:46:07 +01:00 |
|
Mario Vavti
|
a507063174
|
move link to /locs to settings menu if we have more than one location and some template work on locs
|
2016-03-26 18:43:38 +01:00 |
|
phellmes
|
9b06d952a2
|
Update DE translation strings
|
2016-03-24 09:08:12 +01:00 |
|
Andrew Manning
|
59827b6dfd
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
|
2016-03-23 21:17:23 -04:00 |
|
redmatrix
|
a8ac0ed549
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-22 19:59:47 -07:00 |
|
redmatrix
|
6f2ba0c619
|
rewrite the webfinger discovery logic
|
2016-03-22 19:58:59 -07:00 |
|
Wave
|
0a14ac1f60
|
Merge pull request #332 from wave72/master
Updated Italian strings
|
2016-03-22 11:53:57 +01:00 |
|
Paolo Tacconi
|
02140b2f76
|
Updated Italian strings
|
2016-03-22 11:49:03 +01:00 |
|
Mario Vavti
|
c6b89b99b9
|
Add a link to /locs to channel manager
|
2016-03-22 10:29:17 +01:00 |
|
Mario Vavti
|
97e1a6dfde
|
whip mod manage into shape
|
2016-03-22 02:06:19 +01:00 |
|
Andrew Manning
|
56c86b6567
|
Override navbar help button to open contextual help panel. Contextual help for mail written.
|
2016-03-21 06:33:02 -04:00 |
|
redmatrix
|
d3e7ef70e8
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-20 19:56:36 -07:00 |
|
redmatrix
|
fea532af4d
|
rework salmon - important, update addons also if you have enabled gnusoc addon
|
2016-03-20 19:55:53 -07:00 |
|
Mario Vavti
|
1ddb43b0d3
|
an attempt to visualize the supremacy of dont show over show in the acl selector
|
2016-03-20 23:07:39 +01:00 |
|
jeroenpraat
|
23419e4c26
|
Update NL + es_ES strings.
|
2016-03-20 14:39:22 +01:00 |
|
Mario Vavti
|
f7ff48f806
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-20 01:46:13 +01:00 |
|
Mario Vavti
|
30cf56bdb5
|
make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected
|
2016-03-20 01:45:56 +01:00 |
|
redmatrix
|
77094f8d2b
|
make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move.
|
2016-03-19 16:17:19 -07:00 |
|
Mario Vavti
|
51cd4e8519
|
missing return false for map link
|
2016-03-19 02:20:59 +01:00 |
|
Mario Vavti
|
bd249b276d
|
add use as cover photo link to photos view
|
2016-03-18 17:49:31 +01:00 |
|
Mario Vavti
|
40162cd6b7
|
some work on profile listing
|
2016-03-17 12:56:55 +01:00 |
|
Mario Vavti
|
a41a05e6c0
|
bring more structure to profiles edit
|
2016-03-17 11:50:53 +01:00 |
|
Mario Vavti
|
2165733ddc
|
move buttons to dropdown menu and some cleanup
|
2016-03-16 23:07:29 +01:00 |
|
Mario Vavti
|
d22b21c56f
|
still more janitor work on profiles
|
2016-03-16 13:45:24 +01:00 |
|
Mario Vavti
|
d98d7003ed
|
even more janitor work on profiles
|
2016-03-15 21:38:03 +01:00 |
|
redmatrix
|
01a28ddf8d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-03-15 01:32:41 -07:00 |
|
redmatrix
|
e8d19659c0
|
some heavy lifting porting the old salmon code
|
2016-03-15 00:50:03 -07:00 |
|
jeroenpraat
|
b8e8517725
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-03-14 15:46:57 +01:00 |
|
jeroenpraat
|
def0454952
|
update nl + es-es strings
|
2016-03-14 15:43:51 +01:00 |
|
redmatrix
|
fbfa391965
|
Merge pull request #323 from phellmes/de20160313
Update DE translation strings
|
2016-03-14 10:45:54 +11:00 |
|
Mario Vavti
|
38beabb508
|
fix spacing
|
2016-03-13 21:27:29 +01:00 |
|
Mario Vavti
|
370a007ee2
|
more janitor work on profiles
|
2016-03-13 21:19:15 +01:00 |
|
phellmes
|
a752d44313
|
Update DE translation strings
|
2016-03-13 13:29:14 +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 |
|
Mario Vavti
|
fe6cbb414c
|
adjust padding
|
2016-03-01 13:32:18 +01:00 |
|
Mario Vavti
|
e13d65eea3
|
set line-height to initial
|
2016-03-01 13:29:59 +01:00 |
|
Mario Vavti
|
4d6050f8e5
|
another css fix
|
2016-03-01 13:22:19 +01:00 |
|
Mario Vavti
|
0ebce75c7d
|
css fixes to make jot look better with background colors or images
|
2016-03-01 13:09:04 +01:00 |
|
Mario Vavti
|
2d45f9f385
|
provide footer bbcode
|
2016-02-29 23:58:32 +01:00 |
|
Mario Vavti
|
d27a627c4f
|
simplify profile edit button(s) and make it useful for multiple profiles
|
2016-02-29 22:01:13 +01:00 |
|
jeroenpraat
|
55ab5360d9
|
update es-es. tested it and it works now. Don't know what happened earlier.
|
2016-02-29 19:36:53 +01:00 |
|
jeroenpraat
|
60b818eb24
|
revert es-es update. something went wrong. later today I will examine what.
|
2016-02-29 09:07:29 +01:00 |
|
jeroenpraat
|
69c6d8b617
|
update es-es strings
|
2016-02-28 17:33:22 +01:00 |
|
redmatrix
|
44797fe988
|
Merge pull request #302 from phellmes/de20160227
Update DE translation strings
|
2016-02-28 09:57:04 +11:00 |
|
jeroenpraat
|
df69465357
|
update NL strings
|
2016-02-27 15:56:45 +01:00 |
|
phellmes
|
e4361cb202
|
Update DE translation strings
|
2016-02-27 14:28:06 +01:00 |
|
Mario Vavti
|
58cf9d832c
|
make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment.
|
2016-02-27 12:31:07 +01:00 |
|
Mario Vavti
|
df57c90d2d
|
several photo item template fixes
|
2016-02-26 14:25:18 +01:00 |
|
Mario Vavti
|
b2474334a7
|
provide an edit button for the profile page
|
2016-02-25 22:50:16 +01:00 |
|
Mario Vavti
|
be27fb5644
|
we have got a button for events in the nav. no need for it in the tabs if we are local.
|
2016-02-25 13:40:15 +01:00 |
|
redmatrix
|
43521bb10b
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-24 18:56:04 -08:00 |
|
redmatrix
|
c95d7c69eb
|
issue #216 - calendar sharing
|
2016-02-24 18:54:52 -08:00 |
|
jeroenpraat
|
f12b0fe316
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2016-02-25 02:05:16 +01:00 |
|
jeroenpraat
|
8944d7a7a2
|
another dutch update
|
2016-02-25 02:03:58 +01:00 |
|
redmatrix
|
6300f47cdc
|
schema change to support channel move (a completely different operation than channel clone)
|
2016-02-24 17:00:16 -08:00 |
|
redmatrix
|
2b95580cc0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2016-02-24 16:41:46 -08:00 |
|
jeroenpraat
|
93b84f1262
|
interim dutch string update
|
2016-02-25 01:39:50 +01:00 |
|
Mario Vavti
|
9d3ce55978
|
fix boxy scheme
|
2016-02-25 00:24:58 +01:00 |
|
redmatrix
|
7e6febe2a6
|
add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled
|
2016-02-24 15:19:28 -08:00 |
|
Mario Vavti
|
e73df9ed1d
|
give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to much of the text in some situations
|
2016-02-24 23:16:42 +01:00 |
|
Wave
|
f15a06c0c2
|
Merge pull request #296 from wave72/master
Updated Italian strings
|
2016-02-23 11:55:23 +01:00 |
|
Paolo Tacconi
|
ab89eb050a
|
Updated Italian strings
|
2016-02-23 11:52:45 +01:00 |
|
Mario Vavti
|
dd6e3d873d
|
some work on mod/register
|
2016-02-22 13:04:48 +01:00 |
|
redmatrix
|
2c3bec3d7c
|
Merge pull request #291 from phellmes/de201602201300
Update DE strings
|
2016-02-22 12:43:15 +11:00 |
|
jeroenpraat
|
1fcc863298
|
There was nothing wrong with my pimped pubsites (was another problem). Took the opportunity to update schemas. Plus updated spanish and dutch strings.
|
2016-02-21 23:00:12 +01:00 |
|