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 |
|
Max Kostikov
|
308dda1587
|
Update Wiki.php
|
2018-08-25 21:21:57 +02:00 |
|
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
|
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 85aa495741)
6086a70e Add missed app 'Order Apps'
|
2018-08-21 13:13:23 +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 |
|