Mario Vavti
|
f3ce5e73fe
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-09-06 12:22:41 +02:00 |
|
Mario Vavti
|
c53d3a4b3a
|
bump version
|
2018-09-06 11:44:47 +02:00 |
|
Mario Vavti
|
5135f236c2
|
improve cover-photo handling
|
2018-09-06 11:30:50 +02:00 |
|
Mario Vavti
|
78c847ef7d
|
improve notification handling on small screens
|
2018-09-06 11:14:08 +02:00 |
|
Mario Vavti
|
673a2f67f1
|
sticky-kit: improve handling
|
2018-09-06 10:08:55 +02:00 |
|
zotlabs
|
c5bc4fe245
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-09-05 21:02:06 -07:00 |
|
zotlabs
|
bc4a92b702
|
detect and automatically repair duplicate plugin hook scenarios.
|
2018-09-05 19:43:07 -07:00 |
|
Mario Vavti
|
ea381d9180
|
move str_replace inside if clause
|
2018-09-05 14:44:06 +02:00 |
|
Mario Vavti
|
4f82428a20
|
hide cover photo by default and show it only if conditions are met
|
2018-09-05 14:31:34 +02:00 |
|
Mario Vavti
|
e494a76b33
|
revert "Add bottom margin on aside elements and main to allow for viewport footer."
This reverts commit 1d7d604016 .
|
2018-09-05 12:34:30 +02:00 |
|
Mario Vavti
|
1753e40466
|
Revert "Fix jumpy sidebars"
This reverts commit 79eb6d3942 .
|
2018-09-05 12:32:53 +02:00 |
|
Mario Vavti
|
6667ba4172
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-05 12:20:06 +02:00 |
|
Mario Vavti
|
75e8aa8aee
|
bump version
|
2018-09-05 12:19:52 +02:00 |
|
Mario
|
a81a1bd5f1
|
Merge branch 'fix-authorcomment-fix' into 'dev'
Corrected resubmit of fixes to Authors unable to comment on posts they authored…
See merge request hubzilla/core!1269
|
2018-09-05 12:18:56 +02:00 |
|
Mario Vavti
|
5d1539df75
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-05 12:17:50 +02:00 |
|
Mario Vavti
|
a821682c8c
|
instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid.
|
2018-09-05 12:17:32 +02:00 |
|
M.Dent
|
9446e0348e
|
Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others.
|
2018-09-04 08:14:52 -04:00 |
|
Mario Vavti
|
41ccb61c2e
|
Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances."
This reverts commit e2824f9259 .
Reverting because it breaks forum mentions.
|
2018-09-03 18:14:17 +02:00 |
|
Mario
|
1b7781a159
|
Merge branch 'add-delivery-status-info' into 'dev'
Fix: Authors unable to comment on posts they authored when under owned by others…
See merge request hubzilla/core!1268
|
2018-09-02 09:17:29 +02:00 |
|
Mario Vavti
|
d66f58a550
|
fix undefined constant warning
|
2018-09-01 21:09:04 +02:00 |
|
M.Dent
|
e2824f9259
|
Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances.
|
2018-09-01 13:45:05 -04:00 |
|
Mario Vavti
|
4376f8f030
|
do not count sys channel in totals
|
2018-09-01 13:43:32 +02:00 |
|
Mario Vavti
|
d377660b5a
|
update 1218: missing default value for pg
|
2018-08-31 20:26:31 +02:00 |
|
Mario
|
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 |
|
Mario
|
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 |
|
Mario Vavti
|
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 |
|
M.Dent
|
70d6d2f2db
|
Micro-optimization to call_hooks()
|
2018-08-29 10:02:04 -04:00 |
|
M.Dent
|
da441c59f6
|
Add dreport_process hook
|
2018-08-29 08:58:49 -04:00 |
|
Mario Vavti
|
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 |
|
Mario Vavti
|
74d80473df
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-29 11:50:40 +02:00 |
|
zotlabs
|
7ecb337405
|
redirect stdout/stderr on cron command
|
2018-08-28 22:43:37 -07:00 |
|
Mario Vavti
|
07792adc56
|
add paragonie and symfonie since ramsey/uuid appears to require them
|
2018-08-28 12:06:36 +02:00 |
|
Mario Vavti
|
c0c827d3ad
|
update composer libs and add ramsey/uuid
|
2018-08-28 12:00:23 +02:00 |
|
Mario Vavti
|
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 |
|
Mario
|
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 |
|
Mario
|
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 |
|
Mario Vavti
|
c250de7dae
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-27 09:48:22 +02:00 |
|
zotlabs
|
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 |
|
zotlabs
|
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 |
|
M.Dent
|
a0c2bbac9d
|
Add hook to extend conv_item cog dropdown menu
|
2018-08-26 23:26:10 -04:00 |
|
Max Kostikov
|
f5f6ec3d71
|
Update wiki.tpl
|
2018-08-25 21:34:58 +02:00 |
|
Max Kostikov
|
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 |
|
Max Kostikov
|
44f639f371
|
Revert "Update wiki.tpl"
This reverts commit c16fda1cb6
|
2018-08-25 21:31:47 +02:00 |
|
Max Kostikov
|
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 |
|
Max Kostikov
|
6767ff5434
|
Revert "Update wiki.tpl"
This reverts commit ff1a0d217f
|
2018-08-25 21:30:58 +02:00 |
|
Max Kostikov
|
ff1a0d217f
|
Update wiki.tpl
|
2018-08-25 21:29:25 +02:00 |
|
Max Kostikov
|
42c5e98670
|
Update Wiki_page_history.php
|
2018-08-25 21:27:20 +02:00 |
|
Max Kostikov
|
c9b80a3612
|
Update Wiki.php
|
2018-08-25 21:26:50 +02:00 |
|
Max Kostikov
|
e78a4d61d8
|
Update NativeWikiPage.php
|
2018-08-25 21:25:26 +02:00 |
|
Max Kostikov
|
88ebcb56e7
|
Update Wiki_page_history.php
|
2018-08-25 21:23:08 +02:00 |
|