zotlabs
|
23a67081d9
|
misc fixes from the logs and upstream
|
2019-02-05 19:01:17 -08:00 |
|
zotlabs
|
22f6ab103e
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-02-03 18:24:16 -08:00 |
|
zotlabs
|
af66054c1e
|
tests updated for handle_tag() changes, Firefox slider no longer honours background color if proprietary foreground is unset.
|
2019-02-03 18:22:30 -08:00 |
|
zotlabs
|
da09048a7d
|
linkify_tags fixes from upstream
|
2019-02-03 16:57:07 -08:00 |
|
zotlabs
|
362662751e
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-02-03 11:45:58 -08:00 |
|
zotlabs
|
25c160655f
|
fix for missing authors and a permission fix from upstream
|
2019-02-03 11:45:29 -08:00 |
|
zotlabs
|
e0299d7023
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-02-03 11:21:55 -08:00 |
|
zotlabs
|
342f6effe1
|
regression in latest queue work
|
2019-02-03 11:21:25 -08:00 |
|
zotlabs
|
cd4f453c4c
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-02-01 13:12:01 -08:00 |
|
zotlabs
|
9c1159db0a
|
missing paren
|
2019-02-01 13:11:20 -08:00 |
|
zotlabs
|
265406b91b
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-02-01 12:50:04 -08:00 |
|
zotlabs
|
ec88b2e1fa
|
Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev
|
2019-02-01 12:48:25 -08:00 |
|
zotlabs
|
77e84a70a9
|
better handling of tombstones
|
2019-02-01 12:47:34 -08:00 |
|
zotlabs
|
d179a7694e
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-31 16:29:20 -08:00 |
|
zotlabs
|
f31749d4ec
|
change privacy hover message when $privacy_warning in effect
|
2019-01-31 16:28:14 -08:00 |
|
zotlabs
|
0f2e991c56
|
rename the sharing options and update the license for 2019
|
2019-01-31 15:54:37 -08:00 |
|
Mike Macgirvin
|
002d900514
|
Merge branch 'patch-20190110a' into 'dev'
FIX: memory exhaustion on exceptionally large message queues & multiple...
See merge request macgirvin/osada!12
|
2019-01-31 01:31:32 +01:00 |
|
zotlabs
|
4dcad056f6
|
Merge branch 'dev' of /home/macgirvin/osada into dev
|
2019-01-29 21:49:08 -08:00 |
|
zotlabs
|
ec6297c60b
|
federation issues with embedded posts
|
2019-01-29 21:48:45 -08:00 |
|
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 |
|