Commit graph

8119 commits

Author SHA1 Message Date
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
zotlabs
7018da3f12 code cleanup 2018-08-23 22:44:22 -07:00
zotlabs
a66c43166a first_post_date() (used by archive widget) - trigger the query options off of the active module rather than rely on passed parameters 2018-08-23 21:01:28 -07:00
zotlabs
301d79b4e2 For Osada, move activitypub into core. 2018-08-22 23:04:37 -07:00
zotlabs
37339829b4 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-22 20:23:58 -07:00
zotlabs
9fef13d6e6 use the linked item id for the photo object id instead of the photo uri. Otherwise we won't find it in the item table if we get that object as a replyTo. 2018-08-22 20:21:42 -07:00
zotlabs
4fc688cfea Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-22 17:54:24 -07:00
zotlabs
d55e5bbe75 typos and photo fixes 2018-08-22 17:52:22 -07:00
zotlabs
70f23fe9b2 Merge branch 'zap' 2018-08-22 16:43:42 -07:00
zotlabs
6ecd31a715 tweak archive widget for articles 2018-08-22 13:30:16 -07:00
zotlabs
decd86fc08 fix profile like images and remove export button 2018-08-21 23:42:51 -07:00
zotlabs
0eeaf8713f add api_not_found hook 2018-08-21 23:13:54 -07:00
zotlabs
42c4a0da51 Zot/Finger: ignore deleted hublocs 2018-08-21 21:38:10 -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
066febdf40 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-08-20 20:20:57 -07:00
zotlabs
791bc9d805 Merge branch 'zap' 2018-08-19 20:42:26 -07:00
zotlabs
c4328b9090 osada updates 2018-08-19 20:39:23 -07:00
zotlabs
df26fec1b3 hubzilla core issue #1262 2018-08-17 21:21:02 -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
Mario Vavti
e25db4d1b5 Merge remote-tracking branch 'mike/master' into dev 2018-08-16 08:50:52 +02:00
zotlabs
64196dd2a7 article summaries and some other stuff 2018-08-15 18:56:18 -07:00
zotlabs
f230c07ba5 possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar 2018-08-15 17:00:37 -07:00
Mario Vavti
2becc3273a Merge remote-tracking branch 'mike/master' into dev 2018-08-15 13:21:12 +02:00
zotlabs
f4f610f1a3 more backporting for zot6 2018-08-14 18:19:34 -07:00
Mario Vavti
10c5b46e3b Merge remote-tracking branch 'mike/master' into dev 2018-08-14 13:04:37 +02:00
M. Dent
94393d27c8 Override helpfiles 2018-08-14 13:03:26 +02:00
zotlabs
12f4787b67 issue with mdpost addon and archive.org links which contain a full url as a path/query component 2018-08-13 23:11:10 -07:00
zotlabs
f15c1c4e54 hubloc DB changes needed for z6 2018-08-13 21:18:20 -07:00
zotlabs
248d20c347 Merge branch 'red' 2018-08-13 20:36:40 -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
b78c9a2251 Merge branch 'add-template-overrides' into 'dev'
Add template overrides

See merge request hubzilla/core!1256
2018-08-13 14:06:36 +02:00
M.Dent
b436c4a94c Add support for overriding the default template location and individual templates via .htconfig.php 2018-08-12 19:47:10 -04:00
zotlabs
db1a546aba add table support to markdown 2018-08-12 16:25:14 -07:00
zotlabs
2d29095348 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-08-12 15:10:19 -07:00
zotlabs
ac03b4ccd7 make channel_remove less memory hungry 2018-08-12 15:09:02 -07:00
Mario Vavti
759a18685b Merge remote-tracking branch 'mike/master' into dev 2018-08-12 14:07:16 +02:00
zotlabs
5afe779ffc prevent json-ld bombing, turn off browser autocomplete on channel sources creation 2018-08-11 16:16:54 -07:00
Mario Vavti
7890157f52 revert debug comment from the last commit 2018-08-09 23:07:50 +02:00
Mario Vavti
b3d1ea4cd5 fix zid leaking to nonzot sites if markdown is enabled 2018-08-09 17:03:20 +02:00
Mario Vavti
054c5da294 search form action for channel search needs the channel address 2018-08-09 15:47:57 +02:00
zotlabs
3c74e0a649 change import compatibility 2018-08-05 22:47:41 -07:00
zotlabs
c9e5ff4eb4 set osada specific permissionroles and features 2018-08-05 18:40:36 -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
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
Mario Vavti
569cd6c57c Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-31 14:39:51 +02:00
zotlabs
a9c3af298b prep work for converting mail 2018-07-30 23:55:09 -07:00
zotlabs
a87d5aa730 Merge branch 'red' into red_merge 2018-07-30 18:22:25 -07:00
zotlabs
0cfaf34a22 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-30 18:11:49 -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
gia vec
149071bf0c Update network.php
(cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
2018-07-30 09:48:24 +02:00
zotlabs
32614e4074 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-29 18:00:56 -07:00
zotlabs
9dc5a3bfc9 this may conflict 2018-07-29 17:59:40 -07:00
zotlabs
f7e9cd5a8f SECURITY: sanitise vcard fields 2018-07-29 17:36:05 -07:00
zotlabs
5ec73e6862 Revert "Merge branch 'red'"
This reverts commit 159f24afe3, reversing
changes made to dd899418c1.
2018-07-29 17:17:33 -07:00
zotlabs
159f24afe3 Merge branch 'red' 2018-07-29 16:48:14 -07:00
Mario Vavti
45d262d6c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-29 06:59:10 +02:00
zotlabs
2367d94a42 SECURITY: sanitise vcard fields 2018-07-28 15:33:20 -07:00
zotlabs
dd899418c1 app fixes
Merge branch 'red'
2018-07-27 15:31:19 -07:00
Max Kostikov
05b3237bae Update nav.php 2018-07-27 11:50:04 +02:00
zotlabs
07d0921aef fixes to clone import 2018-07-26 19:37:04 -07:00
Mario Vavti
ec3a066e4e fix sql error 2018-07-26 09:32:52 +02:00
zotlabs
cbeeeae243 logging 2018-07-22 23:23:02 -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
cf03855f65 more import work 2018-07-22 22:18:58 -07:00
zotlabs
c6fc88b300 item lookups 2018-07-22 22:17:07 -07:00
zotlabs
b7ff2f5585 more libzot 2018-07-22 22:10:51 -07:00
zotlabs
647e92d6f7 use libzot 2018-07-22 22:04:20 -07:00
zotlabs
bd8a6d6195 updates 2018-07-19 22:15:50 -07:00
zotlabs
ad020db7d8 minor tweaks 2018-07-19 20:44:34 -07:00
zotlabs
07e526693e update the zot api (xchan store), plus a couple of typos 2018-07-19 17:14:37 -07:00
zotlabs
5d94cfba4a Merge branch 'red' 2018-07-19 13:48:32 -07:00
zotlabs
13d19d42cb Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-18 19:14:21 -07:00
zotlabs
f8ed09b3fa Merge branch 'red' 2018-07-18 18:55:28 -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
Mario Vavti
eb322e8312 set the correct album name when moving photos 2018-07-18 13:18:37 +02:00
zotlabs
91ac38f18e more content formatting and feature trimming 2018-07-17 21:56:51 -07:00
zotlabs
762acc9565 typo 2018-07-17 17:30:00 -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
3407c73bdf update event item[obj] 2018-07-16 21:50:07 -07:00
zotlabs
731e9b9dad update site import 2018-07-16 20:04:47 -07:00
zotlabs
564aa2f134 pass render options to code highlight 2018-07-16 18:12:03 -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
cf88cbb46f add summary field to item table 2018-07-15 18:31:39 -07:00
zotlabs
b3b6b813f2 upstream/downstream comment work 2018-07-11 18:02:25 -07:00
zotlabs
38bccecc04 fix to cart behaviour 2018-07-11 18:00:47 -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
fe44ebee93 change to import system apps at most once a day per person 2018-07-05 21:55:03 -07:00
zotlabs
f7db9dcec5 more app work 2018-07-05 17:52:32 -07:00
zotlabs
51a2e64a89 issue syncing pageflags 2018-07-04 19:51:16 -07:00
zotlabs
cf4a12b173 Merge branch 'dev' 2018-07-04 19:18:05 -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
29fe662b3c don't allow angle chars in group hashes 2018-07-02 23:18:27 -07:00
zotlabs
6bf88f10d2 move queue functions to Zotlabs/Lib 2018-07-02 22:43:41 -07:00
zotlabs
d753492382 bad merge 2018-07-01 22:48:05 -07:00
zotlabs
40ab482ada various fixes 2018-07-01 21:07:35 -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
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
1b1d9e502c Merge branch 'red' 2018-06-25 21:02:44 -07:00
zotlabs
66fc12c928 crc32 is potentially reversible 2018-06-25 13:33:23 -07:00
zotlabs
f66fb8e2a8 SECURITY: logging: hash the session_id in case somebody posts log snippets from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events 2018-06-25 13:20:12 -07:00
zotlabs
4866ed5283 remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead 2018-06-24 21:56:58 -07:00
zotlabs
8222b02495 more zot6 heavy lifting 2018-06-24 18:54:29 -07:00
zotlabs
86e93664d0 remote_self wasn't working correctly 2018-06-24 16:56:23 -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
6cf040d3ee whitespace 2018-06-18 21:11:39 -07:00
zotlabs
f801f52274 provide flag to collect_recipients to exclude privacy groups (for federation plugin use) 2018-06-18 17:07:20 -07:00
zotlabs
7850ecbd95 remove several unused/unreferenced templates 2018-06-17 20:53:05 -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
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
eedfb7de32 slightly more memory efficient way to drop posts of removed connections 2018-06-15 16:28:36 -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
a8f179145b Merge branch 'master' of ../hz into dev 2018-06-10 22:16:39 -07:00
zotlabs
912ccb31a1 hubzilla core issue #1218 2018-06-10 19:26:35 -07:00
zotlabs
6959c9e423 fixes for immediate expire, channel_active not initialised in DB 2018-06-10 15:27:55 -07:00
Mario Vavti
468af29e3e new feature filter network by name 2018-06-08 23:03:05 +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
4846ae5326 split off libsync from libzot 2018-06-04 18:40:11 -07:00
zotlabs
9232351cb2 Merge branch 'master' into zapp 2018-06-04 17:47:34 -07:00
zotlabs
e1b85a361c photos not syncing properly if destination is a postgres site 2018-06-04 16:36:13 -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
89f16c81dd fix conflict 2018-06-03 17:59:41 -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
a42ff1e6d4 missing $perm_sql 2018-06-03 13:27:06 +02:00
Mario Vavti
a32626e489 add the archived flag 2018-06-02 22:42:20 +02:00
Mario Vavti
3a9f149c80 Merge remote-tracking branch 'mike/master' into dev 2018-06-02 22:39:36 +02:00
Mario Vavti
a0e4f7ddb1 respect the privacy group feature setting in nav 2018-06-02 22:26:08 +02:00
Mario Vavti
8189408190 finalize filters and forum notifications 2018-06-02 22:11:11 +02:00
zotlabs
5f612521da Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-06-02 00:01:19 -07:00
Mario Vavti
22a9e4c9a9 add manage privacy groups entry to the panel channel menu dropdown for now 2018-06-01 21:52:54 +02:00
Mario Vavti
56f0244360 fixes for css fix 2018-06-01 20:59:28 +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
zotlabs
5d83469621 when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to. 2018-05-31 16:11:51 -07:00
Mario Vavti
b438ffead4 Merge remote-tracking branch 'mike/master' into dev 2018-05-31 13:06:33 +02:00
zotlabs
f0690aadcc typo in unused function 2018-05-30 23:40:01 -07:00
zotlabs
6dcad87ae8 make refresh packet work 2018-05-30 20:32:59 -07: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
9fcb3bf2e8 first cut on restructuring the previously called network tabs 2018-05-30 14:02:58 +02:00
zotlabs
1ef937834b more work 2018-05-29 23:52:08 -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
zotlabs
3e184ef403 z6 permissions work 2018-05-26 15:12:02 -07:00
zotlabs
cd4454100b alternate fix for z_check_dns 2018-05-24 16:32:21 -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
afb29176a4 deal with db failure gracefully 2018-05-23 02:33:46 -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
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
d9066ef26b not null violation oauth1 2018-05-21 13:37:55 -07: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
zotlabs
0044906fab Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-20 20:19:11 -07:00
zotlabs
ac8706e919 pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint) 2018-05-20 20:15:19 -07:00
zotlabs
8611e7f8a6 remove unused mindate parameter in the network/stream API method 2018-05-20 13:29:48 -07:00
git-marijus
acb114d0d1
Merge pull request #1174 from anaqreon/dev
Rename Permission Groups to Permission Categories and clarify feature…
2018-05-20 11:42:13 +02:00
Mario Vavti
7e99931733 implement jot reset button 2018-05-20 09:23:44 +02:00
Mario Vavti
0bc2a4f603 fix issues with attachment labels 2018-05-19 11:04:34 +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
zotlabs
8881530caf include/zot update 2018-05-18 04:05:47 -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
Andrew Manning
179eeb10a6 Rename Permission Groups to Permission Categories and clarify feature settings text. 2018-05-15 19:57:40 -04:00
zotlabs
aac5fd96cc provide function to fetch photo contents from url 2018-05-15 16:51:04 -07:00
zotlabs
16930c1c54 anybody authenticated not correctly handled in can_comment_on_post() 2018-05-15 16:08:51 -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
803e85caeb make get_default_profile_photo() pluggable 2018-05-14 23:10:20 -07:00
zotlabs
46152cc56b ensure all password checking goes through the authenticate plugin hook (for instance in mod_removeme) 2018-05-14 20:17:00 -07:00
zotlabs
301e405769 fine tuning the refactored tag/mention code 2018-05-14 18:27:12 -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
2d1dbc8f40 Revert "We're no longer setting a backup ACL for private mention typos."
This reverts commit 356c7003f2.
2018-05-14 09:10:36 +02:00
Mario Vavti
1b160c0a2d Merge remote-tracking branch 'mike/master' into dev 2018-05-14 09:04:40 +02:00
zotlabs
356c7003f2 We're no longer setting a backup ACL for private mention typos. 2018-05-13 15:50:42 -07:00
Mario Vavti
2c819c8619 fix postgres issue if register mode is set to yes - with approval 2018-05-12 12:46:09 +02:00
zotlabs
62bc5e8051 use Zlib/MessageFilter for sourced messages also 2018-05-10 19:31:51 -07:00
zotlabs
721496f922 hubzilla issue #1169 2018-05-10 17:11:03 -07:00
zotlabs
be225164eb allow either 2018-05-10 13:48:18 -07:00
zotlabs
1650ac2edd tag search not finding articles 2018-05-09 23:44:24 -07:00
zotlabs
bb1aa04689 change the embed from albums hovertip as well to emphasise 'existing' 2018-05-09 21:28:48 -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
b4be1da91e thread_author_menu - add some more checks as to whether to show certain links. This should complete work on hubzilla issue #1052 2018-05-09 21:08:12 -07:00
zotlabs
50796079fa loose ends discovered while fixing hubzilla #1166 2018-05-09 17:09:38 -07:00
zotlabs
9acf007687 hubzilla issue #1166 2018-05-09 17:03:10 -07:00
zotlabs
3c8de7b59d use imagemagick first stage thumbnail for cover photos, if configured 2018-05-07 23:57:17 -07:00
zotlabs
e646684493 pdf embeds 2018-05-06 19:57:37 -07:00
zotlabs
257dcaaf8b minor tweak to last pull: ensure that feeds have a name besides whitespace characters 2018-05-06 18:25:17 -07:00
zotlabs
a30934c563 ensure that feed xchans have a name 2018-05-06 18:23:39 -07:00
zotlabs
620082c16b If one has system.network_page_default set to a different sort order use that order on the 'All Channels' selection of the Collections (privacy group) widget. 2018-05-06 16:55:07 -07:00
zotlabs
b2218574ee allow uninstall of plugins which no longer exists via cmdline tool 2018-05-05 16:19:23 -07:00
zotlabs
894f5bc79a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-05 02:24:37 -07:00
zotlabs
b47b917eb0 check_item_source: always log uid 2018-05-05 01:52:35 -07:00
zotlabs
c41c04cf11 log all possible return conditions from check_item_source(), use consistent xchan 2018-05-05 01:43:14 -07:00
Mario Vavti
b0ca73c1ba Merge remote-tracking branch 'mike/master' into dev 2018-05-05 07:22:31 +02:00
Mario Vavti
f995ef0124 set XML_OPTION_SKIP_WHITE to 1 again 2018-05-04 22:46:43 +02:00
zotlabs
4a26f0d2d4 turn skip white back on - (xml actually doesn't parse if you disable this) 2018-05-04 13:44:34 -07:00
Mario Vavti
34f6d9f714 missing basetag 2018-05-04 13:54:12 +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
75c8f656c9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-02 23:18:09 -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
285781b887 hubzilla issue #1151 - activitypub mention gets bookmarked 2018-05-02 13:49:22 -07:00
Mario Vavti
9615d02b35 Merge remote-tracking branch 'mike/master' into dev 2018-05-02 09:22:23 +02:00
zotlabs
91688f7296 Merge branch 'master' into zapp 2018-05-01 21:57:10 -07:00
zotlabs
ac1c904f6e deliver via json 2018-05-01 21:56:32 -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
Mario Vavti
3f75dd1083 Revert "Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array.""
This reverts commit b223e364c6.
2018-05-01 10:34:23 +02:00
Mario Vavti
eb2d6fca3a Merge remote-tracking branch 'mike/master' into dev 2018-05-01 10:19:03 +02: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
Mario Vavti
d872a0ca86 activitypub xchans do not have an xchan_addr. use xchan_url for the follow button if we do not find an xchan_addr 2018-04-30 14:33:35 +02:00
Mario Vavti
b223e364c6 Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array."
This reverts commit f620274c6a68ae9a2a6a5142947aa199862087fc.
2018-04-30 10:28:32 +02:00
zotlabs
e841e48258 hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array. 2018-04-29 23:05:38 -07:00
zotlabs
8c7bf6d2f3 remove unused function 2018-04-28 14:13:56 -07:00
zotlabs
e26bfd76da Merge branch 'master' into zapp 2018-04-28 13:55:03 -07:00
zotlabs
7b445a5b39 where possible strip zid parameter from links that get pasted into posts so that they will get a correct zid when rendered 2018-04-26 20:27:14 -07:00
zotlabs
ce13fef6aa more testing of attach_move() uncovered some issues 2018-04-26 19:21:08 -07:00
zotlabs
7b9946079f function doc update 2018-04-25 23:10:08 -07:00
zotlabs
33f446fcd0 malformed embeds from gfycat hubzilla issue #1108 2018-04-25 20:47:30 -07:00
zotlabs
f923d21df3 some tagging work 2018-04-25 18:41:19 -07:00
zotlabs
63e8f1f36b undo_post_tagging - don't waste a connection query if we're undoing a hashtag and not a mention. 2018-04-25 02:26:37 -07: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
zotlabs
b688dc3995 minor tweak to utf8 usernames after some testing of the underlying encode/decode funations. This probably isn't critical and I do not have a failure case but just trying to cover all bases. 2018-04-23 19:10:35 -07:00
zotlabs
bd079166d7 Merge branch 'master' into zapp 2018-04-23 18:22:44 -07:00
zotlabs
5ed994ded3 convert keys on discovery 2018-04-23 18:21:50 -07:00
Mario Vavti
9ac67b44e4 strings update 2018-04-23 11:37:39 +02:00
Mario Vavti
fedb5fbcf5 update zot.php to fix php warning invalid argument supplied for foreach()
- this is taken from pr #1085 which was against wrong branch
2018-04-23 10:47:35 +02:00
zotlabs
2e43a93e93 more z6 basics 2018-04-22 23:48:49 -07:00
zotlabs
f6751ef402 more fine tuning of the zotinfo packet 2018-04-22 23:10:36 -07:00
zotlabs
c5fde34192 start to implement the zotinfo detail for zot6 2018-04-22 22:58:28 -07:00
zotlabs
b1690a93d2 site discovery 2018-04-22 21:30:14 -07:00
zotlabs
5eff476469 verify the sig 2018-04-22 19:49:26 -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
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
8d0cbeab38 better fix to permisisons.php - just cast to int. That's exactly what we want. 2018-04-19 23:37:47 -07:00
zotlabs
636fb95e24 permissions php error applying bit compare operation on a (presumed) boolean 2018-04-19 23:35:24 -07:00
zotlabs
2254262cf0 code booboo may have degraded the performance of the Trending tag query more than necessary 2018-04-19 17:43:50 -07:00
zotlabs
a81011333f follow activitypub by webfinger; requires addon update to all federation protocols 2018-04-18 19:41:09 -07:00
zotlabs
a2e0706d55 relax restrictions to the design tools menu to allow those with write_pages permission; this doesn't fix the underlying modules though as there are some potential security issues at the moment. 2018-04-18 17:26:05 -07:00
zotlabs
85ccfb4bbc do not queue anything which lacks a destination url 2018-04-18 17:07:29 -07:00
zotlabs
2ec28a5993 just provide the trending tags in public stream by default and simplify the query to improve load times; I intend to do additional work on this feature later 2018-04-18 15:56:57 -07: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
zotlabs
fc7d9c235c minor code optimisation 2018-04-17 22:23:28 -07:00
zotlabs
0f5ae5cac8 also add the noisy 'rss' tag 2018-04-17 21:55:00 -07:00
zotlabs
6903dbcc0d re-use directory safemode setting for public stream tag filtering since a handful of well-known tags skews the results wildly. Added 'bot' to the list just because it's noisy. A site can customise or nullify this feature if they desire. 2018-04-17 21:48:43 -07:00
zotlabs
a806c68713 fine tuning the public stream tag results 2018-04-17 20:27:36 -07:00
zotlabs
393cd46a82 public stream tag enhancements 2018-04-17 20:08:14 -07:00
zotlabs
8b9952e770 set the correct webfinger Accept: request header now that Mastodon fixed the bug that we changed it to work around 2018-04-16 23:32:40 -07:00
zotlabs
43e55eb9a6 Active channels information is a bit imprecise. Provide a higher accuracy method. This will require a transition period 2018-04-16 21:40:43 -07:00
zotlabs
d38b5ed2f5 update the placeholder 2018-04-16 17:40:33 -07:00
zotlabs
1662f76f03 hubzilla issue #1078 ; provide content-type header for system emails (was already correct for notification emails) 2018-04-16 16:12:57 -07:00
zotlabs
518db97962 never mind. dbg(1) now gives you the basic debug result and dbg(2) gives you the verbose debug option with all the results. 2018-04-14 16:56:30 -07:00
zotlabs
fdf5799857 allow dbg(2) to only return the canonical SQL used in the query and the number of results, but not log every single result. Maybe we should use 1 for this and 2 for the full results, but I didn't really want to change the way people do things today. If anybody has a strong opinion about doing this, go ahead and change it and send a note to the developer forum. 2018-04-14 16:47:51 -07:00
Mario Vavti
e04d3c45a4 provide visible star status for starred posts 2018-04-13 11:58:12 +02:00
Mario Vavti
4aaea422bc move the thread author menu to to the wall item photo. the menu list was getting too long. 2018-04-13 10:12:57 +02:00
zotlabs
739a612824 poll responses: start treating them as hidden activities now so that when this feature gets finished it will work flawlessly for versions greater than today. 2018-04-11 21:51:57 -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
zotlabs
e060135304 add commented_days parameter to item_expire(), default 7. Both expire_days and commented_days have to be exceeded to expire. 2018-04-09 23:39:47 -07:00
zotlabs
6bf2c64aa2 Create catcloud widget and provide a type option which can include 'cards' or 'articles' 2018-04-09 21:44:04 -07:00
Mario Vavti
04935f139d fix xchan_query() for anon comments 2018-04-09 14:28:41 +02:00
git-marijus
9dc831f1ef
Merge pull request #1051 from anaqreon/auto-save
Auto-save comment and post text
2018-04-09 13:18:09 +02:00
zotlabs
6844d7c752 don't provide a connect button for transient identities 2018-04-08 22:53:04 -07:00
zotlabs
e0255c0dc4 first cut of feature/techlevel merge 2018-04-08 20:05:30 -07:00
zotlabs
6ce3ca1ce0 anon_identity_init: put anonymous commenters in network 'anon' so that they can be easily distinguished from federated network members and handled appropriately. 2018-04-08 19:28:57 -07:00
Andrew Manning
f9ec3c66ff Added feature setting for auto-save, defaulting to enabled. 2018-04-08 19:44:21 -04:00
M.Dent
ff77f14f2f Remove remove plugin from \App::[] on uninstall 2018-04-07 23:41:22 -04:00
M.Dent
a0cba6564f Uninstall plugin on Exception on load. 2018-04-07 23:12:39 -04:00
M.Dent
35b4f0a863 Add class for Exceptions 2018-04-07 23:01:18 -04:00
DM42.Net (Matt Dent)
0fba1a777e Add error handler and try/catch for all () calls 2018-04-07 22:17:19 -04:00
zotlabs
8048b7addc channel import failing to provide channel_password value 2018-04-06 16:45:25 -07:00
zotlabs
4499ee178f put directory server in siteinfo - there are a lot of sites using broken directories 2018-04-06 01:24:38 -07:00
zotlabs
4a45c35c4e oauth2 client settings page 2018-04-05 21:01:36 -07:00
zotlabs
f4c94ab121 use profile_store_lowlevel() when importing profile structures to ensure all non-null fields are present 2018-04-05 17:31:20 -07:00
zotlabs
fe401203bd bbcode() - ensure that $options is always an array, as the interface has changed slightly 2018-04-04 23:14:41 -07:00
zotlabs
c86032d4dc oauth2 dynamic client registration update 2018-04-04 20:58:54 -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
f748139606 allow the link target attribute to be modified in bbcode() from much further up the call stack in prepare_page() which will usually refer to a local item. 2018-04-04 16:33:11 -07:00
zotlabs
245142cc07 Merge branch 'master' into oauth2 2018-04-03 19:57:35 -07:00
zotlabs
5ac0f371c7 community tags: allow signature of either author or owner so that it stands a chance of working across multiple delivery chains 2018-04-03 17:52:54 -07:00
zotlabs
4e21c14ff6 community tagging refactor - we no longer send an edited post/comment to everybody. The post owner approves the tag and this is transmitted along with the tag activity. Recipients check the signature of the approval and add the tag to their local copy of the post. 2018-04-02 20:39:28 -07:00
zotlabs
753e1e4616 commtag refactor 2018-04-02 19:32:22 -07:00
zotlabs
9a1f051068 missing year on profile birthday input, some optimisations to stats 2018-04-02 13:32:10 -07:00
zotlabs
3bd3686acf Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 2018-03-31 14:00:09 -07:00
zotlabs
4493304fa7 wrong function 2018-03-31 13:22:12 -07:00
Andrew Manning
6decffb00c Merge branch 'dev' into oauth2 2018-03-31 13:41:29 -04:00
zotlabs
238303d819 add directory keyword links to profile 2018-03-29 15:32:35 -07:00
zotlabs
33bb89729c hubzilla issue #1019 - punycode urls on connedit page when displaying locations 2018-03-29 02:26:25 -07:00
zotlabs
cd485b0fdf hubzilla issue #1015 - login with unicode domain name 2018-03-28 19:25:11 -07:00
zotlabs
662316e687 update folder timestamp on uploaded files (fixme - we need to recurse back to the storage root but that is for another day) 2018-03-27 21:13:14 -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
35b6c2baad Hard fail imports of removed channels. This is silly. 2018-03-27 15:08:27 -07:00
zotlabs
2fc3f381ac php strpos() empty needle warning when a term entry has no url 2018-03-25 21:48:42 -07:00
zotlabs
5a739ddc47 Merge branch 'newmemberwidget' 2018-03-25 21:16:10 -07:00
zotlabs
4ef2493e95 testing start_menu feature 2018-03-25 21:15:23 -07:00
zotlabs
558e3f8042 code optimisations and de-duplication on updating parent commented timestamp 2018-03-24 02:22:24 -07:00
zotlabs
a8d81a68d6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-03-23 21:44:55 -07:00
zotlabs
abe6ab4775 logic fallacy when updating parent timestamp of moderated comment 2018-03-23 21:24:24 -07:00
zotlabs
9a155cf5a5 turn newmember widget into a feature 2018-03-23 19:03:30 -07:00
Mario Vavti
376091010f Merge remote-tracking branch 'mike/master' into dev 2018-03-23 10:03:54 +01:00
Mario Vavti
ac967db4e8 new markdown lib seems to handle < and > correct. remove the workaraound. 2018-03-23 09:40:24 +01:00
zotlabs
af8cbf000f tagadelic was being overly protective of permissions. 2018-03-22 21:23:12 -07:00
zotlabs
034032c7c2 slight change in mail privacy implementation. If you initiate a private mail conversation and they respond, accept the reply. You can't hide behind your permissions or lack thereof. Often this will be accidental. If you truly want to block them from replying and your permissions otherwise would not allow them to reply, delete the conversation. 2018-03-22 19:52:25 -07:00
zotlabs
05e11844e5 make list mode work in cards and articles 2018-03-22 17:17:00 -07: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
3d6b606792 add the social "party" permission role 2018-03-20 04:08:36 -07: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
Mario Vavti
34fee2a790 match hosts instead of urls to decide if to zid or not to zid 2018-03-15 14:53:18 +01:00
Mario Vavti
6c709551ce do not always zid share links. add missing < 2018-03-15 14:31:50 +01:00
Mario Vavti
aa4f8b2901 add xchan_network = zot and xchan_deleted = 0 to the random_profile() query 2018-03-15 13:34:40 +01:00
zotlabs
a94a28bb7e mastodon content-warning cont: only strip nsfw tag if a content warning spoiler is used. Else it's legitimately nsfw. 2018-03-14 20:47:11 -07:00
zotlabs
0905018d3b use original exif_read_data() parameters which were lost in a regression; unset automatic nsfw category generated for Mastodon content warning posts, as people use CW as a spoiler mechanism 99% of the time and flagging inappropriate content 1% of the time. 2018-03-14 14:51:33 -07:00
zotlabs
128d1f7aa8 somewhere along the line the output of exif_read_data() changed and it no longer provides populated sections. Adjust for the new format and allow for the old because I cannot find documentation of this change anywhere. This affects photo rotation and the photo map feature. 2018-03-13 22:47:11 -07:00
zotlabs
ab1d47b36f unicode/emoji usernames. Warning: experimental feature, unstable, untested, disabled by default, use at your own risk, may not federate to other platforms and protocols. May not clone correctly. Bug reports which neglect to include detailed roubleshooting information and patches/pull requests will be ignored. 2018-03-12 20:54:55 -07:00
zotlabs
34399b8b47 obscure permission issue with custom permissions when using the highly discouraged advisory privacy modes 2018-03-12 15:47:33 -07:00
Andrew Manning
a4de63ca92 Merge branch 'dev' into oauth2 2018-03-10 15:10:09 -05:00
zotlabs
0a876e1518 don't add pending connections to the default privacy group until accepted 2018-03-06 11:39:49 -08:00
Andrew Manning
9b13db1c48 Merge branch 'dev' into oauth2 2018-03-05 20:06:47 -05:00
zotlabs
59a2057fa0 fix some issues with friend suggestions on standalone sites with no 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites. 2018-03-04 17:40:38 -08:00
zotlabs
be6619d9c0 bugfix: unable to reset profile fields to defaults in admin/profs by emptying the textarea 2018-03-04 15:29:10 -08:00
zotlabs
14f701f7fc restrict mail messages to max_import_size 2018-03-04 14:30:09 -08:00
Andrew Manning
058f7277b5 Merge branch 'dev' into oauth2 2018-03-04 06:45:07 -05:00
zotlabs
c3920116f2 more work on federated polls 2018-03-03 13:52:55 -08:00
zotlabs
df03805579 process follow from article menu in the background, do not reload page - hubzilla issue #987 2018-03-02 13:15:28 -08:00
zotlabs
b38ce967f3 sort settings/featured 2018-03-02 12:41:50 -08:00
zotlabs
dcfe9bc64f background work for caldav integration continued, modify mod_follow to allow it to be called from ajax without redirecting. 2018-03-02 01:03:14 -08:00
Klaus Weidenbach
b60098ec68 Update composer autoload cache. 2018-03-01 11:29:15 +01:00
zotlabs
6210b7727f profile edit: empty dob is set to the date of the first profile save unless you clear it first 2018-02-28 21:39:52 -08:00
zotlabs
01015bc0d5 several email validation issues 2018-02-28 21:15:26 -08:00
Andrew Manning
39fe80a196 Merge branch 'dev' into oauth2 2018-02-28 20:47:14 -05:00
zotlabs
14183b8fb5 move privacy groups to the newly created Access Control and Permissions tab. Not for 3.2 as it requires string changes from the prior checkin. 2018-02-27 19:18:53 -08:00
zotlabs
f34e6d8977 move oauth_client management and guest access tokens to features rather than auto-enabling at various feature levels. This involves string changes and should *not* go into 3.2RC. 2018-02-27 19:15:12 -08:00
zotlabs
5277e79fa2 change undo_post_tagging() to emit quoted tags rather than using underscore replacement if they contain spaces. 2018-02-26 20:30:36 -08:00
Andrew Manning
1035c453ea Merge branch 'dev' into oauth2 2018-02-26 19:48:15 -05:00
zotlabs
afe2ba3690 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-26 16:45:04 -08:00
zotlabs
f83b7c2d52 issues with delivery of edited posts to forums 2018-02-26 15:46:29 -08:00
Andrew Manning
45e0fc6802 Successful OAuth2 sequence demonstrated with the test vehicle, including an authenticated API call using an access_token. 2018-02-26 18:16:43 -05:00
Mario Vavti
673cf8d35e Merge remote-tracking branch 'mike/master' into dev 2018-02-25 13:01:23 +01:00
zotlabs
d406e2aae2 siteinfo.json - if hide_in_statistics is set only include the total channels count and no other statistical info 2018-02-24 14:38:28 -08:00
Mario Vavti
c618bfc607 mark connections where we do not have post_comments permissions with an no entry sign. 2018-02-24 19:42:39 +01:00
zotlabs
3dd64e7916 usability: click your own profile photo to change it instead of hunting it down in the profile edit navmenu. We still need work on the 'or use a photo from your albums' to use something like the photo selection widget in the post editor as you otherwise have to track down the 'use as profile photo' entry in the photo detail navmenu instead of just clicking an image. 2018-02-23 13:24:50 -08:00
zotlabs
048a636315 Usability and member experience: remove street address info from the default basic profile fields, mention that the site banner can be full HTML, mention on the techlevel setting that this also controls what additional features may be visible. 2018-02-23 12:44:07 -08:00
Mario Vavti
a1f9d40d08 Merge remote-tracking branch 'mike/master' into dev 2018-02-22 10:11:18 +01:00
Mario Vavti
bdcee4fc30 query for what we need instead of what we do not need 2018-02-22 10:10:46 +01:00
zotlabs
56d1c08317 move dreport from zot to lib 2018-02-21 21:18:54 -08:00
zotlabs
2d69b419ff move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org 2018-02-21 20:59:30 -08:00
zotlabs
fef3155e6a cleanup the recent crypto code modifications. We need this stuff to be readable. 2018-02-21 16:41:33 -08:00
zotlabs
8fc48f2d43 add event resource_id to iconfig so Diaspora can search on it without looking inside JSON objects. 2018-02-21 15:56:51 -08:00
zotlabs
b6d34bffcc trim non-existent/deprecated plugins from siteinfo plugin list 2018-02-20 21:31:40 -08:00
zotlabs
02575f46a6 move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively hand tested. 2018-02-20 17:18:08 -08:00
zotlabs
441cdeff3f zot6 delivery cleanup 2018-02-20 16:13:43 -08:00
Mario Vavti
85a6dd6031 Merge remote-tracking branch 'mike/master' into dev 2018-02-20 23:58:17 +01:00
Mario Vavti
6d0b88e242 Merge remote-tracking branch 'mike/master' into dev 2018-02-20 21:00:22 +01:00
zotlabs
dbeee4707b don't try to handle OAEP for plugin crypto methods; let them do it if desired 2018-02-20 11:56:51 -08:00
zotlabs
ae8623e3af encrypt/decrypt function not found 2018-02-20 11:51:59 -08:00
Mario Vavti
41da5af721 remove order by clause 2018-02-20 10:36:05 +01:00
zotlabs
76b5c68646 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-19 16:19:14 -08:00
zotlabs
b6b4827680 OAEP padding mismatch on some newer encryption methods 2018-02-19 15:44:18 -08:00
zotlabs
a310cb2fbb more logging 2018-02-19 14:37:49 -08:00
zotlabs
67069beddc add logging 2018-02-19 14:27:27 -08:00
Mario Vavti
43992dc463 do not show summary if it is equal to body and some styling for the summary/article toggle links 2018-02-19 14:11:58 +01:00
git-marijus
fac5d81790
Merge pull request #981 from anaqreon/dev
Update code tag styling so bbcode [code] blocks and wiki markdown ...
2018-02-19 11:11:31 +01:00
Andrew Manning
c444e40c01 Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely. 2018-02-18 10:09:05 -05:00
zotlabs
46cb45d94b crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding) 2018-02-16 18:45:15 -08:00
Mario Vavti
45b42cbc1c Merge remote-tracking branch 'mike/master' into dev 2018-02-15 09:00:52 +01:00
zotlabs
c11ebd12d5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-14 15:37:35 -08:00
zotlabs
465d89129c provide option to block the public stream unless authenticated, since there could be legal issues with unmoderated content 2018-02-14 15:32:33 -08:00
Mario Vavti
d826515ba8 since we only save the parent mid in notify we must look for thr_parent when dealing with likes 2018-02-13 11:01:58 +01:00
Mario Vavti
b221c68e4b fix parent id for likes in status notifications. 2018-02-13 10:29:32 +01:00
zotlabs
0f8d2d4e58 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-11 19:36:37 -08:00
zotlabs
a31331bfd9 hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments 2018-02-11 18:02:28 -08:00
zotlabs
0dbb024c99 purify summary 2018-02-11 14:12:24 -08:00
git-marijus
ba954b8cfe
Merge pull request #976 from phellmes/time-ago-strings
more flexibility for relative date/time translations
2018-02-11 22:50:39 +01:00
Mario Vavti
3fa809ae79 this might seem rediculous but it helps mysql to find the better index for this query 2018-02-11 20:53:27 +01:00
phellmes
c6b2652c01 add flexibility to prefix/suffix string translations for jquery.timeago
In addition to use the defaults or any other translated strings this allows
now to force an empty string by setting the translation to NONE.
Translators can choose to either use prefixes only, suffixes only,
none of them or both of them - whatever sounds best in their language.
2018-02-11 16:08:34 +01:00
Mario Vavti
2227de5f65 Merge remote-tracking branch 'mike/master' into dev 2018-02-09 06:58:12 +01:00
zotlabs
3dfafb710c cosmetic 2018-02-08 21:32:18 -08:00
zotlabs
9f5d44fa32 turn the logs down again 2018-02-08 16:30:44 -08:00
zotlabs
cd1e5d4171 zot6 testing 2018-02-08 16:22:10 -08:00
zotlabs
635c5e532b z6 testing 2018-02-08 15:32:54 -08:00
Mario Vavti
9e64ce7da7 Merge remote-tracking branch 'mike/master' into dev 2018-02-08 10:12:04 +01:00
zotlabs
6cf2e9945a encrypt the httpsig for zot6 transport 2018-02-07 21:53:47 -08:00
zotlabs
b21a5c3ce9 compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is present 2018-02-07 20:17:32 -08:00
zotlabs
5057a4bd4c zot6 delivery work 2018-02-07 19:15:56 -08:00
zotlabs
3a0db39fa0 more zot6 delivery work 2018-02-07 18:38:10 -08:00
zotlabs
1d8d2c6e55 Merge branch 'master' into z6 2018-02-07 17:54:21 -08:00
zotlabs
dc88ccdc0b remove dead code 2018-02-07 17:53:54 -08:00
Mario Vavti
b512780e37 do not spam the log 2018-02-07 10:27:00 +01:00
Mario Vavti
91dda86a74 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-02-07 09:03:49 +01:00
zotlabs
4171854e2f slight improvement in ostatus protocol detection from xml feed 2018-02-06 17:00:56 -08:00
git-marijus
24a650d7ec
Merge pull request #971 from dawnbreak/QA_testing
UnitTests for database classes and bit cleanup and docu
2018-02-06 12:48:34 +01:00
zotlabs
cb042e32bc code cleanup 2018-02-05 20:57:07 -08:00
zotlabs
5e94187d03 remove dead code 2018-02-05 20:31:24 -08:00
zotlabs
b41c5f3497 Merge branch 'master' into z6 2018-02-05 15:58:28 -08:00
zotlabs
930e1fdbdc feedutils: separate the parsing of author information from the parsing of item/activity information 2018-02-05 15:14:57 -08:00
zotlabs
f15fd93f90 implode can take its arguments in either order, but let's try to be consistent 2018-02-04 17:01:59 -08:00
zotlabs
3e7dffb676 decomplicate cont. 2018-02-03 12:50:07 -08:00
zotlabs
512f3a7643 provide summaries in feeds under very limited cases, but never in compat (GNU-Social) mode 2018-02-01 21:26:34 -08:00
zotlabs
dd35cad62a some feed cleanup 2018-02-01 19:52:40 -08:00
zotlabs
cc0cd0b292 more generalisation of commonly used code constructs 2018-02-01 17:17:23 -08:00
zotlabs
c92bb6176a more separation of complex code into separate functions 2018-02-01 15:09:51 -08:00
zotlabs
8d479aa1c7 redirect to the email_validation page if login was attempted after account creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it. 2018-01-29 16:58:55 -08:00
zotlabs
c1e44c0f54 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-28 21:43:50 -08:00
zotlabs
56d1614ea6 provide a default video image if nothing else is available. Allow sites to change it. 2018-01-28 20:35:05 -08:00
Klaus Weidenbach
4bf0c9e36a Add tests for non existent tables.
Prevent PHP warnings "Undefined variable" in dba_pdo::q();
2018-01-28 23:02:46 +01:00
Klaus Weidenbach
509844fd7e 🔥 Cleanup old database related files.
Remove non used database drivers, remove unused methods.
Improve documentation.
2018-01-28 23:02:15 +01:00
Mario Vavti
a86b260f73 query optimisations for notifications - use a specific index only 2018-01-28 12:09:47 +01:00
zotlabs
4eead1c688 typo from previous checkin and partial fix to hubzilla #965 - show any connection without comment permission as archived in contact_block(). 2018-01-26 13:42:53 -08:00
zotlabs
660079bd2a Issue with configurable site age limit, vagueness when informing about email validation policy; added email validation resend ability and the option to input a verification code at a webpage though both require additional work to provide these abilities. 2018-01-26 12:16:47 -08:00
zotlabs
e3c7200b6f don't do any bbcode translation within code blocks (except baseurl, observer, and linefeeds) 2018-01-25 16:18:16 -08:00
zotlabs
f7309b926b improve browser language detection by offering fallback of (for instance) fr-fr to fr if no other language matches could be found 2018-01-24 21:56:25 -08:00
zotlabs
217c324a98 remove unused prototype importer template and obsolete reflection cms importer 2018-01-24 21:35:41 -08:00
zotlabs
4cfd7b65fb siteinfo embellishments 2018-01-22 20:07:08 -08:00
zotlabs
629c915f36 ensure filter words are not empty 2018-01-21 23:30:08 -08:00
zotlabs
764d6e3407 zot api: provide channel list function (list all channel usernames [e.g. channel_address] associated with the logged in account) 2018-01-18 17:20:30 -08:00
zotlabs
6943960f99 Merge branch 'dev' of https://github.com/dawnbreak/hubzilla 2018-01-18 16:08:27 -08:00
Klaus Weidenbach
8a60bb4619 Change dsn port handling in dba_pdo. 2018-01-18 23:46:49 +01:00
zotlabs
03d3cbdbf8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-18 14:17:48 -08:00
zotlabs
0fba1bb868 simplify interactions with the get_features hook by calling it before any filtering takes place 2018-01-18 14:11:15 -08:00
Mario Vavti
a0e1a8e0a2 Merge remote-tracking branch 'mike/master' into dev 2018-01-18 13:20:23 +01:00
Mario Vavti
53e353abf2 consolidate navbar tucson and some javascript cleanup 2018-01-18 12:44:40 +01:00
zotlabs
f1afb0ddfe simplify dir_tagadelic dramatically 2018-01-17 20:10:49 -08:00
zotlabs
c331e585b8 remove sendzid core code from core (put in plugin where it belongs) 2018-01-17 15:25:30 -08:00
zotlabs
05de59d4ad initial z6 delivery 2018-01-16 20:08:10 -08:00
zotlabs
2de1285121 z6 deliver 2018-01-16 18:15:58 -08:00
zotlabs
03f692f24f surface the article feature 2018-01-15 21:46:27 -08:00
zotlabs
014a1f0158 add summary bbcode tag 2018-01-15 20:47:32 -08:00
zotlabs
91db66b32d move markdown-in-posts/comments feature to plugin 2018-01-14 18:22:58 -08:00
zotlabs
f0faa7f9b0 support tables in markdown posts/comments (but not table alignment); and do not support iframes from html source. 2018-01-14 16:45:33 -08:00
zotlabs
eb3e43feec cleanup of last fix 2018-01-13 14:08:15 -08:00
zotlabs
08bea83c03 unexpected openssl result 2018-01-13 13:45:33 -08:00
zotlabs
619f8f752b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-12 01:26:21 -08:00
git-marijus
07b67963f1
Merge pull request #951 from dawnbreak/docu
💡 Add source documentation from recent conversations.
2018-01-12 10:15:43 +01:00
zotlabs
b0a491eaa8 ability to parse info blocks in third-party (or system) widgets 2018-01-12 00:25:43 -08:00
zotlabs
b05c1c391c db issue reported in hubzilla #953 - this does not do anything about the auth issue 2018-01-10 15:42:02 -08:00
zotlabs
c09bab466a hubzilla issue #945 continued: We previously blocked directory keywords when searching the local directory as it produced errant results and included results from the entire directory space (an issue that was resolved satisfactorily by that fix sometime in the past). As a result of issue #945 this was reworked so that we should return correct results for keywords when searching either the local directory or a standalone directory. 2018-01-10 15:32:04 -08:00
zotlabs
62f0266f46 scrutinizer issues: none worthy of including in 3.0, there will likely be a few hundred more before all is said and done. 2018-01-08 14:45:21 -08:00
zotlabs
0d415fb3c9 hubzilla issue #946 2018-01-07 02:34:37 -08:00
Klaus Weidenbach
aa63c23839 💡 Add source documentation from recent conversations.
There have been some conversations in the last weeks which explained
several parts of the code, so add it to the source code documentation.
Also some other small source code documentation improvements.
2018-01-05 01:38:20 +01:00
zotlabs
ada578e7e3 issues with feed parameters 2018-01-02 14:04:43 -08:00
zotlabs
3bd7133ba3 hubzilla issue #947 2018-01-01 12:25:43 -08:00
zotlabs
ce38350e00 this should finish up hubzilla issue #113 2017-12-31 14:45:42 -08:00
zotlabs
94e92bb4bf update file thumbnails when imported/synced 2017-12-30 23:15:47 -08:00
zotlabs
5a8efc10d8 hubzilla issue #945 - directory keywords returned from twkn in standalone mode 2017-12-26 13:19:27 -08:00
zotlabs
601706b7b5 cannot use file_get/put_contents in attach_store, must use pipe_streams 2017-12-25 14:59:08 -08:00
zotlabs
f825e27f1a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-12-21 13:36:58 -08:00
zotlabs
c087d1e18b hubzilla-addons issue #74 - delayed posts not honoured for GNU-Social
There is a very high probability this will also fix hubzilla-addons issue #75
2017-12-21 13:34:59 -08:00
Mario Vavti
64fe15b6f5 remove additional linebreaks after headings 2017-12-21 09:07:37 +01:00
Mario Vavti
73766caa81 html2bbcode: use headings bbcode for headings 2017-12-20 11:11:18 +01:00
Mario Vavti
78146d6417 merge red master into dev 2017-12-17 09:49:10 +01:00
zotlabs
59779f2a0e reverse the logic so we zidify by default 2017-12-16 15:14:28 -08:00
zotlabs
b1e191ce21 don't zidify all permalinks, only zot permalinks 2017-12-16 15:10:43 -08:00
Mario Vavti
7181cf9012 silence PHP7.2 warning 2017-12-16 20:33:07 +01:00
Mario Vavti
d304821977 fix undefined constant warning 2017-12-16 20:30:42 +01:00
Mario Vavti
a61c72b3b2 fix some more PHP7.2 warnings 2017-12-14 22:10:56 +01:00
Mario Vavti
a07b5ba4dd make remote homelink link to the home host and not to the home channel 2017-12-14 21:48:30 +01:00
zotlabs
494ce9b872 hubzilla #475 continued - show photos in root folder. Part of Andrew's fix for this wasn't in my repository and hopefully won't conflict; as it appears to have been lost somewhere. It also needed a small change to the folder permissions check. 2017-12-12 14:18:34 -08:00
Mario Vavti
5b1ef760a0 notification: slight animation for loading... and do not remove public stream items on click (we can not mark them read) 2017-12-11 16:50:25 +01:00
zotlabs
4859e6e11a sql compliance issue 2017-12-10 19:43:54 -08:00
zotlabs
c2990964f0 regression in channel sources delivery 2017-12-10 18:38:50 -08:00
zotlabs
fca1a7506e go back to including the photo thumbnail data in the export file. We have the ability to fetch each thumbnail directly if there is a problem with resource consumption, but this is the most efficient way to deal with it and most sites should be able to handle the memory consumption of our thumbnail data. The original full scale photo is a different issue; these can exhaust memory even before base64. 2017-12-10 15:54:40 -08:00
zotlabs
27bc5fa4b0 improvements to file import/export 2017-12-10 15:25:44 -08:00
zotlabs
ad6cb63e07 xlink_rating_text default value 2017-12-09 12:56:11 -08:00
zotlabs
adec67d5fa hubzilla-addons issues #73 2017-12-09 12:49:28 -08:00
zotlabs
85b7c90637 strip acct: from OWA auth to API endpoints 2017-12-07 18:56:26 -08:00
zotlabs
d326e7a75c hubzilla issue #680, implement IMoveTarget and recursive file/directory move/rename 2017-12-06 16:07:40 -08:00
zotlabs
ffaab27e77 synchronise an attach_move operation to clones 2017-12-06 14:20:17 -08:00
Mario Vavti
657ec75c3d Merge remote-tracking branch 'mike/master' into dev 2017-12-04 08:58:19 +01:00
Mario Vavti
5c12b56e87 PHP 7.2 silence some warnings 2017-12-04 08:56:01 +01:00
zotlabs
91e3c5c34e render installable elements as buttons instead of links 2017-12-03 19:30:36 -08:00
Mario
dae0107dd0 fix some pubstream on/off weirdness 2017-12-03 12:31:41 +01:00
zotlabs
19ec8488e0 Merge branch 'chunk' 2017-11-30 19:06:00 -08:00
zotlabs
5abcb8c978 use httpsig auth for getfile 2017-11-29 13:51:54 -08:00
zotlabs
76703dee84 more chunk work 2017-11-28 17:37:18 -08:00
zotlabs
dc53573975 unset item_wall and item_origin on pubstream to channel copy 2017-11-27 02:47:57 -08:00
zotlabs
0e91810ed6 pubstream comments and a few other bugfixes that were discovered along the way 2017-11-26 18:29:24 -08:00
Mario Vavti
2108173e74 Merge remote-tracking branch 'mike/master' into dev 2017-11-25 07:17:52 +01:00
zotlabs
08900b730b this may fix pubstream comments/likes 2017-11-24 18:23:53 -08:00
zotlabs
9dd545f420 don't include invisible "update activities" in category widget 2017-11-24 15:39:00 -08:00
zotlabs
fda5231a71 default profile assign 2017-11-24 14:55:39 -08:00
Mario Vavti
87eaa6d8e5 some more work on mod hq 2017-11-24 15:01:34 +01:00
zotlabs
3bb0efd2cb remove deprecated $a argument from advanced_profile() 2017-11-23 20:35:34 -08:00
zotlabs
a99ebd42ec change to bbcode calling parameters: important: will require pulling addons;
also some extra checking of server headers in upload functions
2017-11-23 15:21:50 -08:00
Mario Vavti
14f1292743 fix typo in pipe_streams() 2017-11-23 20:22:50 +01:00
zotlabs
8fcf16ee63 optional divider between item header and body 2017-11-22 18:39:23 -08:00
zotlabs
4fc8416c3c disable until completed 2017-11-22 15:41:09 -08:00
zotlabs
6c178d4485 article feature 2017-11-22 15:39:06 -08:00
zotlabs
8bd8af7d16 initial articles feature 2017-11-22 11:49:28 -08:00
zotlabs
b4f8f4df7b allow toggle to 'SMBC' scaling mode. 'SMBC' mode is named thusly for Saturday Morning Breakfast Cereal cartoons which are very tall. If you scale the image to constrain both dimensions, the cartoon text is illegible. So we allow the height to float and only constrain the width. The new flag allows you to overide this mode and force both dimensions to always be evaluated and constrained to the provided limit. 2017-11-21 19:47:59 -08:00
zotlabs
94d6461568 Video thumbnail generator 2017-11-21 16:06:03 -08:00
zotlabs
09f1e4bdfb pdf thumbnails 2017-11-21 15:10:23 -08:00
zotlabs
250d947667 cloud tiles: use folder-o for folders and set the icon colour to something a bit less harsh than the link colour for system icons. Dark solid blue folders are a bit overwhelming, as is the default text_colour (black) 2017-11-19 21:51:21 -08:00
zotlabs
6a49e3124e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-11-19 17:39:42 -08:00
zotlabs
16f584608f text thumbnails in cloud tile mode 2017-11-19 16:56:59 -08:00
Mario Vavti
0aa01740d1 Merge remote-tracking branch 'mike/master' into dev 2017-11-19 20:12:55 +01:00
zotlabs
60fcb5f4f2 don't include pending connections in poco 2017-11-18 12:29:20 -08:00
Mario Vavti
becd5f1446 Merge remote-tracking branch 'mike/master' into dev 2017-11-17 09:14:16 +01:00
zotlabs
ab363e3132 improve the icon mappings for cloud tile view 2017-11-16 19:58:09 -08:00
Mario Vavti
cba602bf64 compare strpos result against false 2017-11-16 13:10:08 +01:00
Mario Vavti
78c9f752af provide ability to pin apps to navbar from /apps. this removes the ability to have per custom navbar pinned apps - this can be added later if desired 2017-11-16 11:11:06 +01:00
zotlabs
d479ed00e4 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-11-15 12:41:24 -08:00
zotlabs
67b6d41d57 This should sort out hubzilla issue #826 but requires a bit more testing. It may also sort out some reported issues with commenting and liking items in the public stream. 2017-11-15 11:26:14 -08:00
Mario Vavti
601f1eb624 Merge remote-tracking branch 'mike/master' into dev 2017-11-15 10:48:24 +01:00
Mario Vavti
301b41eaa4 typo - fixes issue #910 2017-11-15 09:40:14 +01:00
zotlabs
8e53491867 sort out a few more large image upload issues 2017-11-14 17:39:33 -08:00
Mario Vavti
5b4aa71878 Merge remote-tracking branch 'mike/master' into dev 2017-11-14 09:47:13 +01:00
zotlabs
d5ff82bbe4 issue with group_rmv 2017-11-13 14:40:46 -08:00
Mario Vavti
c8dbcf8a2a sort combined private mail conversations by latest updated conversation instead of created parent 2017-11-13 22:01:37 +01:00
Mario Vavti
5dad444026 fix php warnings on photo delete 2017-11-13 19:55:09 +01:00
zotlabs
b12dc89bb1 improve removed_channel final cleanup. Hubzilla issue #386 2017-11-12 21:37:06 -08:00
zotlabs
1ac35dd047 fix some conflicts between private tags and forum tags 2017-11-12 15:07:12 -08:00
zotlabs
458f2e748d cleanup of upload_to_comments test; we actually don't care about the profile owner. We only care that we're logged in locally and our storage is public by default. 2017-11-12 14:14:20 -08:00
zotlabs
34b38f06e0 also disable uploading in comments if the channel permissionlimits for view_storage aren't PERMS_PUBLIC. 2017-11-11 12:23:20 -08:00