Commit Graph

2281 Commits

Author SHA1 Message Date
Mario Vavti
d66f58a550 fix undefined constant warning 2018-09-01 21:09:04 +02: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 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
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
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
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
Mario Vavti
f036c25dca Merge remote-tracking branch 'mike/master' into dev 2018-08-24 14:44:45 +02:00
M.Dent
2893f7d481 Get full page of items 2018-08-23 23:54:18 -04:00
zotlabs
6ecd31a715 tweak archive widget for articles 2018-08-22 13:30:16 -07:00
Mario Vavti
cc03e1ceef Merge remote-tracking branch 'mike/master' into dev 2018-08-22 10:47:40 +02:00
zotlabs
42c4a0da51 Zot/Finger: ignore deleted hublocs 2018-08-21 21:38:10 -07:00
Mario Vavti
db853134e3 Merge remote-tracking branch 'mike/master' into dev 2018-08-21 13:19:30 +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
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
Mario Vavti
10c5b46e3b Merge remote-tracking branch 'mike/master' into dev 2018-08-14 13:04:37 +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
M.Dent
9402f537b6 Fix root not added to internationalized template search 2018-08-12 19:02:11 -04:00
Mario Vavti
759a18685b Merge remote-tracking branch 'mike/master' into dev 2018-08-12 14:07:16 +02:00
Mario
e07ab65d73 Merge branch 'oauth2-ui-pr' into 'dev'
Oauth2 ui pr

See merge request hubzilla/core!1255
2018-08-12 14:06:24 +02:00
Mario
26f51ece90 Merge branch 'oauth2' into 'dev'
Fixes to OAuth2 connect-with-openid.  Add zothash Claim.  Add zotwebbie Claim.

See merge request hubzilla/core!1254
2018-08-12 14:03:36 +02:00
zotlabs
5afe779ffc prevent json-ld bombing, turn off browser autocomplete on channel sources creation 2018-08-11 16:16:54 -07:00
M.Dent
af042ccf07 OAuth2 UI and settings updates 2018-08-10 13:54:26 -04:00
M.Dent
e587fe5ce8 Add user_id = local_channel() to the where clause of updates 2018-08-10 13:54:07 -04:00
M.Dent
0b31c677f2 Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. 2018-08-10 12:01:05 -04:00
Max Kostikov
d3362dfa0c Add translation for missed string 2018-08-10 16:56:22 +02:00
zotlabs
166879b8b0 bring some Zot6 libraries and interfaces to red/hubzilla 2018-08-06 17:43:22 -07:00
zotlabs
d908f53607 add app_options field 2018-08-02 22:49:30 -07:00
zotlabs
4d0611b7d4 hubzilla core issue #1258 2018-08-01 16:12:44 -07:00