Commit graph

2561 commits

Author SHA1 Message Date
zotlabs
1de2bafa61 improved notification links for new connections, ongoing work on onepoll and zotfeeds, reduce core usage of item.postopts 2019-08-27 22:25:06 -07:00
zotlabs
a0e7ddd8cd better collection parsing 2019-08-26 19:54:21 -07:00
zotlabs
d478571b6d assorted fixes for assorted stuff 2019-08-25 17:35:14 -07:00
zotlabs
22669bb701 backport from downstream and some other minor cleanup 2019-08-20 19:25:36 -07:00
zotlabs
befa9a5ea7 update zotsh to work with owa 2019-08-14 17:03:22 -07:00
zotlabs
1131ba9096 typo 2019-08-13 23:59:45 -07:00
zotlabs
e7e22d4f2e bug fix 2019-08-13 23:57:00 -07:00
zotlabs
a331db0803 rework the config setting to hide the cloud root 2019-08-13 22:39:20 -07:00
zotlabs
dfd771da4e fix suggestion ignore redirection and update zotsh 2019-08-13 19:42:32 -07:00
zotlabs
c8ad9713ac whitespace 2019-08-07 23:02:30 -07:00
zotlabs
79fbccdce7 add client_name to oauth2 storage 2019-08-04 17:30:07 -07:00
zotlabs
57a2fe9dd6 fix image censoring 2019-07-31 21:46:19 -07:00
zotlabs
0de97b2fc0 revert image pixelation, but provide a framework for re-implementing it in the future 2019-07-31 18:15:38 -07:00
zotlabs
e163ece9e0 add 'safe mode' over-ride to connection image pixelation 2019-07-30 22:37:55 -07:00
zotlabs
3bc243ea46 image censoring per connection 2019-07-30 17:56:35 -07:00
zotlabs
4e87935fda affinity tool -> friend zoom; alter xchan_query to return results in hubloc_primary desc order; as hublocs have been seen in the wild with no primary 2019-07-29 19:33:36 -07:00
zotlabs
6e7d144789 bug fixes 2019-07-25 18:48:35 -07:00
zotlabs
d8ce899bb9 cleanup 2019-07-25 17:12:48 -07:00
zotlabs
c660c77ff6 allow the comment permission limit to be changed at will - no matter what permission role is in play. 2019-07-11 22:54:35 -07:00
zotlabs
cf040dea61 misc fixes 2019-07-11 22:03:17 -07:00
zotlabs
b170e01fa5 cleanup 2019-07-10 18:43:20 -07:00
zotlabs
27a03a3a5c misc experimental things (wip) 2019-07-07 16:32:48 -07:00
zotlabs
7e8411c742 more app work 2019-06-30 23:36:03 -07:00
zotlabs
2925aad846 add missing module 2019-06-30 20:11:48 -07:00
zotlabs
6b1f5503a3 add photomap app 2019-06-30 20:11:08 -07:00
zotlabs
18dc941526 directory issue 2019-06-30 19:10:12 -07:00
zotlabs
1933d0f3dd turn tasks into an app 2019-06-29 19:23:31 -07:00
zotlabs
a2a7a22c38 better handling of channel meta 2019-06-29 17:54:48 -07:00
zotlabs
df18f57217 add opengraph meta info to channel page 2019-06-29 16:37:30 -07:00
zotlabs
969b8e17a1 extend direct message definition to anything with allow_cid but *not* allow_gid 2019-06-27 18:39:08 -07:00
zotlabs
9a907fe262 make notes widget fixed height because it still doesn't play well with stickykit and I've wasted too much time trying to bludgeon it into submission. 2019-06-25 16:11:22 -07:00
zotlabs
8553af4d41 photos widget issue 2019-06-24 18:59:27 -07:00
zotlabs
8cc49657f9 tasks and notes 2019-06-24 17:35:12 -07:00
zotlabs
17599db5c9 cleanup - filter "unsafe" entries from driectory tag cloud 2019-06-20 23:17:04 -07:00
zotlabs
5e189cb14e some early dev work for dm support 2019-06-18 19:21:31 -07:00
zotlabs
f829665047 minor compatibility issue with hyperdrive and traditional zot sources 2019-06-17 18:32:08 -07:00
zotlabs
3396879cf0 cleanup 2019-06-16 23:38:43 -07:00
zotlabs
9ab4d551e8 cleanup 2019-06-16 23:05:15 -07:00
zotlabs
4442f7e9b6 a couple of issue with liking profiles 2019-06-16 20:35:47 -07:00
zotlabs
0a2116345f cleanup of linked item deletion 2019-06-16 19:18:49 -07:00
zotlabs
d2d0f24590 issues syncing liked photos 2019-06-15 18:30:10 -07:00
zotlabs
30c37497fa misc errors and warnings 2019-06-13 23:36:16 -07:00
zotlabs
337d08b049 undo hmessages.po and hstrings.php hack 2019-06-13 22:39:40 -07:00
zotlabs
232bd025f3 typo 2019-06-12 20:57:28 -07:00
zotlabs
ae8d31c8b1 event stream filter 2019-06-11 22:12:25 -07:00
zotlabs
7c34e4ee79 nocomment app 2019-06-11 20:40:25 -07:00
zotlabs
4ec1b14bd1 event sync work 2019-06-11 19:36:55 -07:00
zotlabs
9b7326f41d event deletion testing 2019-06-11 19:14:19 -07:00
zotlabs
48dcdcaa15 file sync issues 2019-06-11 17:27:31 -07:00
zotlabs
0beca4ae42 debugging 2019-06-11 16:37:47 -07:00
zotlabs
b03fc197aa file sync issues related to thumbnail os_storage 2019-06-11 16:32:33 -07:00
zotlabs
e9f923a5c0 fix feeds 2019-06-10 23:39:17 -07:00
zotlabs
00e0f2b822 update subthread 2019-06-10 23:21:57 -07:00
zotlabs
49183f8484 event deletion issue 2019-06-10 21:19:19 -07:00
zotlabs
f65ab4236e revisit the hyperdrive settings and remove some obsolete "federation" settings. 2019-06-10 18:52:16 -07:00
zotlabs
a039c84e29 updates 2019-06-08 16:53:05 -07:00
zotlabs
0359acb32e Deprecate global channel removal. There are a few issues which need to be addressed. The first of which is a mechanism to tell other servers to destroy your clones. The second is securing this against forgery attempts. In its current form a lot of your data is removed from around the network but the channel clones themselves may remain. 2019-06-04 23:27:11 -07:00
zotlabs
e292219db0 misc photo issues 2019-06-04 17:53:21 -07:00
zotlabs
5a8b25b6be default public search to disabled. 2019-05-29 17:32:31 -07:00
zotlabs
bb97dedcdd improve expiration +cleanup 2019-05-29 16:29:55 -07:00
zotlabs
905917140a support expire plus misc cleanup 2019-05-28 16:42:32 -07:00
zotlabs
b7e7b997e7 cleanup 2019-05-27 20:50:05 -07:00
zotlabs
d382f68161 the only thing worse than no doco is bad doco 2019-05-26 19:55:08 -07:00
zotlabs
dfcd2b319b cleanup 2019-05-23 22:51:39 -07:00
zotlabs
6858ab5741 cleanup, link modal issue 2019-05-23 16:37:56 -07:00
zotlabs
604e3e7c0b a bit of pubsites cleanup 2019-05-21 22:04:53 -07:00
zotlabs
a59489e9dd bring back events app - calendar is not yet ready for prime time 2019-05-15 21:22:47 -07:00
zotlabs
52fe8485d7 begin refactor of mod_pubsites 2019-05-15 17:27:33 -07:00
zotlabs
e9ba43582e add portable_id to share attributes in some cases 2019-05-13 20:28:56 -07:00
zotlabs
ee4c24970b calendar fixes 2019-05-13 16:59:50 -07:00
zotlabs
61ad767daa more cleanup 2019-05-12 23:57:57 -07:00
zotlabs
e9f5edbd28 missing local AS context in a couple of places 2019-05-12 22:29:16 -07:00
zotlabs
27168741b5 issue with message-id on Like activities 2019-05-12 22:11:27 -07:00
zotlabs
a73d01cfa0 cleanup 2019-05-12 20:52:10 -07:00
zotlabs
61e2cf7b5c calendar code cleanup 2019-05-12 19:54:05 -07:00
zotlabs
75db736512 merged calendar porting fixes 2019-05-12 19:20:17 -07:00
zotlabs
fe1517022c port calendar merge from hz 2019-05-12 18:20:37 -07:00
zotlabs
23e8c52bea register page was missing form token 2019-05-10 18:34:27 -07:00
zotlabs
d747d9b7d3 get_rpost_path() moved to a static class method and was still being referenced as a global 2019-05-07 21:50:02 -07:00
zotlabs
ff686b354b remove techlevels 2019-05-07 19:40:49 -07:00
zotlabs
431387bce2 cleanup 2019-05-06 22:22:58 -07:00
zotlabs
6634ad9085 cleanup - implement remote purge which has been missing for a long time 2019-05-06 20:22:08 -07:00
zotlabs
e7f5ad401c cleanup 2019-05-05 23:38:29 -07:00
zotlabs
6b31b648eb typo 2019-05-05 18:50:28 -07:00
zotlabs
687eb93153 directory entry reporting handler 2019-05-05 18:44:33 -07:00
zotlabs
b64858a099 directory: if safe mode is enabled, strip links from profile elements 2019-05-05 13:06:15 -07:00
zotlabs
23c4a30488 new logo, typo 2019-05-03 19:36:09 -07:00
zotlabs
22205f0490 part of dislike missing 2019-05-03 03:17:57 -07:00
zotlabs
51eba95a93 reactions 2019-05-02 21:21:10 -07:00
zotlabs
33ba42ba79 more work on reactions 2019-05-02 19:39:08 -07:00
zotlabs
f7971c8a57 don't provide dirsort links in mod_directory suggestion mode 2019-04-30 23:46:08 -07:00
zotlabs
79f5866137 fix suggestion ordering 2019-04-30 23:18:39 -07:00
zotlabs
dd0df677a6 resolve some of the issues associated with having multiple suggestion implementations, and add xign sync to this subsystem 2019-04-30 16:52:07 -07:00
zotlabs
6753c789f0 don't show superblocked channels in suggestions 2019-04-29 19:29:11 -07:00
zotlabs
267e620b86 Improvements to dbsync 2019-04-29 16:37:59 -07:00
zotlabs
d0fb2c5f84 minor issue with inspector and add xchan/hubloc inspector 2019-04-28 23:03:48 -07:00
zotlabs
4f92d05588 cleanup 2019-04-28 21:17:04 -07:00
zotlabs
11d41ddf10 better handling of drag/drop videos and add thumbnails if available 2019-04-26 21:01:00 -07:00
zotlabs
5abb1a4eb0 remove "tryomebed" from bbcode and default the rpost url detection to oembed+zotobj 2019-04-19 15:38:29 -07:00
zotlabs
80bc6137fd zot objs 2019-04-19 14:34:47 -07:00
zotlabs
0aa017d242 rework admin page 2019-04-17 21:40:35 -07:00
zotlabs
7470d0c58e more libprofile 2019-04-17 19:19:49 -07:00
zotlabs
7748d330d2 tweak 2019-04-17 17:22:27 -07:00
zotlabs
aa9d29a0ec start libprofile 2019-04-17 16:54:06 -07:00
zotlabs
8c1e8e5df9 cleanup 2019-04-16 23:31:36 -07:00
zotlabs
c17c7a76a3 bring back the oembed toggle 2019-04-16 17:44:42 -07:00
zotlabs
b60c842c7c ZotObject toggle (wip) 2019-04-16 12:50:44 -07:00
zotlabs
89af6ee5ff port photo lib updates 2019-04-15 23:43:06 -07:00
zotlabs
7364a82f5d remove old twitter stuff 2019-04-15 21:55:59 -07:00
Mike Macgirvin
76d2f5b9b9 move phpgit to composer 2019-04-16 14:51:27 +10:00
zotlabs
89709b3b47 cleanup 2019-04-15 20:04:58 -07:00
zotlabs
fd600a57fa cleanup 2019-04-15 17:34:29 -07:00
zotlabs
324ee0b5dc cleanup 2019-04-14 23:50:49 -07:00
zotlabs
7743e12072 more cleanup 2019-04-14 23:41:26 -07:00
zotlabs
dffdac0757 cleanup 2019-04-14 22:31:07 -07:00
zotlabs
339b724c35 use urlify from composer 2019-04-11 23:59:44 -07:00
zotlabs
6bdf35ec67 move everything from include/environment to setup where it is used 2019-04-11 21:52:20 -07:00
zotlabs
5cb0e7600b some cleanup 2019-04-11 20:26:38 -07:00
zotlabs
7efc231b11 make categories app actually do something useful 2019-04-11 17:06:56 -07:00
zotlabs
736714decf repeating event work and some fixes from upstream 2019-04-10 23:45:24 -07:00
zotlabs
0e8f34021e schema mods for recurring events 2019-04-10 00:20:41 -07:00
zotlabs
db15d2a98e event cleanup 2019-04-07 21:20:06 -07:00
zotlabs
f32dfdfcf7 auto friend collections 2019-04-05 00:54:35 -07:00
zotlabs
fd02fb95d9 update obscurify 2019-04-04 19:55:17 -07:00
zotlabs
9a37e9a33a move collections to a different button that doesn't get disabled when privacy is turned on. 2019-04-03 22:18:13 -07:00
zotlabs
3f1fff5c08 remove default mention on groups/collections when accessing via network page 2019-04-03 18:26:48 -07:00
zotlabs
8f4a3723da the rest of the stuff to support collections 2019-04-03 16:22:03 -07:00
zotlabs
d22285c888 disable directory keywords when forums or collections selected 2019-04-02 19:20:40 -07:00
zotlabs
96d431fcb5 add collections to directory 2019-04-02 18:53:43 -07:00
zotlabs
7093c2d514 use affinity slider to set default affinity slider values 2019-04-01 19:04:08 -07:00
zotlabs
a441a5b901 convert new-friend activity to note since ASV2 vocabulary is incompatible with ASV1. 2019-04-01 17:00:00 -07:00
zotlabs
4dd8393976 do a better job of mapping comment policy to zot6, use photo table (not item object) to get photolink in embedphotos 2019-04-01 15:19:41 -07:00
zotlabs
ad021811d8 make sure enough info in edited photos is changed to actually update on the other end 2019-03-30 15:56:37 -07:00
zotlabs
42dcc86e3e linkinfo honour link-only setting for images, local videos. Photo editing anomalies. 2019-03-30 15:01:25 -07:00
zotlabs
0bb49829a6 let people know there's nothing in the moderation queue if the query returns empty 2019-03-27 20:30:12 -07:00
zotlabs
4d48f5e7bf make moderation notifications go to the right place 2019-03-27 19:20:35 -07:00
zotlabs
aaff7c54cf jotgetlink modal 2019-03-26 17:01:55 -07:00
zotlabs
83a79d4b6b fixes from upstream 2019-03-26 16:06:06 -07:00
zotlabs
0030bdac40 xchan_instance_url was still being referenced, add expire app 2019-03-24 22:46:31 -07:00
zotlabs
2499086f69 appify categories 2019-03-24 20:08:23 -07:00
zotlabs
3a95d71821 more prep work for collections 2019-03-23 15:23:59 -07:00
zotlabs
c3e9840a7d sync apps, fix some warnings and prepare for a jot link modal 2019-03-21 21:57:43 -07:00
zotlabs
bc4d615701 update help text for content filters 2019-03-19 17:23:33 -07:00
zotlabs
2f8b1e550b profile gender configurability 2019-03-18 21:33:50 -07:00
zotlabs
7169bd1ebc xss issue from upstream, messagefilter enhancements 2019-03-18 19:19:04 -07:00
zotlabs
2df403c4ec missing function 2019-03-17 21:18:32 -07:00
zotlabs
6b233e512a item redirection issue 2019-03-14 17:20:36 -07:00
zotlabs
611efdf529 expose the directory publish channel setting 2019-03-12 22:49:18 -07:00
zotlabs
35e42ba156 fetch changes from upstream 2019-03-12 19:13:48 -07:00
zotlabs
5be2ad8e3a optionally require authenticated fetches 2019-03-11 17:45:44 -07:00
zotlabs
c1bf32cdc8 enforce channel and domain blocks on object fetches 2019-03-10 17:11:35 -07:00
zotlabs
30f40fd0d2 authenticated fetch fixes 2019-03-09 13:13:04 -08:00
zotlabs
905b7e1fa9 preserve system apps during channel cloning (check those that were installed on the other site and install them locally, preserving categories) 2019-03-06 14:58:19 -08:00
zotlabs
8eb18275c0 auto configure imagick converter during install if /usr/bin/convert is executable 2019-03-05 20:36:15 -08:00
zotlabs
d9a94f350c chunk uploads for profile and cover photos 2019-03-05 19:51:41 -08:00
zotlabs
2540983c87 begin chunked uploads for profile photos 2019-03-05 18:31:38 -08:00
zotlabs
a1af668815 more work to support collections 2019-03-05 17:27:16 -08:00
zotlabs
823a5b0c3a reduce assumption of default php upload limit to 2M 2019-03-05 15:22:43 -08:00
zotlabs
0e7cc08276 some basic collections/pages support 2019-03-04 23:51:47 -08:00
zotlabs
054e27fc75 remove items for removed connections in the background, also only deliver toplevel sync items to clones and remove these from normal delivery, fix to oep albums which was still using hex2bin/bin2hex (these are now hashes), add content import to translated apps, allow api routes to contain an optional argument. 2019-03-04 15:39:03 -08:00
zotlabs
1aa56aa76b add moderated permission 2019-02-28 15:14:22 -08:00
zotlabs
2eabd8cb56 code cleanup 2019-02-25 19:45:50 -08:00
zotlabs
e938b7e71e file import issues, change min php version in setup 2019-02-25 14:57:19 -08:00
zotlabs
5baa3fa4ef issues encountered testing content_import plugin 2019-02-24 21:36:06 -08:00
zotlabs
0092c86a6f remove title_tosource option 2019-02-24 15:09:42 -08:00
zotlabs
ff40f44da6 modify item export api call, plus a few changes from upstream 2019-02-23 15:23:33 -08:00
zotlabs
2b21e4d6e6 fix mod_activity AS query and change the fix for urlencoding of categories in category widget to match upstream 2019-02-21 14:38:11 -08:00
zotlabs
466de65b35 add item uuid 2019-02-19 14:59:22 -08:00
zotlabs
e73af6511e fix guest file (creator) delete 2019-02-19 13:04:28 -08:00
zotlabs
db4871ae1a cloud perms and location independent content searching 2019-02-19 12:31:39 -08:00
zotlabs
ee0cdbc61a debug x-zot: protocol requests 2019-02-18 17:28:29 -08:00
zotlabs
0563c714a7 infrastructure for resolving portable zot urls 2019-02-18 14:40:46 -08:00
zotlabs
e108b7c223 fixes from upstream 2019-02-17 21:45:31 -08:00
zotlabs
4b96c88e50 more removal of unnecessary legacy stuff, string update 2019-02-17 15:00:08 -08:00
zotlabs
e3a5b2fdf8 php warnings 2019-02-14 20:44:34 -08:00
zotlabs
9b36994ef1 Merge ../p3 into dev 2019-02-14 17:08:44 -08:00
zotlabs
db9eae39b8 more string changes 2019-02-14 17:06:17 -08:00
zotlabs
f25a48c54a accesscontrol rename 2019-02-14 16:01:40 -08:00
zotlabs
63a75cc7d5 rename privacy groups to access lists, forums to groups 2019-02-14 15:26:37 -08:00
zotlabs
c72d19dbf2 profile photo edit date weirdness 2019-02-13 21:07:27 -08:00
zotlabs
8b5bc7303f more work zot+ 2019-02-13 19:55:36 -08:00
zotlabs
154b0e96d5 start zot+/zap+ 2019-02-13 15:33:45 -08:00
zotlabs
329f441fec remove hyperdrive setting as it does not work reliably in all cases 2019-02-11 15:15:12 -08:00
zotlabs
4bc9620597 expose setting to block public search 2019-02-07 21:05:42 -08:00
zotlabs
23a67081d9 misc fixes from the logs and upstream 2019-02-05 19:01:17 -08:00
zotlabs
da09048a7d linkify_tags fixes from upstream 2019-02-03 16:57:07 -08:00
zotlabs
25c160655f fix for missing authors and a permission fix from upstream 2019-02-03 11:45:29 -08:00
zotlabs
ec6297c60b federation issues with embedded posts 2019-01-29 21:48:45 -08:00
zotlabs
8f861659d2 post embed 2019-01-29 21:26:52 -08:00
zotlabs
9eb9e10712 cache embeds on storage 2019-01-29 15:18:35 -08:00
zotlabs
f5125b51f1 add ical link to activitystreams event objects 2019-01-28 14:58:18 -08:00
zotlabs
ab9f1ae33c wordsmithing 2019-01-23 16:18:05 -08:00
zotlabs
045debd26f issues with autoperms, rewrite owa, upstream fixes to main.js 2019-01-23 14:27:51 -08:00
zotlabs
a4f638124b content filter app 2019-01-22 19:11:53 -08:00
zotlabs
1d3540ac6c refactor include/follow (Connect::connect()) and update strings 2019-01-21 17:31:24 -08:00
zotlabs
289150a21a updates 2019-01-18 13:04:05 -08:00
zotlabs
66e0c61ebb separate blacklisting availability for public streams and general communications 2019-01-05 14:47:21 -08:00
zotlabs
64462c9d0d enable activitypub for encoding collections 2019-01-05 12:42:41 -08:00
zotlabs
921313f0c8 remaining work on slider conversion 2018-12-30 14:36:23 -08:00
zotlabs
a001507577 assorted issues 2018-12-26 15:33:01 -08:00
zotlabs
ad5381545a affinity slider issues after approving connections 2018-12-17 01:59:17 -08:00
zotlabs
7e4fc5c438 completion of crypto cleanup 2018-12-16 20:37:43 -08:00
zotlabs
e47bc21034 crypto: switch to Keyutils - please review 2018-12-14 12:46:03 -08:00
zotlabs
bbc90c4b4f ebs 2018-12-13 14:14:01 -08:00
zotlabs
b9d1ccbbc3 issues with app ordering 2018-12-12 19:04:59 -08:00
zotlabs
0a2eae6612 configurable hyperdrive 2018-12-10 23:53:03 -08:00
zotlabs
49f9d5076f fix home ping results when large number of network posts is present 2018-12-09 14:15:35 -08:00
zotlabs
437b40b04c code modernisation 2018-12-06 21:54:06 -08:00
zotlabs
52e5cee217 dilithium crystals were 2nd quality 2018-12-04 21:51:56 -08:00
zotlabs
c163ebcf8b new dimensions in hyperspace 2018-12-04 16:20:54 -08:00
zotlabs
643214917d misc fixes, plus add cover photo and profile "about" to AP actor document 2018-12-03 21:45:35 -08:00
zotlabs
b3d36b0c7c thread issues 2018-12-02 20:24:12 -08:00
zotlabs
4cd565930c allow notification filtering by name or addr 2018-11-30 19:01:10 -08:00
zotlabs
ee4c181801 fix comment policy for zot6 delivery of AP messages 2018-11-26 16:16:07 -08:00
zotlabs
e253a25025 forum work 2018-11-21 17:46:08 -08:00
zotlabs
6dc45a9644 fix wildcard blacklist checking 2018-11-20 21:50:41 -08:00
zotlabs
f10ed01fac hardening 2018-11-20 18:55:33 -08:00
zotlabs
7cc762dcea add more schema validation to clone sync activities 2018-11-19 17:30:22 -08:00
zotlabs
8f6b1c1239 comment delivery issue 2018-11-18 21:53:09 -08:00
zotlabs
af6a52ffe3 misc cleanup from hubzilla 2018-11-15 20:52:08 -08:00
zotlabs
8fb97e9e16 php warning 2018-11-11 19:13:11 -08:00
zotlabs
30b5902496 regression 2018-11-11 18:51:05 -08:00
zotlabs
1bf150398e implement update-person activity 2018-11-07 20:29:14 -08:00
zotlabs
b58c032b8f osada issue #6 - enforce Mastodon advisory privacy on hyper-drive imported items 2018-11-07 15:31:11 -08:00
zotlabs
ced3fe7aa5 Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev 2018-11-04 17:19:23 -08:00
zotlabs
cb9e81a1d3 route mismatch for comments between osada and zap 2018-11-04 17:18:12 -08:00
DM42.Net (Matt Dent)
8a2e9ec9e6 Fix spurrious error for sites without images 2018-11-03 12:11:17 -04:00
zotlabs
7e3c8e46e7 turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility) 2018-10-28 20:39:01 -07:00
zotlabs
516a375fff fix embed photos from albums and phase1 of the forum count bug from hubzilla and the edit post breaking delivery chain bug also from hubzilla 2018-10-27 14:30:07 -07:00
zotlabs
5c58abd801 superblock leaking through enotify::format 2018-10-25 22:12:47 -07:00
zotlabs
d2cc723e11 separate pubsites page into separate projects 2018-10-23 17:49:08 -07:00
Mike Macgirvin
441b65c030 mv blueimp library to composer, remove duplicate copy in library 2018-10-23 11:00:33 +11:00
zotlabs
6378cb8f27 miscellaneous fixes, unset project icon, onepoll feed failure 2018-10-20 02:03:31 -07:00
zotlabs
aeb282d9c1 share improvements 2018-10-17 16:08:43 -07:00
zotlabs
cd2c3f7127 share issue on zot6 side 2018-10-17 15:51:23 -07:00
zotlabs
48363c2cab event AP endpoint update 2018-10-16 20:42:44 -07:00
zotlabs
134dd8d653 setup fixes 2018-10-16 20:25:37 -07:00
zotlabs
21301adfd3 owa issue 2018-10-16 19:32:17 -07:00
zotlabs
eda156a5bb regression in socgraph 2018-10-15 19:29:32 -07:00
zotlabs
4ee5755bc6 peertube improvements, missing host in dreport 2018-10-15 18:27:03 -07:00
zotlabs
8dd30c5f7a php warning removing ap connnection 2018-10-14 22:42:55 -07:00
zotlabs
8119fe2e5a merge bbcode summary with actual summary 2018-10-13 00:37:22 -07:00
zotlabs
4af3f25c15 remove nav link override, turn announce activities into sourced items 2018-10-11 21:05:30 -07:00
zotlabs
31fd804c6b regression found in auto author mention 2018-10-10 21:27:15 -07:00
zotlabs
84552ef9d5 better handling of tombstones, schema changes from upstream 2018-10-10 18:53:26 -07:00
zotlabs
c9bcde817a the rest of the bits 2018-10-10 17:58:51 -07:00
zotlabs
c5a886ffea missed a fix 2018-10-09 22:32:20 -07:00
zotlabs
3a8d916702 better signature handling 2018-10-09 21:08:57 -07:00
zotlabs
c2b8829f9d hubzilla core issue #1278 2018-10-07 22:15:46 -07:00
zotlabs
87587c40d3 rework the banner code 2018-10-07 19:54:25 -07:00
zotlabs
d64e67b18c fix affinity settings, use export var on bbcode destined for ActivityPub recipients to strip out map and embed scripts 2018-10-04 21:16:20 -07:00
zotlabs
9424a7f56b app updates from red/hubzilla 2018-10-04 20:29:41 -07:00
zotlabs
be7cb76651 group support 2018-10-04 18:40:57 -07:00
zotlabs
2f48679fef fix import/export after project merger 2018-10-04 13:45:20 -07:00
zotlabs
02d0256449 fix masto images (again) 2018-10-04 02:19:08 -07:00
zotlabs
6a71ffe2c2 correct the servername 2018-10-03 19:31:47 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
M.Dent
404b7d48dc Fix import_xchan function not found 2018-09-27 23:13:00 -04:00
zotlabs
0460814158 channel signing issue 2018-09-25 20:41:06 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
54bfc4a88d delivery issues 2018-09-21 16:29:13 -07:00
zotlabs
382551e4b4 strip bbcode from event titles 2018-09-20 22:50:12 -07:00
zotlabs
6221d2b1bb php warning 2018-09-20 17:17:41 -07:00
zotlabs
92b2d17297 Merge branch 'zap' into dev 2018-09-19 17:55:15 -07:00
zotlabs
b95f41571c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 17:54:07 -07:00
zotlabs
45ece3c6c5 item fix 2018-09-19 17:53:49 -07:00
zotlabs
e98ca4af20 fix item, setup 2018-09-19 17:52:21 -07:00
zotlabs
0bc76e85e4 Merge branch 'zap' into dev 2018-09-19 16:26:36 -07:00
zotlabs
fd0de5fc12 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 16:26:05 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -07:00
zotlabs
f2d3fd0f1a Merge branch 'zap' into dev 2018-09-17 22:53:51 -07:00
zotlabs
f6c5e9e610 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 22:53:38 -07:00
zotlabs
f2c99480f0 generate better photo and event activities 2018-09-17 22:51:27 -07:00
zotlabs
f0b6952585 generate full actor record on follow json 2018-09-17 22:50:06 -07:00
zotlabs
dfdf11d461 Merge branch 'dev' 2018-09-17 19:38:40 -07:00
zotlabs
fdc89d1b89 pdo install check requires namespacing 2018-09-17 13:03:17 -07:00
zotlabs
390a570b51 Merge branch 'zap' into dev 2018-09-17 13:00:40 -07:00
zotlabs
926c63ee84 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 13:00:02 -07:00
zotlabs
01d38494d9 fix install check 2018-09-17 12:58:05 -07:00
Mario Vavti
a9853e6033 seperate settings for mod network 2018-09-17 11:36:11 +02:00
Mario Vavti
dcacfc1124 Merge remote-tracking branch 'mike/master' into dev 2018-09-17 10:31:13 +02:00
Mario Vavti
2f6cb764a4 prepare submodule to interact with route 2018-09-17 10:30:47 +02:00
zotlabs
f0266b4837 Merge branch 'zap' into dev 2018-09-16 21:43:20 -07:00
zotlabs
8d565a8305 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 21:43:06 -07:00
zotlabs
0aaaa882ad simplify activitypub discovery 2018-09-16 21:41:24 -07:00
zotlabs
c3a74b3ece setup and channel sync fixes from upstream 2018-09-16 20:01:53 -07:00
zotlabs
593a5072d9 Some improvements to setup checks: image library and pdo support 2018-09-16 20:00:20 -07:00
zotlabs
a8f4091551 Merge branch 'zap' into dev 2018-09-16 18:42:07 -07:00
zotlabs
ee8cdafd92 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 18:41:56 -07:00
zotlabs
29f4230474 resolve naming dispute over network app 2018-09-16 18:35:43 -07:00
Mario Vavti
07cd1d1272 appification of the lang module 2018-09-16 09:30:07 +02:00
Mario Vavti
791ff25d52 appify poke 2018-09-15 11:09:16 +02:00
Mario Vavti
299eb469f8 appify mood 2018-09-15 11:00:41 +02:00
Mario Vavti
0f9a8a43e4 appify invite 2018-09-15 10:48:51 +02:00
Mario Vavti
7856f5882b appify cdav stuff. WARNING: if you use caldav or carddav from a client or the webinterface you will need to enable those apps to make things work again 2018-09-15 10:10:43 +02:00
zotlabs
3bd1df52bf Merge branch 'zap' into dev 2018-09-14 02:19:23 -07:00
zotlabs
097a0e5adc Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-14 02:19:05 -07:00
zotlabs
8505ae4ab2 zot6 import authors in hyperdrive mode 2018-09-14 02:18:07 -07:00
zotlabs
c16fa755a8 Merge branch 'zap' into dev 2018-09-13 22:40:23 -07:00
zotlabs
4b7770f28c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 22:40:11 -07:00
zotlabs
048c5f65e2 old protocol string still showing 2018-09-13 22:39:05 -07:00
zotlabs
5cee677014 Merge branch 'zap' into dev 2018-09-13 18:23:00 -07:00
zotlabs
71cc526f7d Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 18:22:43 -07:00
zotlabs
abeb19416e chanview not redirecting properly for z6 2018-09-13 18:19:54 -07:00
Mario Vavti
869534fafa remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets 2018-09-13 11:53:59 +02:00
Mario Vavti
56f88f2e30 move chat from feature to apps 2018-09-13 11:32:43 +02:00
Mario Vavti
a1d5ce3716 remove profile_tabs() which has been deprecated and replaced by channel_apps() 2018-09-13 10:59:37 +02:00
Mario Vavti
2651eae663 mpre feature to app transition 2018-09-12 11:08:53 +02:00
zotlabs
fda9a36505 Merge branch 'zap' into dev 2018-09-11 17:41:22 -07:00
zotlabs
eb3a5349db Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 17:37:54 -07:00
zotlabs
67ae00ae2f it's alive 2018-09-11 03:36:31 -07:00
Mario Vavti
28e4977c33 include item.title in /network and /channel search 2018-09-11 11:16:58 +02:00
zotlabs
04a5ebf8c0 Merge branch 'zap' into dev 2018-09-10 18:39:15 -07:00
zotlabs
e45583c794 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-10 18:37:51 -07:00
zotlabs
f2e8d9f032 more hyperdrive 2018-09-10 18:36:52 -07:00
Mario Vavti
c6abe87ec2 move cards from features to apps 2018-09-10 13:34:05 +02:00
zotlabs
c960c91a8d wrong mimetype 2018-09-09 23:29:14 -07:00
zotlabs
44df4d785e Merge branch 'zap' into dev 2018-09-09 23:23:42 -07:00
zotlabs
ddb50b8de4 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-09 23:17:23 -07:00
zotlabs
abfb17ef33 hyperdrive work 2018-09-09 20:55:51 -07:00
Mario Vavti
9607bb29fd missing text 2018-09-07 14:58:16 +02:00
Mario Vavti
d29415a6e2 provide a noscript_content switch for mod channel and display 2018-09-07 14:23:16 +02:00
Mario Vavti
bb42ec2bfc apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps 2018-09-07 10:39:15 +02:00
zotlabs
5079b44d08 undeclared var 2018-09-06 22:52:48 -07:00
zotlabs
6f2284ba18 missing observer 2018-09-06 21:51:52 -07:00
zotlabs
667f8ed920 delivery optimisations 2018-09-06 21:24:56 -07:00
zotlabs
4005c484c1 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-06 17:42:01 -07:00
zotlabs
b38625aef6 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev 2018-09-05 21:23:49 -07:00
zotlabs
44ca674937 Merge branch 'red' into dev 2018-09-05 21:18:14 -07:00
M.Dent
9446e0348e Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others. 2018-09-04 08:14:52 -04:00
zotlabs
fb068ac9f7 more tweaks 2018-09-03 21:30:39 -07:00
zotlabs
6ef4abacb1 more fine tuning 2018-09-03 18:22:31 -07:00
Mario Vavti
41ccb61c2e Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances."
This reverts commit e2824f9259.

Reverting because it breaks forum mentions.
2018-09-03 18:14:17 +02:00
zotlabs
10ac556bb4 Merge branch 'zap' 2018-09-02 22:59:59 -07:00
zotlabs
edb22f9244 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-02 22:59:36 -07:00
zotlabs
3a6df2b12f sync likes and shares 2018-09-02 22:58:30 -07:00
zotlabs
143241a45e Merge branch 'zap' 2018-09-02 20:17:52 -07:00
zotlabs
fb9e4adba1 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-02 20:17:02 -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
Mario
1b7781a159 Merge branch 'add-delivery-status-info' into 'dev'
Fix: Authors unable to comment on posts they authored when under owned by others…

See merge request hubzilla/core!1268
2018-09-02 09:17:29 +02:00
zotlabs
8e7fb44896 local compatibility fixes 2018-09-01 15:52:28 -07:00
Mario Vavti
d66f58a550 fix undefined constant warning 2018-09-01 21:09:04 +02:00
M.Dent
e2824f9259 Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances. 2018-09-01 13:45:05 -04:00
Mario Vavti
4376f8f030 do not count sys channel in totals 2018-09-01 13:43:32 +02:00
zotlabs
9282a6a40b Merge branch 'zap' 2018-08-30 21:30:46 -07:00
zotlabs
fc6f5fc320 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-30 21:29:21 -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
ed5146f584 typo 2018-08-29 02:28:13 -07:00
zotlabs
969a68ac36 connect perms 2018-08-29 02:20:43 -07:00
zotlabs
ed4aa90338 connect perms 2018-08-29 02:19:32 -07:00
zotlabs
37f97fc986 mod_nullbox - which we will require for federation outside ActivityPub 2018-08-28 23:36:27 -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
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
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
Mario Vavti
53efd4e470 unread forum notifications - wip/unfinished 2018-06-01 23:22:52 +02: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
Mario Vavti
b438ffead4 Merge remote-tracking branch 'mike/master' into dev 2018-05-31 13:06:33 +02:00
Mario Vavti
cbaaa1c57f merge groups and filed posts into activity filters 2018-05-31 13:05:32 +02:00
zotlabs
6dcad87ae8 make refresh packet work 2018-05-30 20:32:59 -07:00
zotlabs
fc31ecdab0 autocomplete private mail addresses based on substring in either the name or webbie (prevously required an '@' to trigger a webbie search) 2018-05-30 17:30:17 -07:00
Mario Vavti
6bfc5aa96c strpos does not work with arrays :( 2018-05-30 23:15:43 +02:00
Mario Vavti
5505f5fa02 restrict the network/channel navbar search to content and hashtags 2018-05-30 22:55:28 +02:00
Mario Vavti
6349a7417f make navbar search use the module search function in /network and /channel 2018-05-30 22:40:22 +02:00
Mario Vavti
881406f82b remove redundant reference for order 2018-05-30 14:54:39 +02:00
Mario Vavti
9fcb3bf2e8 first cut on restructuring the previously called network tabs 2018-05-30 14:02:58 +02:00
zotlabs
111bb93462 basic communication 2018-05-29 21:08:52 -07:00
zotlabs
7d088c8d56 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-29 17:51:36 -07:00
zotlabs
ed3d3b6f27 provide possibility of using different orderings (post, commented) on channel page 2018-05-29 17:35:44 -07:00
git-marijus
bca3113fba
Merge pull request #1202 from aninf-wo/dev
include photos.php
2018-05-29 08:41:31 +02:00
zotlabs
b88a683127 zot communications 2018-05-28 19:42:40 -07:00
zotlabs
ddebbcc0a0 hubzilla issue #1200 2018-05-27 17:46:25 -07:00
Herbert Thielen
4f3be92a0d include photos.php
required for photo_calculate_scale()
2018-05-27 17:57:35 +02:00
zotlabs
3e184ef403 z6 permissions work 2018-05-26 15:12:02 -07: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
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
76d8e59e9b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-21 21:15:24 -07:00
zotlabs
1061027071 new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick 2018-05-21 20:17:17 -07:00
zotlabs
a403611ac9 update response types 2018-05-21 19:34:03 -07:00
zotlabs
2b3f931c85 oauth2 discovery per draft-ietf-oauth-discovery-10 2018-05-21 19:25:03 -07:00
Mario Vavti
a8274bbfb3 missing permission description 2018-05-21 09:25:57 +02:00
Mario Vavti
7dadbbbac7 bring jot reset to some more places 2018-05-21 09:13:14 +02:00
zotlabs
21230fb39a Merge branch 'master' into zapp 2018-05-20 20:44:20 -07:00
zotlabs
a9e81abcf9 more z6 work 2018-05-20 20:42:31 -07:00
Mario
469809183d update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180 2018-05-20 22:42:47 +02:00
Mario Vavti
9e1af2492f more local_channel() is not string 2018-05-20 14:15:46 +02:00
Mario Vavti
4eb40528a9 local_channel() is not string 2018-05-20 14:07:30 +02:00
Mario Vavti
7e99931733 implement jot reset button 2018-05-20 09:23:44 +02:00
Mario Vavti
6abbadf6c8 Merge remote-tracking branch 'mike/master' into dev 2018-05-19 10:20:14 +02:00
zotlabs
8b4af7cf0b hubzilla issue #1086, pending count on admin summary page 2018-05-19 00:54:47 -07:00
Mario Vavti
1ca6ef0f60 Merge remote-tracking branch 'mike/master' into dev 2018-05-19 08:45:41 +02:00
zotlabs
dae89ce91c wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes) 2018-05-18 16:57:45 -07:00
Mario Vavti
7f7e049397 an attempt to fix the new_channel validation situation 2018-05-18 21:30:07 +02:00
zotlabs
060cb1749d update boot 2018-05-18 03:50:04 -07:00
zotlabs
b1629db876 checkin lots of recent zap/zot6 work 2018-05-18 03:09:38 -07:00
zotlabs
e55eb26544 Merge branch 'master' into zapp 2018-05-17 19:33:58 -07:00
Mario Vavti
12c571a187 missing include 2018-05-16 10:47:18 +02:00
zotlabs
aac5fd96cc provide function to fetch photo contents from url 2018-05-15 16:51:04 -07:00
Mario Vavti
de63e40a70 we must now provide the full path to the profile image for the cavatar plugin to work 2018-05-15 10:20:20 +02:00
zotlabs
062dea8e13 code whitespace and formatting 2018-05-14 22:10:21 -07:00
zotlabs
c8fc3ad7cd refactor the 'where does the register link point?' logic 2018-05-14 19:19:25 -07:00
zotlabs
229d82c4c7 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-14 17:23:19 -07:00
zotlabs
d9759ba63c more refactor tags/mentions 2018-05-14 17:20:25 -07:00
Mario Vavti
4f69bcfc38 streamline appearence of guest tokens individual perms with those in connedit 2018-05-13 14:29:09 +02:00
zotlabs
7991db14be hubzilla issue #1045 - display pubsites link in info area if invite only 2018-05-12 16:41:09 -07:00
zotlabs
5dae0ef4f9 add cancel button to editor, fix issue with autosave of categories 2018-05-10 20:54:48 -07:00
zotlabs
ef6e067a45 add top level posts containing the cid's url to the cid search in mod_network. We could alternatively search for mention tags here for a bit more precision but the sql could get pretty hairy with all the joins going on. 2018-05-10 18:42:58 -07:00
zotlabs
721496f922 hubzilla issue #1169 2018-05-10 17:11:03 -07:00
zotlabs
d41556a1ea minor regression on date queries from channel page 2018-05-09 18:20:28 -07:00
zotlabs
0545baaf56 initial backend support for channel page item search 2018-05-08 20:12:49 -07:00
zotlabs
fbd26e8d9d changes made during testing imagick scaling for cover photo thumbnail 2018-05-08 16:50:16 -07:00
zotlabs
3c8de7b59d use imagemagick first stage thumbnail for cover photos, if configured 2018-05-07 23:57:17 -07:00
zotlabs
0c43a9bb5d yet another postgres/"group by" issue 2018-05-07 19:33:58 -07:00
zotlabs
eb85d381fd Add supported protocols to siteinfo (not siteinfo.json) 2018-05-07 18:46:42 -07:00
zotlabs
aab16123b5 Simplify first channel creation even further by using a site-configurable default permissions role and removing one more conceptual roadblock for first time registrants. This default role only applies to the first channel an account creates and can be changed from the settings page once they've started to explore. This functionality was always present but optional and not well exposed. Now it is part of the standard workflow and exposed in the admin settings. 2018-05-07 17:31:53 -07:00
zotlabs
e646684493 pdf embeds 2018-05-06 19:57:37 -07:00
zotlabs
83c18f4d4a Back in the day there were good reasons for showing a permission denied photo instead of a null img. It distinguished a 403 from a 404 in an unmistakable way. What we've discovered is that nothing that is gained from this knowledge and it mostly just annoys and confuses people who can't really do anything about it except to express their annoyance/confusion. So just do a 403/404 instead. 2018-05-06 16:12:06 -07:00
Mario Vavti
0895756658 Merge remote-tracking branch 'mike/master' into dev 2018-05-05 10:03:57 +02:00
zotlabs
c6e65ec6da support '@' paths 2018-05-05 00:39:53 -07:00
Mario Vavti
97cb108937 missing permission description 2018-05-04 22:03:51 +02:00
zotlabs
b52e9731e3 tagging changes: + (old style forum mentions), and underscore space replacement are no longer supported. 2018-05-03 20:14:58 -07:00
zotlabs
459ec78a5e provide easy access to the autoperms setting for forum and repository channels. This may be needed in the future to protect an existing forum from assault by spammers with changing identities. The forum can quickly be turned into membership by approval and either left that way permanently or hopefully reversed at a later date. Previously this would require switching to expert mode or setting a pconfig manually. 2018-05-02 22:59:21 -07:00
zotlabs
6bf5eea646 make the cloud logging a bit less verbose until we actually need it. 2018-05-02 22:05:55 -07:00
zotlabs
e9f49d9d9c admin delete of files 2018-05-02 20:08:59 -07:00
zotlabs
9713436f49 backend work to allow admin to delete photos. Still requires frontend work to give admin access to either the photos and/or the delete link. 2018-05-02 18:23:42 -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
91688f7296 Merge branch 'master' into zapp 2018-05-01 21:57:10 -07:00
zotlabs
7a55ead97d new feature (post 3.4): allow a different username to be used when importing. 2018-05-01 20:29:07 -07:00
zotlabs
cd200ee706 The channel import page seems to have missed the big theme cleanup of the last couple of years. 2018-05-01 19:38:32 -07:00
zotlabs
db930b794d provide warnings about profile photo and cover photo permissions 2018-05-01 16:54:54 -07:00
zotlabs
08bcd29eee hubzilla issue #1149, don't duplicate addressbook entries on repeated channel imports 2018-05-01 16:15:59 -07:00
zotlabs
32423a7706 parent folder permissions weren't being checked back to the cloud root directory in all cases 2018-04-30 22:30:59 -07:00
zotlabs
cb48e6d6be remove deprecated services 2018-04-28 14:00:03 -07:00
zotlabs
e26bfd76da Merge branch 'master' into zapp 2018-04-28 13:55:03 -07:00
zotlabs
f32ba06564 work through a few more autocomplete minor nits 2018-04-26 02:42:48 -07:00
zotlabs
4a60f45220 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-04-25 23:11:23 -07:00
zotlabs
fe724acc3b mod_network: privacy group query returning results when group is empty. Notification that the group is empty was also displayed twice. 2018-04-25 22:53:20 -07:00
zotlabs
5f8b093d79 fine tuning 2018-04-25 18:51:30 -07:00
zotlabs
f923d21df3 some tagging work 2018-04-25 18:41:19 -07:00
Mario Vavti
ed785fbb1b Merge remote-tracking branch 'mike/master' into dev 2018-04-25 09:57:28 +02:00
zotlabs
8face5a66c make tag autocomplete less scary looking in the editor. If this works out we can simplify and get rid of a huge amount of spaghetti tag logic. 2018-04-24 15:32:24 -07:00
Mario Vavti
2ea87b65ca fix php warnings 2018-04-24 15:41:35 +02:00
zotlabs
bd079166d7 Merge branch 'master' into zapp 2018-04-23 18:22:44 -07:00
zotlabs
59ac3d04eb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-04-23 18:15:18 -07:00
zotlabs
97308ad2fb provide a short term compatibility mapping between social_party and social_federation 2018-04-23 16:05:55 -07:00
Mario Vavti
2dff10564c possible fix for issue #1101 2018-04-23 21:13:09 +02:00
zotlabs
2e43a93e93 more z6 basics 2018-04-22 23:48:49 -07:00
zotlabs
b1690a93d2 site discovery 2018-04-22 21:30:14 -07:00
zotlabs
b794be3902 Merge branch 'master' into denim 2018-04-22 19:51:08 -07:00
zotlabs
5eff476469 verify the sig 2018-04-22 19:49:26 -07:00
zotlabs
11624cd83e owa: attempt channel discovery if not found 2018-04-22 19:24:15 -07:00
zotlabs
a4146de34a Merge branch 'master' into denim 2018-04-22 18:53:05 -07:00
zotlabs
83856293a0 z6 work 2018-04-22 18:51:46 -07:00
zotlabs
55b7182136 use consistent naming for 'Channel role and privacy' 2018-04-22 18:48:48 -07:00
zotlabs
55dc6fbc1c imagemagick preserves exif when scaling. GD does not. We do not want to preserve exif on thumbnails which we have rotated, as a browser reading the exif information could rotate them yet again. This checkin adds an abstract function to the generic photo driver which makes the behaviour consistent by stripping EXIF from imagick processed images. However, we will attempt to preserve any ICC colour profiles. See http://php.net/manual/en/imagick.stripimage.php 2018-04-22 18:12:16 -07:00
zotlabs
9ecb2d68d6 prepare webfinger for z6 2018-04-22 16:54:13 -07:00
zotlabs
b1ed79f239 fix link to renamed permission roles doc subsection 2018-04-19 19:32:48 -07:00
zotlabs
aea61bf034 rename social - party to social - federation. Cleanup some of the documentation surrounding channels. This checkin contains translatable string changes. 2018-04-19 19:05:13 -07:00
Mario Vavti
92b08f1f07 Merge remote-tracking branch 'mike/master' into dev 2018-04-19 08:28:42 +02:00
zotlabs
c53f788cc8 add alt_pager to mod_moderate, remove legacy $a parameter from all occurrences of alt_pager 2018-04-17 23:36:35 -07:00
Mario Vavti
440ccf19d1 Merge remote-tracking branch 'mike/master' into dev 2018-04-18 08:19:56 +02:00
zotlabs
393cd46a82 public stream tag enhancements 2018-04-17 20:08:14 -07:00
zotlabs
0576046d02 when changing cover photo, show existing 2018-04-17 16:29:32 -07:00
Mario Vavti
dcd636f7be fix closing parenthesis in wrong spot 2018-04-17 18:56:33 +02:00
zotlabs
120e578a67 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-04-16 20:28:22 -07:00
zotlabs
411b8e48a3 don't save a permcat with empty name 2018-04-16 18:09:14 -07:00
Mario Vavti
bef5be827d remove some more distinct in queries and observe any regressions. this is related to issue #1079 and commit d47ea20aa8 2018-04-16 11:42:13 +02:00
Mario Vavti
a422063c7d fix regression where in the starred tab only top level posts were visible 2018-04-15 10:15:49 +02:00
zotlabs
953a2fd9b2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-04-11 17:44:51 -07:00
zotlabs
2fa9645dfc channel delegation: push current identity and pop it on logout from the delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel. 2018-04-11 17:40:04 -07:00
Mario Vavti
fee258edbe allow to toggle visibility of likes/dislikes in notifications 2018-04-11 11:49:33 +02:00
zotlabs
887a59066b last commented expiration setting in admin 2018-04-10 00:05:20 -07:00
Julian Schweinsberg
c50105b8c1 Show "Unseen public activity" channel setting when site only public streams are activated 2018-04-09 19:26:35 +02:00
zotlabs
cda3d23508 more intelligent handling of level 0 - and remove an extraneous logging function 2018-04-08 22:09:08 -07:00
zotlabs
e4ee165e29 more work merging techlevels and features 2018-04-08 22:02:48 -07:00
zotlabs
e0255c0dc4 first cut of feature/techlevel merge 2018-04-08 20:05:30 -07:00
zotlabs
c3cd613f42 extend AC 2018-04-08 17:30:46 -07:00
zotlabs
f2078b25ad hubzilla issue #1050 pubstream notifications visible when pubstream is not 2018-04-08 16:51:29 -07:00
Mario Vavti
7205ffb5c0 Merge remote-tracking branch 'mike/master' into dev 2018-04-08 11:38:31 +02:00
zotlabs
d47ea20aa8 we shouldn't need distinct here, since ids_to_querystr() will filter duplicates. It might have an effect on pager totals. Need to monitor for a few days. 2018-04-07 16:54:49 -07:00
Mario Vavti
9369150db7 rename button label in editpost from edit to submit 2018-04-07 14:15:07 +02:00
Mario Vavti
0fd7634339 rename relation to relationship - issue #1044 2018-04-07 13:50:41 +02:00
Mario Vavti
969a91c432 use Title instead of Caption - issue #1037 2018-04-07 13:36:34 +02:00
Mario Vavti
4d08fcf1a7 Use Add Files/Photos instead of Upload to open the upload dialog 2018-04-07 13:29:36 +02:00
zotlabs
b17f741050 bring back the dnt policy document, not sure when it was lost 2018-04-05 22:15:15 -07:00
zotlabs
4a45c35c4e oauth2 client settings page 2018-04-05 21:01:36 -07:00
zotlabs
b7386a0e88 fix permalinks to children of articles and cards 2018-04-05 16:58:37 -07:00
zotlabs
e864679942 private forum mentions 2018-04-04 18:53:06 -07:00
zotlabs
1a25b0bda7 allow the profile recrods to be cloned separately 2018-04-04 17:54:43 -07:00
zotlabs
8871f8d0f4 disable the oauth2testvehicle completely until it is safe 2018-04-03 21:58:11 -07:00
zotlabs
29b377d4c5 get rid of dangerous test code 2018-04-03 21:13:26 -07:00
zotlabs
4915a4efbb OAuth2 integration 2018-04-03 21:08:40 -07:00
zotlabs
245142cc07 Merge branch 'master' into oauth2 2018-04-03 19:57:35 -07:00
zotlabs
cf6d51bee8 some more work on hubzilla issue #1019 2018-04-02 22:47:11 -07:00
zotlabs
bcffb6cf55 obscurify chats 2018-04-01 16:53:10 -07:00