Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 19:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
22493 commits 7 branches 30 tags 160 MiB
Commit graph

22493 commits

This branch
This branch
All branches
Author SHA1 Message Date
zotlabs
23d89071b9 Merge branch 'zap' 2018-08-27 19:10:34 -07:00
zotlabs
8b297e7630 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-27 19:10:20 -07:00
zotlabs
08e8f026f0 typo 2018-08-27 19:09:48 -07:00
zotlabs
bc167e80ee Merge branch 'zap' 2018-08-27 18:59:52 -07:00
zotlabs
90b02001fa Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-27 18:59:32 -07:00
zotlabs
b8ee94c00a id linkage 2018-08-27 18:58:47 -07: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
1ec12c6a04 Merge branch 'zap' 2018-08-26 23:44:01 -07:00
zotlabs
6b4ef6b9c0 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-26 23:43:40 -07:00
zotlabs
3490eb4815 removed 2018-08-26 23:43:22 -07:00
zotlabs
8e24ee9471 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-26 23:42:29 -07:00
zotlabs
3d6e434068 removed file 2018-08-26 23:37:07 -07:00
zotlabs
9beda708de 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:35:29 -07:00
zotlabs
554b094eb4 Merge branch 'dev' 2018-08-26 23:24:27 -07: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
81193100d7 cleanup 2018-08-23 23:20:04 -07: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
403312140c Merge branch 'zap' 2018-08-23 17:35:04 -07:00
zotlabs
ed0f780231 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-23 17:33:51 -07:00
zotlabs
29f809f078 clean up the admin summary page 2018-08-23 17:31:41 -07:00
zotlabs
cc4e6c4b29 typo addon repo location 2018-08-23 17:18:03 -07:00
zotlabs
a0b227553b update install repository info 2018-08-23 17:16:31 -07:00
zotlabs
dd0bd65021 move activitypub functions to their own class 2018-08-23 16:50:00 -07:00
zotlabs
8e532a5777 update readme 2018-08-22 23:31:40 -07:00
zotlabs
5ffe9311f6 missing include 2018-08-22 23:15:44 -07:00