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
|
95c38bcf62
|
incorrect object reference
|
2018-09-02 22:59:08 -07:00 |
|
zotlabs
|
3a6df2b12f
|
sync likes and shares
|
2018-09-02 22:58:30 -07:00 |
|
zotlabs
|
19e06edec8
|
Merge branch 'zap'
|
2018-09-02 20:52:00 -07:00 |
|
zotlabs
|
705f1e98ce
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-02 20:51:46 -07:00 |
|
zotlabs
|
45135e7953
|
fix the retweet icon
|
2018-09-02 20:51:17 -07:00 |
|
zotlabs
|
cf2604d104
|
Merge branch 'zap'
|
2018-09-02 20:46:40 -07:00 |
|
zotlabs
|
6ff75a1bfe
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-02 20:46:24 -07:00 |
|
zotlabs
|
97cc4a2479
|
attach content missing
|
2018-09-02 20:45:53 -07:00 |
|
zotlabs
|
ed00b9957b
|
indicate repeated posts
|
2018-09-02 20:44:15 -07:00 |
|
zotlabs
|
143241a45e
|
Merge branch 'zap'
|
2018-09-02 20:17:52 -07:00 |
|
zotlabs
|
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
|
9b2ae5396e
|
Merge branch 'zap'
|
2018-09-01 15:56:15 -07:00 |
|
zotlabs
|
b3ef8d355a
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-01 15:53:09 -07:00 |
|
zotlabs
|
8e7fb44896
|
local compatibility fixes
|
2018-09-01 15:52:28 -07:00 |
|
zotlabs
|
0954afb321
|
compatibility fixes
|
2018-09-01 15:51:44 -07:00 |
|
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 |
|
Mario Vavti
|
d377660b5a
|
update 1218: missing default value for pg
|
2018-08-31 20:26:31 +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
|
d00648f3e1
|
Merge branch 'red'
|
2018-08-30 21:27:20 -07:00 |
|
zotlabs
|
adb1f58b59
|
some edge cases
|
2018-08-30 19:19:32 -07:00 |
|
zotlabs
|
2b0c512087
|
re-parent by default unless there's a "go out on the web and find a parent for this post" plugin.
|
2018-08-30 18:50:21 -07:00 |
|
zotlabs
|
62e2df4c96
|
add conversation element and more logging
|
2018-08-29 23:54:13 -07:00 |
|
zotlabs
|
c48aae55af
|
more debugging
|
2018-08-29 22:22:06 -07:00 |
|
zotlabs
|
89d1be0343
|
better format of like/dislike text, grab object['id'] if inreplyto missing for these activities
|
2018-08-29 20:02:27 -07:00 |
|
Mario Vavti
|
42093aedcf
|
db update to get rid of bogus activitypub xchans which got created due to a bug in the pubcrawl addon
|
2018-08-29 13:57:36 +02:00 |
|
Mario Vavti
|
74d80473df
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-29 11:50:40 +02: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 |
|
zotlabs
|
7ecb337405
|
redirect stdout/stderr on cron command
|
2018-08-28 22:43:37 -07:00 |
|
zotlabs
|
cf8e787427
|
issues uncovered in federation tests
|
2018-08-28 19:49:30 -07:00 |
|
zotlabs
|
896d25d7ae
|
ap discovery issues
|
2018-08-28 18:37:21 -07:00 |
|
zotlabs
|
d7455e42c9
|
Merge branch 'zap'
|
2018-08-27 19:41:12 -07:00 |
|
zotlabs
|
68cc3d3048
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 19:40:59 -07:00 |
|
zotlabs
|
6cd48cbe83
|
handling linkid differently, remove this
|
2018-08-27 19:21:48 -07:00 |
|
zotlabs
|
25466def83
|
Merge branch 'zap'
|
2018-08-27 19:14:53 -07:00 |
|
zotlabs
|
fca5df656c
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 19:14:34 -07:00 |
|
zotlabs
|
aeffec1a99
|
typo
|
2018-08-27 19:13:55 -07:00 |
|
zotlabs
|
17ed268f9e
|
Merge branch 'zap'
|
2018-08-27 19:12:46 -07:00 |
|
zotlabs
|
1da14932e7
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 19:12:28 -07:00 |
|
zotlabs
|
199026bf6d
|
typo
|
2018-08-27 19:12:00 -07:00 |
|
zotlabs
|
23d89071b9
|
Merge branch 'zap'
|
2018-08-27 19:10:34 -07:00 |
|
zotlabs
|
8b297e7630
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 19:10:20 -07:00 |
|
zotlabs
|
08e8f026f0
|
typo
|
2018-08-27 19:09:48 -07:00 |
|
zotlabs
|
bc167e80ee
|
Merge branch 'zap'
|
2018-08-27 18:59:52 -07:00 |
|
zotlabs
|
90b02001fa
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 18:59:32 -07:00 |
|
zotlabs
|
b8ee94c00a
|
id linkage
|
2018-08-27 18:58:47 -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 |
|
M.Dent
|
a0c2bbac9d
|
Add hook to extend conv_item cog dropdown menu
|
2018-08-26 23:26:10 -04:00 |
|
Max Kostikov
|
42c5e98670
|
Update Wiki_page_history.php
|
2018-08-25 21:27:20 +02:00 |
|
Max Kostikov
|
c9b80a3612
|
Update Wiki.php
|
2018-08-25 21:26:50 +02:00 |
|
Max Kostikov
|
e78a4d61d8
|
Update NativeWikiPage.php
|
2018-08-25 21:25:26 +02:00 |
|
Max Kostikov
|
88ebcb56e7
|
Update Wiki_page_history.php
|
2018-08-25 21:23:08 +02:00 |
|
Max Kostikov
|
308dda1587
|
Update Wiki.php
|
2018-08-25 21:21:57 +02:00 |
|
Max Kostikov
|
67a9dd8497
|
Update NativeWikiPage.php
|
2018-08-25 21:20:00 +02:00 |
|
Mario Vavti
|
f036c25dca
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-24 14:44:45 +02:00 |
|
zotlabs
|
81193100d7
|
cleanup
|
2018-08-23 23:20:04 -07: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
|
73c25abb75
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-22 18:46:48 -07:00 |
|
zotlabs
|
0896061e89
|
better handling for calendar events
|
2018-08-22 18:45:53 -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
|
6ecd31a715
|
tweak archive widget for articles
|
2018-08-22 13:30:16 -07:00 |
|
Mario Vavti
|
cc03e1ceef
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-22 10:47:40 +02:00 |
|
zotlabs
|
42c4a0da51
|
Zot/Finger: ignore deleted hublocs
|
2018-08-21 21:38:10 -07:00 |
|
Mario Vavti
|
db853134e3
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-21 13:19:30 +02:00 |
|
Mario
|
5d2ac10073
|
Merge branch 'patch-17' into 'master'
Add missed app 'Order Apps'
See merge request hubzilla/core!1258
(cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7)
6086a70e Add missed app 'Order Apps'
|
2018-08-21 13:13:23 +02:00 |
|
zotlabs
|
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
|
066febdf40
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-08-20 20:20:57 -07:00 |
|
zotlabs
|
9b620b2a35
|
remove checkjs reloader from mod_display also
|
2018-08-20 20:07:54 -07:00 |
|
zotlabs
|
a9bbfe9c4f
|
Only show cover photos once per login session. After that they can get annoying. If there is pushback on this, then it should perhaps be optional.
|
2018-08-20 17:38:38 -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
|
791bc9d805
|
Merge branch 'zap'
|
2018-08-19 20:42:26 -07:00 |
|
zotlabs
|
8f65d100e6
|
add ap_probe
|
2018-08-19 20:41:32 -07:00 |
|
zotlabs
|
c4328b9090
|
osada updates
|
2018-08-19 20:39:23 -07:00 |
|
zotlabs
|
4c1bfdfae8
|
implement Activity::store
|
2018-08-19 18:38:18 -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
|
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
|
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 |
|
Mario Vavti
|
10c5b46e3b
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-14 13:04:37 +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
|
62925c4c3f
|
oidc cleanup and discovery
|
2018-08-13 20:24:04 -07:00 |
|
zotlabs
|
d95a1a34dd
|
put photo updated timestamp into actor record
|
2018-08-13 17:27:46 -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 |
|
M.Dent
|
9402f537b6
|
Fix root not added to internationalized template search
|
2018-08-12 19:02:11 -04: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
|
8769e5d68d
|
Merge branch 'zap'
|
2018-08-05 18:42:31 -07:00 |
|
zotlabs
|
e9ccc4bc9a
|
make Activity::encode_person() pluggable
|
2018-08-05 18:41:33 -07:00 |
|
zotlabs
|
c9e5ff4eb4
|
set osada specific permissionroles and features
|
2018-08-05 18:40:36 -07:00 |
|
zotlabs
|
cce9594f2b
|
changes to channel module to support osada
|
2018-08-05 17:25:43 -07:00 |
|
zotlabs
|
d94a12cd13
|
issue with http sigs and implicit keys
|
2018-08-04 20:35:27 -07:00 |
|
zotlabs
|
18ffded92a
|
handle tombstones
|
2018-08-03 19:26:16 -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
|
818f69474b
|
reduce the number of permission roles
|
2018-08-01 20:30:09 -07:00 |
|
zotlabs
|
082cd3953c
|
sync and directory issues
|
2018-08-01 17:58:54 -07:00 |
|
zotlabs
|
4d0611b7d4
|
hubzilla core issue #1258
|
2018-08-01 16:12:44 -07:00 |
|
zotlabs
|
54bf5d32bb
|
import announce activities from pure ActivityStreams sources
|
2018-07-31 20:15:00 -07:00 |
|
zotlabs
|
2062c154d1
|
more announce
|
2018-07-31 19:55:27 -07:00 |
|
zotlabs
|
4ccf54c3e9
|
handle announce decode better
|
2018-07-31 19:50:39 -07:00 |
|
zotlabs
|
680a7dd6b8
|
typo
|
2018-07-31 19:43:54 -07:00 |
|
zotlabs
|
7e723f9e79
|
better handling of announce
|
2018-07-31 19:39:50 -07:00 |
|