zotlabs
|
6fd5bb36fb
|
implement old-style share as a post embed
|
2019-01-29 21:34:26 -08:00 |
|
zotlabs
|
2f493466f9
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-29 21:27:14 -08:00 |
|
zotlabs
|
8f861659d2
|
post embed
|
2019-01-29 21:26:52 -08:00 |
|
zotlabs
|
a3a32d16aa
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-29 18:19:44 -08:00 |
|
zotlabs
|
9eb9e10712
|
cache embeds on storage
|
2019-01-29 15:18:35 -08:00 |
|
zotlabs
|
f5125b51f1
|
add ical link to activitystreams event objects
|
2019-01-28 14:58:18 -08:00 |
|
zotlabs
|
e8c935e6e7
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-27 14:54:02 -08:00 |
|
zotlabs
|
3c0d9522b1
|
issue with fix to reshares
|
2019-01-27 14:53:24 -08:00 |
|
zotlabs
|
9ef39b3d6b
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-27 14:47:11 -08:00 |
|
zotlabs
|
9355ceb526
|
fn not found
|
2019-01-27 14:46:57 -08:00 |
|
zotlabs
|
8760b6d741
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-27 14:39:41 -08:00 |
|
zotlabs
|
f7f8416477
|
share fixes
|
2019-01-27 12:39:28 -08:00 |
|
zotlabs
|
7c155e130a
|
add util/admins
|
2019-01-26 12:31:07 -08:00 |
|
zotlabs
|
1c3d26fe83
|
remove unused zot6 'request' verb support
|
2019-01-26 12:30:18 -08:00 |
|
zotlabs
|
12af72a495
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-24 21:00:15 -08:00 |
|
zotlabs
|
a07ef38902
|
typo
|
2019-01-24 19:05:43 -08:00 |
|
zotlabs
|
c43173109e
|
minor fixes from upstream
|
2019-01-24 19:03:14 -08:00 |
|
zotlabs
|
18095904d1
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-23 17:55:51 -08:00 |
|
zotlabs
|
0bee1bdb49
|
missing file
|
2019-01-23 17:55:39 -08:00 |
|
zotlabs
|
ab9f1ae33c
|
wordsmithing
|
2019-01-23 16:18:05 -08:00 |
|
zotlabs
|
a20c94b041
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-23 14:38:20 -08:00 |
|
zotlabs
|
ad8c634b33
|
Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev
|
2019-01-23 14:29:01 -08:00 |
|
zotlabs
|
045debd26f
|
issues with autoperms, rewrite owa, upstream fixes to main.js
|
2019-01-23 14:27:51 -08:00 |
|
Mike Macgirvin
|
c0ea15c6e2
|
Merge branch 'dev' into 'dev'
Update colorbox.css to be slightly lighter
See merge request macgirvin/osada!13
|
2019-01-23 23:22:20 +01:00 |
|
Marek Lach
|
f35cc32bf3
|
Update colorbox.css to be slightly lighter
|
2019-01-23 20:53:12 +01:00 |
|
zotlabs
|
ea9c4572fb
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-22 19:13:14 -08:00 |
|
zotlabs
|
a4f638124b
|
content filter app
|
2019-01-22 19:11:53 -08:00 |
|
zotlabs
|
01d9f1154d
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-21 21:47:52 -08:00 |
|
zotlabs
|
56d61ae89b
|
disable online presence indication until there is a viable realtime chat
|
2019-01-21 21:47:16 -08:00 |
|
zotlabs
|
8e01d651d0
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-21 21:20:35 -08:00 |
|
zotlabs
|
df5e298628
|
remove backtrace on zlib/webfinger, no longer needed for troubleshooting
|
2019-01-21 21:19:41 -08:00 |
|
zotlabs
|
760ba24945
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-21 17:32:54 -08:00 |
|
zotlabs
|
1d3540ac6c
|
refactor include/follow (Connect::connect()) and update strings
|
2019-01-21 17:31:24 -08:00 |
|
zotlabs
|
1719986ba0
|
add spec directory
|
2019-01-21 15:56:07 -08:00 |
|
zotlabs
|
29a907c697
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-21 15:06:52 -08:00 |
|
zotlabs
|
cfd8209f0d
|
add "smoothed" koala artwork and change affinitiy slider background colour to match conversations
|
2019-01-21 15:06:21 -08:00 |
|
zotlabs
|
ca3b993e85
|
add "smoothed" koala artwork and change affinitiy slider background colour to match conversations
|
2019-01-21 15:05:06 -08:00 |
|
zotlabs
|
a2a57eb8ff
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-20 21:42:32 -08:00 |
|
zotlabs
|
8aa200df86
|
more work on cross-protocol follows with multiple xchans/hublocs
|
2019-01-20 21:42:04 -08:00 |
|
zotlabs
|
76d66184fc
|
more work on cross-protocol follows with multiple xchans/hublocs
|
2019-01-20 21:41:19 -08:00 |
|
zotlabs
|
e9c7e8ab04
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-20 19:40:38 -08:00 |
|
zotlabs
|
c40a502b0c
|
provide tracking for errant double json encoding on zot6 transmissions (infrequent)
|
2019-01-20 19:37:39 -08:00 |
|
zotlabs
|
35f1cee50b
|
more comment policy work
|
2019-01-20 15:52:44 -08:00 |
|
zotlabs
|
35fb50ace6
|
more comment policy work
|
2019-01-20 15:52:02 -08:00 |
|
zotlabs
|
b42f453f10
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-20 15:01:01 -08:00 |
|
zotlabs
|
714227c630
|
Merge branch 'dev'
|
2019-01-20 15:00:17 -08:00 |
|
zotlabs
|
4350a64f8d
|
be more specific about hubloc_network
|
2019-01-20 14:59:43 -08:00 |
|
zotlabs
|
67e868c425
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-20 14:41:23 -08:00 |
|
zotlabs
|
3239695ec3
|
Merge branch 'dev'
|
2019-01-20 14:40:44 -08:00 |
|
zotlabs
|
1bdd8b6c52
|
comment perm issue
|
2019-01-20 14:39:52 -08:00 |
|