Commit graph

24220 commits

Author SHA1 Message Date
zotlabs
14af391bf8 php warning 2020-01-27 18:32:13 -08:00
zotlabs
e687609713 update the bb autocompleter for polls 2020-01-27 18:16:59 -08:00
zotlabs
16df0712f0 poll update 2020-01-27 18:11:28 -08:00
zotlabs
de3af43e05 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2020-01-27 17:21:12 -08:00
zotlabs
e8023a6271 rev update 2020-01-27 17:19:44 -08:00
zotlabs
69f9cfeb64 more polls dev 2020-01-27 15:54:43 -08:00
Mario
f1b3c61401 fix function call 2020-01-26 15:23:53 +01:00
Zot
8b97844e2a Merge branch 'dev' into 'dev'
Fix typo

See merge request zot/zap!20
2020-01-22 07:35:57 +01:00
zotlabs
8572cf1650 Merge branch 'dev' of ../z into dev 2020-01-21 20:54:30 -08:00
zotlabs
b4bb336fd5 more work on polls 2020-01-21 20:54:05 -08:00
zotlabs
f63733a131 fix z_dns_check for ipv6, map poll objects 2020-01-21 13:07:41 -08:00
mjfriaza
3eb7821b62 Fix typo 2020-01-18 14:35:26 +01:00
zotlabs
d83bdf8b22 more event and poll work 2020-01-16 17:22:32 -08:00
zotlabs
01a1804b02 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2020-01-15 13:56:42 -08:00
Zot
851f37725f Merge branch 'dev' into 'dev'
Update Spanish strings

See merge request zot/zap!19
2020-01-15 22:55:31 +01:00
zotlabs
7a8f9670c0 allow inline svgs to federate as data urls 2020-01-14 21:48:28 -08:00
zotlabs
2695bded8f provide activitypub rendering of inline svg doodles 2020-01-14 20:02:13 -08:00
zotlabs
1f2bc909fa Merge branch 'dev' 2020-01-14 13:25:51 -08:00
zotlabs
3b2eabf0fd minor php warning 2020-01-14 13:25:22 -08:00
zotlabs
81b15e9331 rev update 2020-01-14 13:22:16 -08:00
zotlabs
fa8b5c7d5a cleanup 2020-01-14 12:14:34 -08:00
zotlabs
8190ba06b5 event testing - we require a zot6 handler for the /activity endpoint 2020-01-14 12:11:23 -08:00
zotlabs
e9719a2359 event federation testing zap/hubzilla 2020-01-13 17:30:13 -08:00
zotlabs
e1ecb67047 Merge branch 'dev' of /home/macgirvin/z into dev 2020-01-11 15:21:02 -08:00
zotlabs
9409225301 change Create/Event to Invite/Event per spec, still support RSVP to Create/Event 2020-01-11 14:53:39 -08:00
zotlabs
80d748b819 add FEDERATION.md 2020-01-08 21:19:53 -08:00
zotlabs
4c467068a9 convert HTML blockquote tags to unicode quotes when formatting content for projects which are hostile to HTML (e.g. Mastodon). 2020-01-07 15:47:27 -08:00
zotlabs
cc5f7446f9 Merge branch 'dev' 2020-01-07 13:57:15 -08:00
zotlabs
e92e2c4f7f minor permissions issue 2020-01-07 13:56:35 -08:00
mjfriaza
796e3d2f63 Update Spanish strings 2019-12-31 14:22:42 +01:00
zotlabs
e3d28864b4 append poll items instead of replace 2019-12-30 12:04:12 -08:00
zotlabs
017e1a6693 rev update 2019-12-29 20:39:43 -08:00
Mike Macgirvin
acc4217ec5 composer update 2019-12-30 15:28:55 +11:00
zotlabs
55cd642fba simple poll rendering 2019-12-28 13:28:40 -08:00
zotlabs
098400dd7a optimise http version check 2019-12-27 13:55:50 -08:00
zotlabs
1f6e86c82b Merge branch 'dev' 2019-12-25 17:42:52 -08:00
zotlabs
c4d7a92f33 rev update 2019-12-25 17:42:26 -08:00
zotlabs
edecdb345e fix for http/2 2019-12-25 17:11:41 -08:00
zotlabs
4ac5576417 z_post_url (curl): catch illegal line termination when pulling out header. 2019-12-25 13:43:37 -08:00
zotlabs
48abd24a4d Merge branch 'dev' 2019-12-24 14:36:48 -08:00
zotlabs
1e8a336066 rev update 2019-12-24 14:36:22 -08:00
zotlabs
e2bff4d4cc add debugging 2019-12-24 12:26:50 -08:00
zotlabs
ec4dde4722 make sure we have a crypto algorithm before attempting encryption 2019-12-23 11:54:55 -08:00
Zot
7ecdb97da4 Merge branch 'dev_homeinstall' into 'dev'
homeinstall - version of recently used script for two real live installations

See merge request zot/zap!18
2019-12-19 23:04:53 +01:00
OJ Random
ea67927b80 homeinstall - version of recently used script for two real live installations 2019-12-19 19:08:59 +01:00
zotlabs
b9204da526 Merge branch 'dev' 2019-12-18 12:19:22 -08:00
zotlabs
5b5f83036a rev update 2019-12-18 12:16:37 -08:00
zotlabs
86c22d1e53 address/mention url conflict 2019-12-17 15:28:24 -08:00
zotlabs
d70b22384f provide an event summary if there is anything at all we can use for that purpose. 2019-12-16 20:26:43 -08:00
zotlabs
2f64bc18a2 Merge branch 'dev' 2019-12-15 16:55:33 -08:00