c5ce9b0699
Merge branch 'call-hooks-optimization' into 'dev'
...
Micro-optimization to call_hooks()
See merge request hubzilla/core!1267
2018-08-30 10:09:00 +02:00
c74a7ce4fc
Merge branch 'add-delivery-status-info' into 'dev'
...
Add dreport_process hook
See merge request hubzilla/core!1266
2018-08-30 10:07:18 +02:00
d98ed68749
html-to-markdown adds a backslash infront of a hash after each new line - manualy remove those
2018-08-29 16:16:17 +02:00
70d6d2f2db
Micro-optimization to call_hooks()
2018-08-29 10:02:04 -04:00
da441c59f6
Add dreport_process hook
2018-08-29 08:58:49 -04:00
42093aedcf
db update to get rid of bogus activitypub xchans which got created due to a bug in the pubcrawl addon
2018-08-29 13:57:36 +02:00
74d80473df
Merge remote-tracking branch 'mike/master' into dev
2018-08-29 11:50:40 +02:00
7ecb337405
redirect stdout/stderr on cron command
2018-08-28 22:43:37 -07:00
07792adc56
add paragonie and symfonie since ramsey/uuid appears to require them
2018-08-28 12:06:36 +02:00
c0c827d3ad
update composer libs and add ramsey/uuid
2018-08-28 12:00:23 +02:00
6a2bbed73d
remove distinct from network query again until performance issue is resolved or another fix for the underlying problem is found
2018-08-27 10:19:10 +02:00
4c1944a08d
Merge branch 'extend-convitems-dropdown' into 'dev'
...
Extend cog dropdown & temp fix for feed display of corrupt mids
See merge request hubzilla/core!1265
2018-08-27 10:02:58 +02:00
95f870f1b4
Merge branch 'dev' into 'dev'
...
Add translation to missed strings in Wiki
See merge request hubzilla/core!1264
2018-08-27 10:00:50 +02:00
c250de7dae
Merge remote-tracking branch 'mike/master' into dev
2018-08-27 09:48:22 +02:00
e4b6a143c7
Revert "Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'." Reverting because this will only work with Apache and break nginx/other installations.
...
This reverts commit 9367e9fe5a
2018-08-26 23:05:56 -07:00
9367e9fe5a
Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'.
2018-08-26 23:00:31 -07:00
a0c2bbac9d
Add hook to extend conv_item cog dropdown menu
2018-08-26 23:26:10 -04:00
f5f6ec3d71
Update wiki.tpl
2018-08-25 21:34:58 +02:00
c57c1c8b2e
Merge branch 'revert-c16fda1c' into 'dev'
...
Revert "Update wiki.tpl"
See merge request Kostikov/core!2
2018-08-25 21:31:58 +02:00
44f639f371
Revert "Update wiki.tpl"
...
This reverts commit c16fda1cb6
2018-08-25 21:31:47 +02:00
4435717168
Merge branch 'revert-ff1a0d21' into 'dev'
...
Revert "Update wiki.tpl"
See merge request Kostikov/core!1
2018-08-25 21:31:17 +02:00
6767ff5434
Revert "Update wiki.tpl"
...
This reverts commit ff1a0d217f
2018-08-25 21:30:58 +02:00
ff1a0d217f
Update wiki.tpl
2018-08-25 21:29:25 +02:00
42c5e98670
Update Wiki_page_history.php
2018-08-25 21:27:20 +02:00
c9b80a3612
Update Wiki.php
2018-08-25 21:26:50 +02:00
e78a4d61d8
Update NativeWikiPage.php
2018-08-25 21:25:26 +02:00
88ebcb56e7
Update Wiki_page_history.php
2018-08-25 21:23:08 +02:00
308dda1587
Update Wiki.php
2018-08-25 21:21:57 +02:00
67a9dd8497
Update NativeWikiPage.php
2018-08-25 21:20:00 +02:00
732ce25d7f
Update nwiki_page_history.tpl
2018-08-25 21:17:25 +02:00
c16fda1cb6
Update wiki.tpl
2018-08-25 21:16:05 +02:00
f036c25dca
Merge remote-tracking branch 'mike/master' into dev
2018-08-24 14:44:45 +02:00
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
b50e8a5cf9
Merge branch 'patch-19' into 'dev'
...
Update Russian translation
See merge request hubzilla/core!1262
2018-08-24 14:31:28 +02:00
7018da3f12
code cleanup
2018-08-23 22:44:22 -07:00
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
2893f7d481
Get full page of items
2018-08-23 23:54:18 -04:00
398e42acb5
fix exclusion of redmatrix theme
2018-08-23 20:53:24 -04:00
6ecd31a715
tweak archive widget for articles
2018-08-22 13:30:16 -07:00
456bc2ef86
Update hstrings.php
2018-08-22 15:13:01 +02:00
e071cd4635
Update hmessages.po
2018-08-22 15:12:09 +02:00
cc03e1ceef
Merge remote-tracking branch 'mike/master' into dev
2018-08-22 10:47:40 +02:00
e4d08fc5d7
Merge branch 'redbasic-addroomforfooter' into 'dev'
...
Fix jumpy sidebars
See merge request hubzilla/core!1261
2018-08-22 10:46:02 +02:00
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
0eeaf8713f
add api_not_found hook
2018-08-21 23:13:54 -07:00
42c4a0da51
Zot/Finger: ignore deleted hublocs
2018-08-21 21:38:10 -07:00
79eb6d3942
Fix jumpy sidebars
2018-08-21 13:18:42 -04:00
db853134e3
Merge remote-tracking branch 'mike/master' into dev
2018-08-21 13:19:30 +02:00
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
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
M.Dent
zotlabs
Max Kostikov