Commit graph

563 commits

Author SHA1 Message Date
zotlabs
ed00b9957b indicate repeated posts 2018-09-02 20:44:15 -07:00
zotlabs
143241a45e Merge branch 'zap' 2018-09-02 20:17:52 -07:00
zotlabs
11a836cf83 sharing changes 2018-09-02 20:16:33 -07:00
zotlabs
931e0b5445 changes to sharing 2018-09-02 20:16:04 -07:00
zotlabs
9b2ae5396e Merge branch 'zap' 2018-09-01 15:56:15 -07:00
zotlabs
8e7fb44896 local compatibility fixes 2018-09-01 15:52:28 -07:00
zotlabs
0954afb321 compatibility fixes 2018-09-01 15:51:44 -07:00
zotlabs
9282a6a40b Merge branch 'zap' 2018-08-30 21:30:46 -07:00
zotlabs
d00648f3e1 Merge branch 'red' 2018-08-30 21:27:20 -07:00
zotlabs
adb1f58b59 some edge cases 2018-08-30 19:19:32 -07:00
zotlabs
2b0c512087 re-parent by default unless there's a "go out on the web and find a parent for this post" plugin. 2018-08-30 18:50:21 -07:00
zotlabs
62e2df4c96 add conversation element and more logging 2018-08-29 23:54:13 -07:00
zotlabs
c48aae55af more debugging 2018-08-29 22:22:06 -07:00
zotlabs
89d1be0343 better format of like/dislike text, grab object['id'] if inreplyto missing for these activities 2018-08-29 20:02:27 -07:00
zotlabs
ed4aa90338 connect perms 2018-08-29 02:19:32 -07:00
zotlabs
cf8e787427 issues uncovered in federation tests 2018-08-28 19:49:30 -07:00
zotlabs
896d25d7ae ap discovery issues 2018-08-28 18:37:21 -07:00
zotlabs
25466def83 Merge branch 'zap' 2018-08-27 19:14:53 -07:00
zotlabs
aeffec1a99 typo 2018-08-27 19:13:55 -07:00
zotlabs
17ed268f9e Merge branch 'zap' 2018-08-27 19:12:46 -07:00
zotlabs
199026bf6d typo 2018-08-27 19:12:00 -07:00
zotlabs
bc167e80ee Merge branch 'zap' 2018-08-27 18:59:52 -07:00
zotlabs
b8ee94c00a id linkage 2018-08-27 18:58:47 -07: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
1ec12c6a04 Merge branch 'zap' 2018-08-26 23:44:01 -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
M.Dent
a0c2bbac9d Add hook to extend conv_item cog dropdown menu 2018-08-26 23:26:10 -04:00
Max Kostikov
e78a4d61d8 Update NativeWikiPage.php 2018-08-25 21:25:26 +02:00
Max Kostikov
67a9dd8497 Update NativeWikiPage.php 2018-08-25 21:20:00 +02:00
zotlabs
81193100d7 cleanup 2018-08-23 23:20:04 -07:00
zotlabs
dd0bd65021 move activitypub functions to their own class 2018-08-23 16:50:00 -07:00
zotlabs
301d79b4e2 For Osada, move activitypub into core. 2018-08-22 23:04:37 -07:00
zotlabs
0896061e89 better handling for calendar events 2018-08-22 18:45:53 -07:00
zotlabs
d55e5bbe75 typos and photo fixes 2018-08-22 17:52:22 -07:00
Mario
5d2ac10073 Merge branch 'patch-17' into 'master'
Add missed app 'Order Apps'

See merge request hubzilla/core!1258

(cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7)

6086a70e Add missed app 'Order Apps'
2018-08-21 13:13:23 +02:00
zotlabs
bc06233d10 Merge branch 'red' 2018-08-20 22:24:44 -07:00
zotlabs
c4328b9090 osada updates 2018-08-19 20:39:23 -07:00
zotlabs
57e75d9332 add affinity app and start some serious refactoring of mod_photos 2018-08-16 23:01:31 -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
zotlabs
248d20c347 Merge branch 'red' 2018-08-13 20:36:40 -07:00
zotlabs
d95a1a34dd put photo updated timestamp into actor record 2018-08-13 17:27:46 -07:00
zotlabs
166879b8b0 bring some Zot6 libraries and interfaces to red/hubzilla 2018-08-06 17:43:22 -07:00
zotlabs
e9ccc4bc9a make Activity::encode_person() pluggable 2018-08-05 18:41:33 -07:00
zotlabs
18ffded92a handle tombstones 2018-08-03 19:26: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
54bf5d32bb import announce activities from pure ActivityStreams sources 2018-07-31 20:15:00 -07:00
zotlabs
2062c154d1 more announce 2018-07-31 19:55:27 -07:00
zotlabs
4ccf54c3e9 handle announce decode better 2018-07-31 19:50:39 -07:00
zotlabs
680a7dd6b8 typo 2018-07-31 19:43:54 -07:00
zotlabs
7e723f9e79 better handling of announce 2018-07-31 19:39:50 -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
66ab6831cb cleanup 2018-07-29 23:49:37 -07:00
zotlabs
b97ac5acd4 missing encryption on sync 2018-07-29 23:12:05 -07:00
zotlabs
b374a6f911 more channel sync debugging 2018-07-29 22:13:43 -07:00
zotlabs
9c479be7df communication testing 2018-07-29 20:19:02 -07:00
zotlabs
d3686ffee4 missing namespace 2018-07-29 19:19:28 -07:00
zotlabs
9744d35a5c clone issues 2018-07-29 18:58:33 -07:00
zotlabs
d67f335ce8 set directory to master if no fallbacks present 2018-07-29 18:25:11 -07:00
zotlabs
ee08b67bb6 zot6 discovery sanitisation 2018-07-29 17:54:53 -07:00
Mario
3a6d3cb396 Merge branch 'patch-8' into 'dev'
Fix navbar missed translations

See merge request hubzilla/core!1242
2018-07-28 21:22:12 +02:00
zotlabs
dd899418c1 app fixes
Merge branch 'red'
2018-07-27 15:31:19 -07:00
zotlabs
a0f28708ab don't sync system apps 2018-07-27 15:05:29 -07:00
zotlabs
e25d205a7f app delete issue with base installed apps and app photo being reloaded uneccessarily 2018-07-27 14:36:06 -07:00
zotlabs
e28dab17d6 app update and ownership issues 2018-07-27 13:59:27 -07:00
Max Kostikov
4fd9d1ee5f Update Apps.php 2018-07-27 11:29:38 +02:00
Max Kostikov
0fe7004d38 Update Apps.php 2018-07-27 11:03:02 +02:00
zotlabs
993e39b192 rewrite the verification/discovery combined step to eliminate looping 2018-07-26 03:51:45 -07:00
zotlabs
ecc9da2c1e resolve zotfinger looping on malformed input 2018-07-25 19:56:24 -07:00
zotlabs
f149b8838b misc fixes 2018-07-24 20:21:01 -07:00
zotlabs
54eb1be4c4 webfinger return false until I can stop the looping 2018-07-22 23:53:28 -07:00
zotlabs
ceaa444ea4 sigs 2018-07-22 23:28:18 -07:00
zotlabs
2542bc5b38 sync location 2018-07-22 17:50:01 -07:00
zotlabs
bd8a6d6195 updates 2018-07-19 22:15:50 -07:00
zotlabs
b21d24e83e fix delivery reports 2018-07-18 20:15:46 -07:00
zotlabs
91ac38f18e more content formatting and feature trimming 2018-07-17 21:56:51 -07:00
zotlabs
731e9b9dad update site import 2018-07-16 20:04:47 -07:00
zotlabs
717c0df9d5 comment and mail permissions, remove page permissions from core 2018-07-16 19:08:10 -07:00
zotlabs
970f4a3175 namespace/use swapped, merge conflict 2018-07-15 19:22:15 -07:00
zotlabs
444de76ee6 Merge branch 'red' 2018-07-15 18:47:55 -07:00
zotlabs
cf88cbb46f add summary field to item table 2018-07-15 18:31:39 -07:00
zotlabs
d71e70bedf functions to support module and widget registration by plugins. These have identical construction to core modules and widgets and are registered just like hooks during addon load. Also additional Apps functions addon_app_installed() and system_app_installed() which will eventually replace feature_installed() for features which are converted to apps. The convention being used is that the module associated with the app calls the appropriate *_app_installed() function and if not present emits descriptive text about the app and exits. This allows one to click on an 'available' app and learn about it. Once installed, the app module behaves normally and may offer functionality or what once were addon settings on the settings/featured page. Refer to zap-addons in the zap repository for examples of how this is being used to eliminate the 'additional features' and 'addon settings' pages. 2018-07-12 16:23:32 -07:00
zotlabs
b3b6b813f2 upstream/downstream comment work 2018-07-11 18:02:25 -07:00
zotlabs
b7e0115447 add plugin registration for widgets, move wiki to addon/app 2018-07-10 19:58:18 -07:00
zotlabs
4cc607ca36 provide widget registration for addons 2018-07-10 16:42:16 -07:00
zotlabs
cc90f71230 trim features (e2ee and bookmarks) 2018-07-08 22:28:15 -07:00
zotlabs
5b084c759e more app work 2018-07-05 22:27:44 -07:00
zotlabs
c80e009cf3 app store fixes 2018-07-05 21:46:34 -07:00
zotlabs
f7db9dcec5 more app work 2018-07-05 17:52:32 -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
1b7543680b Merge branch 'dev' 2018-07-04 20:09:55 -07:00
zotlabs
cf4a12b173 Merge branch 'dev' 2018-07-04 19:18:05 -07:00
zotlabs
c2c4e427a8 add plugin route registration, deprecate/remove plugin_module() functionality 2018-07-04 18:18:35 -07:00
zotlabs
a9cfa51c68 more reorg 2018-07-03 23:24:36 -07: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
40ab482ada various fixes 2018-07-01 21:07:35 -07:00
zotlabs
8c26db63dd some changes to support plume 2018-07-01 19:12:45 -07:00
zotlabs
bf405df4ed cleanup of jsalmon, return hubloc with verification success to save a lookup 2018-06-28 20:25:43 -07:00
zotlabs
7b841a6d40 finish the jsalmon verification bit 2018-06-27 19:22:12 -07:00
zotlabs
e55c703fe0 Time to celebrate: Z6 basic messaging -> posts, replies, and likes working 2018-06-27 18:43:39 -07:00
zotlabs
eb89ce9d04 fixes to the refresh transaction 2018-06-25 23:51:12 -07:00
zotlabs
90c5fb4794 remove public policy, fix more zot => zot6 network changes 2018-06-25 23:37:12 -07:00
zotlabs
f51dd5c3e3 more z6 heavy lifting 2018-06-25 20:55:53 -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
e00bae8bb6 httpsig refactor 2018-06-19 19:33:50 -07:00
zotlabs
e640171719 as fixes 2018-06-17 19:25:45 -07:00
zotlabs
1cd80c7a70 provide a primary_location info block with primary urls, etc. 2018-06-14 17:27:36 -07:00
zotlabs
13d6b254ff Merge branch 'red' 2018-06-13 21:41:11 -07:00
Mario Vavti
d0f7b1d9b7 fix issue #1221 2018-06-10 17:04:34 +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
dfa48ba17c fixes for search_item.tpl 2018-06-07 23:24:36 +02:00
zotlabs
2c7597066c update a number of links in the code 2018-06-06 17:12:20 -07:00
zotlabs
c2acdd299b should probably add the files 2018-06-04 23:20:09 -07:00
zotlabs
915c50064c consolidate directory functions into libzotdir 2018-06-04 23:19:16 -07:00
zotlabs
391cbacb2a a few dangling references to libzot 2018-06-04 18:47:36 -07:00
zotlabs
4846ae5326 split off libsync from libzot 2018-06-04 18:40:11 -07:00
zotlabs
eee6131d41 permissions work 2018-06-03 22:57:02 -07: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
02e173e733 finish porting zot6handler primitives 2018-06-03 17:49:48 -07:00
zotlabs
191edfdaa1 more heavy lifting 2018-05-31 21:05:09 -07:00
zotlabs
fd4ea47503 move libzot to class 2018-05-31 19:42:13 -07:00
zotlabs
6dcad87ae8 make refresh packet work 2018-05-30 20:32:59 -07:00
zotlabs
e0a35392f7 more commits 2018-05-29 23:30:18 -07:00
zotlabs
111bb93462 basic communication 2018-05-29 21:08:52 -07:00
zotlabs
b88a683127 zot communications 2018-05-28 19:42:40 -07:00
zotlabs
aa57887dd5 Merge branch 'master' into zapp 2018-05-26 15:13:57 -07:00
Mario Vavti
33700e9cf4 differentiate between direct messages and followers-only messages 2018-05-25 15:29:59 +02:00
zotlabs
c9fb4fd070 start sorting the permission debacle 2018-05-23 22:50:33 -07:00
zotlabs
d101ea88ca more zot6 work 2018-05-23 21:48:19 -07:00
Mario Vavti
9cf8931136 paint the locks on private activitypub items red. their privacy model is "slightly" different from ours 2018-05-23 22:11:13 +02:00
zotlabs
27ce7c11bd lots more zot6 work 2018-05-22 23:20:29 -07:00
zotlabs
9e44835cc9 Merge branch 'master' into zapp 2018-05-22 19:04:24 -07:00
zotlabs
9bf26cee6d add hook 'get_system_apps' 2018-05-21 16:19:17 -07:00
zotlabs
b1629db876 checkin lots of recent zap/zot6 work 2018-05-18 03:09:38 -07:00
Mario Vavti
efb0ac5996 fix php warning 2018-05-12 13:28:04 +02:00
zotlabs
721496f922 hubzilla issue #1169 2018-05-10 17:11:03 -07:00
zotlabs
67bb167cf8 Change hovertip on paperclip button to read 'Attach/Upload file' because a lot of people gravitate to 'insert photo from album' instead, looking for a way to upload into the post. 2018-05-09 21:22:25 -07:00
zotlabs
406ea67bbc Provide admin delete ability if the viewer is admin but has no existing delete authority. For 3.5+ as a new string is involved. 2018-05-02 17:39:12 -07:00
zotlabs
5a9e9284c2 generating random numbers too large for 32-bit systems 2018-04-25 14:10:11 -07:00