Commit graph

1704 commits

Author SHA1 Message Date
zotlabs
8e24ee9471 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-26 23:42:29 -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
Max Kostikov
c9b80a3612 Update Wiki.php 2018-08-25 21:26:50 +02:00
Max Kostikov
308dda1587 Update Wiki.php 2018-08-25 21:21:57 +02:00
M.Dent
2893f7d481 Get full page of items 2018-08-23 23:54:18 -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
dd0bd65021 move activitypub functions to their own class 2018-08-23 16:50:00 -07:00
zotlabs
5ffe9311f6 missing include 2018-08-22 23:15:44 -07:00
zotlabs
301d79b4e2 For Osada, move activitypub into core. 2018-08-22 23:04:37 -07:00
zotlabs
6ecd31a715 tweak archive widget for articles 2018-08-22 13:30:16 -07:00
zotlabs
9f979cab89 Merge branch 'zap' 2018-08-20 22:26:00 -07:00
zotlabs
bc06233d10 Merge branch 'red' 2018-08-20 22:24:44 -07:00
zotlabs
8bf1e3a944 more code optimisation 2018-08-20 22:02:08 -07:00
zotlabs
9b620b2a35 remove checkjs reloader from mod_display also 2018-08-20 20:07:54 -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
zotlabs
8f65d100e6 add ap_probe 2018-08-19 20:41:32 -07:00
zotlabs
2c1f8d894e Merge branch 'zap' 2018-08-17 14:43:19 -07:00
zotlabs
57e75d9332 add affinity app and start some serious refactoring of mod_photos 2018-08-16 23:01:31 -07:00
zotlabs
32acb0ff01 missing files 2018-08-15 21:33:11 -07:00
zotlabs
64196dd2a7 article summaries and some other stuff 2018-08-15 18:56:18 -07: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
248d20c347 Merge branch 'red' 2018-08-13 20:36:40 -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
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
e5b8b17112 Merge branch 'zap' 2018-08-06 18:53:55 -07:00
zotlabs
166879b8b0 bring some Zot6 libraries and interfaces to red/hubzilla 2018-08-06 17:43:22 -07:00
zotlabs
cedf21e55c keep the follow url 2018-08-05 23:15:15 -07:00
zotlabs
3c74e0a649 change import compatibility 2018-08-05 22:47:41 -07:00
zotlabs
a935c8d055 more permissions sorting 2018-08-05 21:57:53 -07:00
zotlabs
3c3baac052 permissions issue 2018-08-05 21:31:25 -07:00
zotlabs
ca12803bec permissions issue 2018-08-05 21:31:08 -07:00
zotlabs
cce9594f2b changes to channel module to support osada 2018-08-05 17:25:43 -07:00
zotlabs
60014547a2 more cleanup of owa upgrade 2018-08-03 17:03:55 -07:00
zotlabs
62ea8564fa owa issues 2018-08-03 16:03:16 -07:00
zotlabs
d908f53607 add app_options field 2018-08-02 22:49:30 -07:00
zotlabs
c6f34c7f80 more spring cleaning 2018-08-02 01:56:34 -07:00
zotlabs
082cd3953c sync and directory issues 2018-08-01 17:58:54 -07:00
zotlabs
4b6fa91bb3 directory packets need to be signed 2018-07-31 19:09:42 -07:00
zotlabs
88f3ce6736 cleanup unnecessary functions 2018-07-31 17:27:50 -07:00
zotlabs
a9c3af298b prep work for converting mail 2018-07-30 23:55:09 -07:00
zotlabs
28819baa72 sort out some setup issues 2018-07-30 19:25:35 -07:00
zotlabs
a87d5aa730 Merge branch 'red' into red_merge 2018-07-30 18:22:25 -07:00
zotlabs
e8aeecc4c9 When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable 2018-07-30 17:41:37 -07:00
zotlabs
9744d35a5c clone issues 2018-07-29 18:58:33 -07:00
zotlabs
ecc9da2c1e resolve zotfinger looping on malformed input 2018-07-25 19:56:24 -07:00
kostikov
b0c8e75c6e Fix duplicate transport displaying 2018-07-25 22:28:21 +02:00
zotlabs
f149b8838b misc fixes 2018-07-24 20:21:01 -07:00
zotlabs
b484441438 sync fixes 2018-07-22 23:06:45 -07:00
zotlabs
626a0ab788 only clone between similar platforms 2018-07-22 22:28:46 -07:00
zotlabs
2542bc5b38 sync location 2018-07-22 17:50:01 -07:00
zotlabs
07e526693e update the zot api (xchan store), plus a couple of typos 2018-07-19 17:14:37 -07:00
zotlabs
b21d24e83e fix delivery reports 2018-07-18 20:15:46 -07:00
zotlabs
f8ed09b3fa Merge branch 'red' 2018-07-18 18:55:28 -07:00
zotlabs
a757749be6 readme 2018-07-18 18:51:01 -07:00
zotlabs
a05c8ff66b query filter was a bit greedy 2018-07-18 17:48:23 -07:00
zotlabs
5ce50d0a2e mangled urls on redirects 2018-07-18 17:05:38 -07:00
zotlabs
91ac38f18e more content formatting and feature trimming 2018-07-17 21:56:51 -07:00
zotlabs
6baf4441e0 get rid of the deprecated location message type 2018-07-17 17:26:26 -07:00
zotlabs
5f5fedb6b5 responses to events 2018-07-16 23:40:09 -07:00
zotlabs
731e9b9dad update site import 2018-07-16 20:04:47 -07:00
zotlabs
46c468e376 update more object data structures 2018-07-16 17:23:24 -07:00
zotlabs
2cc6ca0f88 update the photo item_obj format to AS2+ 2018-07-16 16:46:20 -07:00
zotlabs
82a4bbd571 spellcheck 2018-07-15 23:32:09 -07:00
zotlabs
be7873b3af make static display the default and remove the UI to change it. 2018-07-15 20:34:21 -07:00
zotlabs
cf88cbb46f add summary field to item table 2018-07-15 18:31:39 -07:00
zotlabs
b7e0115447 add plugin registration for widgets, move wiki to addon/app 2018-07-10 19:58:18 -07:00
zotlabs
cc90f71230 trim features (e2ee and bookmarks) 2018-07-08 22:28:15 -07:00
zotlabs
505d9bef60 remove the techlevel settings 2018-07-08 20:19:44 -07:00
zotlabs
47e1c1a7dd move articles to addons, allow addons to provide module pdl files. 2018-07-08 18:33:55 -07:00
Mario Vavti
d903772831 this is messing with names containing a comma and is superfluous now 2018-07-06 08:44:25 +02:00
zotlabs
cc71e507cb don't provide manage apps button when viewing all available 2018-07-05 22:03:41 -07:00
zotlabs
f7db9dcec5 more app work 2018-07-05 17:52:32 -07:00
zotlabs
0c0d177c2e remove the view_stream advisory permission 2018-07-04 23:59:13 -07:00
zotlabs
f6e8ce5516 appstore changes 2018-07-04 23:20:35 -07:00
zotlabs
07ce5e04c1 appstore 2018-07-04 22:56:43 -07:00
zotlabs
cf4a12b173 Merge branch 'dev' 2018-07-04 19:18:05 -07:00
zotlabs
c8235d02e9 remove some obsolete stuff 2018-07-04 01:56:55 -07:00
Mario Vavti
d9ece80fda order nouveau by created instead of received since ordering by received returns unexpected results once old expired items get re-imported 2018-07-04 10:55:38 +02:00
zotlabs
e2e7acd20f more optimisations 2018-07-03 22:18:07 -07:00
zotlabs
29d973f848 move group to lib 2018-07-03 16:40:54 -07:00
zotlabs
6bf88f10d2 move queue functions to Zotlabs/Lib 2018-07-02 22:43:41 -07:00
zotlabs
fa6e5e4d75 plugins -> addons 2018-06-28 16:43:22 -07:00
zotlabs
e55c703fe0 Time to celebrate: Z6 basic messaging -> posts, replies, and likes working 2018-06-27 18:43:39 -07:00
zotlabs
156010050c imagick converter: -thumbnail doesn't preserve exif, -resize does 2018-06-26 17:19:32 -07:00
zotlabs
90c5fb4794 remove public policy, fix more zot => zot6 network changes 2018-06-25 23:37:12 -07:00
zotlabs
524551a05c do not include system channels in directory results 2018-06-25 23:20:02 -07:00
zotlabs
1b1d9e502c Merge branch 'red' 2018-06-25 21:02:44 -07:00
zotlabs
f51dd5c3e3 more z6 heavy lifting 2018-06-25 20:55:53 -07:00
zotlabs
712759ea4b disable log noise until it is needed 2018-06-25 13:42:21 -07:00
zotlabs
aab1ca25d4 dreport updates - separate dreport_name from dreport_recip 2018-06-24 19:41:03 -07:00
zotlabs
8222b02495 more zot6 heavy lifting 2018-06-24 18:54:29 -07:00
zotlabs
5c47602ba6 debugging the refresh handler 2018-06-21 01:15:12 -07:00
zotlabs
e999099ed0 another missed change 2018-06-19 22:11:31 -07:00
zotlabs
7cb88e27a9 missed this first time through 2018-06-19 22:09:49 -07:00
zotlabs
e00bae8bb6 httpsig refactor 2018-06-19 19:33:50 -07:00
zotlabs
517f0b4f0d Merge branch 'red' 2018-06-19 17:41:22 -07:00
zotlabs
48a25b1b85 channel sources: add 'resend' option to discard original author - similar to the Friendica remote_self setting 2018-06-18 20:44:59 -07:00
zotlabs
39e01fc94b make owa work for zot urls 2018-06-18 19:10:49 -07:00
zotlabs
3aa9bcac85 Merge branch 'red' into merge 2018-06-17 19:30:38 -07:00
zotlabs
e640171719 as fixes 2018-06-17 19:25:45 -07:00
zotlabs
1cb60c7f5e Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-06-17 17:47:04 -07:00
zotlabs
e4ed0f8acd owa: htmlentity encoding encountered in authentication workflow (possibly introduced during Apache mod_rewrite with QSA flag) 2018-06-17 17:30:09 -07:00
Mario
28043726e6 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-06-17 17:00:17 +02:00
Mario
9c5df51141 some work on mod group 2018-06-17 16:58:12 +02:00
zotlabs
7e736c5359 apply changes to slider defaults across all modules that use buildQuery for updates 2018-06-15 15:21:19 -07:00
zotlabs
2f3c3db020 hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes 2018-06-15 02:02:03 -07:00
zotlabs
7a144b90fb re-implement/refactor getQuotaInfo() on DAV storage 2018-06-14 20:40:25 -07:00
zotlabs
13d6b254ff Merge branch 'red' 2018-06-13 21:41:11 -07:00
zotlabs
8da0f9d356 optionally report total available space when uploading 2018-06-13 21:06:56 -07:00
zotlabs
b5e4a5f51c SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. 2018-06-13 20:27:10 -07:00
zotlabs
65cbc7c2bb uid is integer 2018-06-13 16:37:16 -07:00
zotlabs
b0b67fbcc4 Merge branch 'master' of ../hz into dev 2018-06-13 16:28:08 -07:00
zotlabs
254a6be277 null db fields in mod_invite 2018-06-13 16:25:50 -07:00
Mario Vavti
9e29c13678 fix issue #1219 2018-06-09 16:38:15 +02:00
Mario Vavti
c4778e5e24 restrict cid filter to unthreaded order (makes much more sense that way imho and the query is a lot faster) and slighty change order of the filters 2018-06-09 10:58:01 +02:00
Mario Vavti
1fbc131469 if unthreaded and cid and not pf, query author only 2018-06-08 23:19:30 +02:00
zotlabs
e4649648d1 upgrade the rest of my_perms 2018-06-07 20:17:30 -07:00
zotlabs
3b0469a277 finish migrating their_perms (except for federation addons) 2018-06-07 19:44:09 -07:00
zotlabs
38a2493ed0 Merge branch 'red' 2018-06-07 18:44:05 -07:00
Mario Vavti
b3928f3d2a escape query string 2018-06-07 22:45:07 +02:00
Mario Vavti
d3bc50e18d do not query for parents if $conv and $nouveau are set 2018-06-07 21:58:09 +02:00
zotlabs
cc6f2a07ef remove ratings and the xrd interface 2018-06-06 21:50:43 -07:00
Mario Vavti
dd4b8529c2 Merge remote-tracking branch 'mike/master' into dev 2018-06-06 20:13:03 +02:00
Mario Vavti
5d1d6299cd add the pf argument to the forum notification links 2018-06-06 18:02:25 +02:00
zotlabs
d6f98ab88e some work to make menus editable by visitors with webpage write permissions; this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality. 2018-06-05 21:12:42 -07:00
Mario Vavti
7188e719ef rely on the pf argument to determine if we deal with a forum or not. xchan_pubforum is not set for all public forums in the forum filters for some reason. 2018-06-05 11:56:30 +02:00
zotlabs
915c50064c consolidate directory functions into libzotdir 2018-06-04 23:19:16 -07:00
zotlabs
4846ae5326 split off libsync from libzot 2018-06-04 18:40:11 -07:00
Mario Vavti
6019a34da2 be specific about the term type and do not sort the results 2018-06-04 15:54:18 +02:00
zotlabs
b7356eda49 start fresh after a lot of heavy lifting and fix a lot of stuff 2018-06-03 21:23:34 -07:00
zotlabs
4524d241a2 Merge branch 'master' into zapp 2018-06-03 17:58:24 -07:00
zotlabs
02e173e733 finish porting zot6handler primitives 2018-06-03 17:49:48 -07:00
Mario Vavti
8b76b5a0a6 improve network cid query 2018-06-03 23:03:30 +02:00
Mario Vavti
3d3e7bafd5 distinct is needed or it can heavily impact pagination in certain situations (5 per page instead of 20). Add ordering to the select clause to mitigate errors in postgres and add item_thread_top = 1 for slightly better performance. 2018-06-03 17:31:50 +02:00
Mario Vavti
a42ff1e6d4 missing $perm_sql 2018-06-03 13:27:06 +02:00
Mario Vavti
8189408190 finalize filters and forum notifications 2018-06-02 22:11:11 +02:00
Mario Vavti
db0a3a7534 some more work on forum notifications 2018-06-02 15:39:38 +02:00