Max Kostikov
67a9dd8497
Update NativeWikiPage.php
2018-08-25 21:20:00 +02:00
Max Kostikov
732ce25d7f
Update nwiki_page_history.tpl
2018-08-25 21:17:25 +02:00
Max Kostikov
c16fda1cb6
Update wiki.tpl
2018-08-25 21:16:05 +02:00
Mario Vavti
f036c25dca
Merge remote-tracking branch 'mike/master' into dev
2018-08-24 14:44:45 +02:00
Mario
7fc4292ed8
Merge branch 'dm42fixes' into 'dev'
...
fix exclusion of redmatrix theme
See merge request hubzilla/core!1263
2018-08-24 14:33:04 +02:00
Mario
b50e8a5cf9
Merge branch 'patch-19' into 'dev'
...
Update Russian translation
See merge request hubzilla/core!1262
2018-08-24 14:31:28 +02:00
zotlabs
7018da3f12
code cleanup
2018-08-23 22:44:22 -07:00
zotlabs
a66c43166a
first_post_date() (used by archive widget) - trigger the query options off of the active module rather than rely on passed parameters
2018-08-23 21:01:28 -07:00
M.Dent
2893f7d481
Get full page of items
2018-08-23 23:54:18 -04:00
M.Dent
398e42acb5
fix exclusion of redmatrix theme
2018-08-23 20:53:24 -04:00
zotlabs
6ecd31a715
tweak archive widget for articles
2018-08-22 13:30:16 -07:00
Max Kostikov
456bc2ef86
Update hstrings.php
2018-08-22 15:13:01 +02:00
Max Kostikov
e071cd4635
Update hmessages.po
2018-08-22 15:12:09 +02:00
Mario Vavti
cc03e1ceef
Merge remote-tracking branch 'mike/master' into dev
2018-08-22 10:47:40 +02:00
Mario
e4d08fc5d7
Merge branch 'redbasic-addroomforfooter' into 'dev'
...
Fix jumpy sidebars
See merge request hubzilla/core!1261
2018-08-22 10:46:02 +02:00
zotlabs
b25192332b
profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class
2018-08-21 23:39:49 -07:00
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
