zotlabs
0eeaf8713f
add api_not_found hook
2018-08-21 23:13:54 -07:00
zotlabs
42c4a0da51
Zot/Finger: ignore deleted hublocs
2018-08-21 21:38:10 -07:00
M.Dent
79eb6d3942
Fix jumpy sidebars
2018-08-21 13:18:42 -04:00
Mario Vavti
db853134e3
Merge remote-tracking branch 'mike/master' into dev
2018-08-21 13:19:30 +02:00
Mario
218029ee57
Merge branch 'redbasic-addroomforfooter' into 'dev'
...
Add bottom margin on aside elements and main to allow for viewport footer.
See merge request hubzilla/core!1259
2018-08-21 13:17:14 +02:00
Mario
4295fbf6c6
Merge branch 'dev' into 'dev'
...
Update catalan translations for sstrings up to 18th July 2018
See merge request hubzilla/core!1260
(cherry picked from commit 0985adb770af31bbeb
2018-08-21 13:14:25 +02:00
Mario
0985adb770
Merge branch 'dev' into 'dev'
...
Update catalan translations for sstrings up to 18th July 2018
See merge request hubzilla/core!1260
2018-08-21 13:13:48 +02:00
Mario
5d2ac10073
Merge branch 'patch-17' into 'master'
...
Add missed app 'Order Apps'
See merge request hubzilla/core!1258
(cherry picked from commit 85aa4957416086a70e
2018-08-21 13:13:23 +02:00
Mario
85aa495741
Merge branch 'patch-17' into 'master'
...
Add missed app 'Order Apps'
See merge request hubzilla/core!1258
2018-08-21 13:12:41 +02:00
zotlabs
8bf1e3a944
more code optimisation
2018-08-20 22:02:08 -07:00
zotlabs
066febdf40
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-08-20 20:20:57 -07:00
zotlabs
9b620b2a35
remove checkjs reloader from mod_display also
2018-08-20 20:07:54 -07:00
zotlabs
a9bbfe9c4f
Only show cover photos once per login session. After that they can get annoying. If there is pushback on this, then it should perhaps be optional.
2018-08-20 17:38:38 -07:00
zotlabs
d95735deaf
channel page performance improvement: don't use "checkjs" with an associated page reload. Wrap a static copy of the content in noscript tags instead.
2018-08-20 17:22:49 -07:00
fadelkon
af31bbeba1
Update catalan translations for sstrings up to 18th July 2018
2018-08-20 22:50:46 +02:00
M.Dent
1d7d604016
Add bottom margin on aside elements and main to allow for viewport footer.
2018-08-20 00:15:34 -04:00
zotlabs
df26fec1b3
hubzilla core issue #1262
2018-08-17 21:21:02 -07:00
Max Kostikov
6086a70e06
Add missed app 'Order Apps'
2018-08-17 17:48:55 +02:00
zotlabs
e5529938ea
Suppress duplicate info() messages. This was done long for notice(), but info() was overlooked at that time.
2018-08-16 12:35:57 -07:00
Mario Vavti
e25db4d1b5
Merge remote-tracking branch 'mike/master' into dev
2018-08-16 08:50:52 +02:00
zotlabs
32acb0ff01
missing files
2018-08-15 21:33:11 -07:00
zotlabs
f230c07ba5
possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar
2018-08-15 17:00:37 -07:00
Mario Vavti
2becc3273a
Merge remote-tracking branch 'mike/master' into dev
2018-08-15 13:21:12 +02:00
zotlabs
f4f610f1a3
more backporting for zot6
2018-08-14 18:19:34 -07:00
Mario Vavti
10c5b46e3b
Merge remote-tracking branch 'mike/master' into dev
2018-08-14 13:04:37 +02:00
Mario
b503ef8761
Merge branch 'override-helpfiles' into 'dev'
...
Override helpfiles
See merge request hubzilla/core!1257
2018-08-14 13:03:26 +02:00
M. Dent
94393d27c8
Override helpfiles
2018-08-14 13:03:26 +02:00
zotlabs
12f4787b67
issue with mdpost addon and archive.org links which contain a full url as a path/query component
2018-08-13 23:11:10 -07:00
zotlabs
f15c1c4e54
hubloc DB changes needed for z6
2018-08-13 21:18:20 -07:00
zotlabs
62925c4c3f
oidc cleanup and discovery
2018-08-13 20:24:04 -07:00
zotlabs
4fdf5d28ca
minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to 'portable_id', fixed/simplified cgi auth mode
2018-08-13 17:24:48 -07:00
Mario
b78c9a2251
Merge branch 'add-template-overrides' into 'dev'
...
Add template overrides
See merge request hubzilla/core!1256
2018-08-13 14:06:36 +02:00
M.Dent
b436c4a94c
Add support for overriding the default template location and individual templates via .htconfig.php
2018-08-12 19:47:10 -04:00
zotlabs
db1a546aba
add table support to markdown
2018-08-12 16:25:14 -07:00
M.Dent
9402f537b6
Fix root not added to internationalized template search
2018-08-12 19:02:11 -04:00
zotlabs
2d29095348
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-08-12 15:10:19 -07:00
zotlabs
ac03b4ccd7
make channel_remove less memory hungry
2018-08-12 15:09:02 -07:00
Mario Vavti
759a18685b
Merge remote-tracking branch 'mike/master' into dev
2018-08-12 14:07:16 +02:00
Mario
e07ab65d73
Merge branch 'oauth2-ui-pr' into 'dev'
...
Oauth2 ui pr
See merge request hubzilla/core!1255
2018-08-12 14:06:24 +02:00
Mario
26f51ece90
Merge branch 'oauth2' into 'dev'
...
Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.
See merge request hubzilla/core!1254
2018-08-12 14:03:36 +02:00
Mario
99066ae939
Merge branch 'patch-16' into 'dev'
...
Add translation for missed string
See merge request hubzilla/core!1253
(cherry picked from commit 5ff0f09a45d3362dfa
2018-08-12 13:59:49 +02:00
Mario
5ff0f09a45
Merge branch 'patch-16' into 'dev'
...
Add translation for missed string
See merge request hubzilla/core!1253
2018-08-12 13:59:07 +02:00
zotlabs
5afe779ffc
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
2018-08-11 16:16:54 -07:00
M.Dent
af042ccf07
OAuth2 UI and settings updates
2018-08-10 13:54:26 -04:00
M.Dent
e587fe5ce8
Add user_id = local_channel() to the where clause of updates
2018-08-10 13:54:07 -04:00
M.Dent
0b31c677f2
Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.
2018-08-10 12:01:05 -04:00
Max Kostikov
d3362dfa0c
Add translation for missed string
2018-08-10 16:56:22 +02:00
Mario Vavti
7890157f52
revert debug comment from the last commit
2018-08-09 23:07:50 +02:00
Mario Vavti
b3d1ea4cd5
fix zid leaking to nonzot sites if markdown is enabled
2018-08-09 17:03:20 +02:00
Mario Vavti
7c842f3170
search form action for channel search needs the channel address
...
(cherry picked from commit 054c5da294
2018-08-09 15:50:49 +02:00
