Commit graph

1532 commits

Author SHA1 Message Date
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
zotlabs
3bd3686acf Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 2018-03-31 14:00:09 -07:00
Andrew Manning
6decffb00c Merge branch 'dev' into oauth2 2018-03-31 13:41:29 -04:00
zotlabs
e155e7d9ce undo vcard on display module until we can make it accurate 2018-03-31 01:43:33 -07:00
zotlabs
1e086a4ac8 Hubzilla issue #1022 cleanup of post formatting 2018-03-30 17:13:21 -07:00
zotlabs
1c3e669761 Hubzilla issue #1022 - improve the usability 2018-03-30 16:47:47 -07:00
zotlabs
af125fbe4f Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is only implemented in the 'edit' pane and could use some improvement/enhancement 2018-03-30 16:09:25 -07:00
zotlabs
43249bd4be hubzilla issue #1020 - PM using unicode domain for recipient. May require further testing 2018-03-30 15:18:33 -07:00
zotlabs
f54aa4f21e allow case independence of replacements as well as patterns 2018-03-30 01:59:32 -07:00
zotlabs
6d0e1b0e07 display and link issues with quoted tags 2018-03-29 17:06:23 -07:00
zotlabs
998f39868f directory: link entry keywords to a directory keyword search 2018-03-29 14:27:26 -07:00
zotlabs
33bb89729c hubzilla issue #1019 - punycode urls on connedit page when displaying locations 2018-03-29 02:26:25 -07:00
zotlabs
14383a4c4a uexport: set content-type to json and add sections info to the default filename if present 2018-03-27 18:43:59 -07:00
Andrew Manning
1dc795722a Merge branch 'dev' into oauth2 2018-03-27 21:11:34 -04:00
zotlabs
08274ffab7 put vcard widget with author of top-level post on display page 2018-03-27 18:01:20 -07:00
zotlabs
5ea11d1222 don't include the q and PHPSESSID request variables in a redirected rpost 2018-03-27 16:27:28 -07:00
zotlabs
d4e91d5d9b app sellpage not being stored 2018-03-24 15:13:19 -07:00
zotlabs
558e3f8042 code optimisations and de-duplication on updating parent commented timestamp 2018-03-24 02:22:24 -07:00
Mario Vavti
376091010f Merge remote-tracking branch 'mike/master' into dev 2018-03-23 10:03:54 +01:00
zotlabs
05e11844e5 make list mode work in cards and articles 2018-03-22 17:17:00 -07:00
zotlabs
4ba91cf4e3 make alt_pager work for articles/cards 2018-03-22 16:34:27 -07:00
zotlabs
9a52b90f22 hubzilla issue #1013 - comments not displayed in single card/article view 2018-03-22 15:38:00 -07:00
Mario Vavti
8ea8700eef prevent reload loop if somebody lands on /ochannel (without channel_address and without trailing slash) 2018-03-22 13:55:23 +01:00
zotlabs
1f128e84fb Hubzilla issue #1006, fix anonymous comments bump thread before being approved. 2018-03-21 22:52:24 -07:00
zotlabs
1514b0f4e5 initial support for alternative sort orders on the cloud pages. Can be triggered manually but further development is required. 2018-03-21 21:19:18 -07:00
zotlabs
dc066d4c9b Add Ochannel module for testing OStatus bad behaviour 2018-03-21 15:44:56 -07:00
Mario Vavti
0009f7f051 do not include pending registrations in accounts and goaway to /admin/accounts after approval or denial of an pending registration 2018-03-17 21:52:56 +01:00
zotlabs
91b710b07d add auth flag to share attributes so we can make a costly determination to use zid at post submission time instead of making multiple calls to is_matrix_url() at render time 2018-03-15 17:51:24 -07:00
zotlabs
7b56fdebac more work with unicode usernames 2018-03-14 18:42:07 -07:00
Mario Vavti
461e86423a Merge remote-tracking branch 'mike/master' into dev 2018-03-14 11:37:24 +01:00