Commit graph

23683 commits

Author SHA1 Message Date
zotlabs
7e515085ff Merge branch 'dev' 2019-12-03 17:56:22 -08:00
zotlabs
77cec359f3 rev update 2019-12-03 17:55:54 -08:00
zotlabs
0c041a7c0a Merge branch 'dev' of ../p3 into dev 2019-12-03 17:55:15 -08:00
zotlabs
0157db1ca4 put dividers between pinned posts and regular posts 2019-12-03 17:54:13 -08:00
zotlabs
f611e8bb4f cleanup 2019-12-02 21:23:02 -08:00
zotlabs
aef13ffa29 cleanup template 2019-12-02 21:22:16 -08:00
zotlabs
640629166d cleanup 2019-12-02 21:09:14 -08:00
zotlabs
75ff9318fb pinned posts front end 2019-12-02 21:08:06 -08:00
zotlabs
39040df861 missing pinned post files 2019-12-02 18:44:32 -08:00
zotlabs
f0987c87fe backend for pinned post support - needs more work before it can be enabled 2019-12-02 18:42:59 -08:00
zotlabs
7d799b86a7 Merge branch 'dev' 2019-12-01 20:19:38 -08:00
zotlabs
0773d8e405 rev update 2019-12-01 16:37:25 -08:00
zotlabs
7159cb87ee Merge branch 'dev' of ../apfed into dev 2019-12-01 16:37:07 -08:00
zotlabs
fb17704cb8 mention issues 2019-12-01 16:35:19 -08:00
zotlabs
8d909a8c72 Merge branch 'dev' of ../p3 into dev 2019-11-28 14:07:04 -08:00
zotlabs
8a13280f3e don't permit changing a channel to or from a collection after initial channel creation. Doing so would need to choose or release the channel_parent and this is not implemented currently 2019-11-28 14:04:43 -08:00
zotlabs
d7647eea99 use a 410 instead 2019-11-26 21:33:27 -08:00
zotlabs
ecfcb61b09 empty channel 2019-11-26 21:29:48 -08:00
zotlabs
44bb8410db Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-11-26 21:00:55 -08:00
Zot
89208c7dd2 Merge branch 'dev' into 'dev'
Best options for some strings in Spanish translation

See merge request zot/zap!16
2019-11-27 05:59:56 +01:00
zotlabs
f0c5d3f970 wrong return 2019-11-25 16:02:23 -08:00
zotlabs
2a0f71907c compound expression not allowed here 2019-11-25 15:54:23 -08:00
zotlabs
b6d236cb6e render app for activitypub 2019-11-25 15:48:14 -08:00
zotlabs
b1524e69c7 tag completion - check xchan_hash as well as xchan_url and xchan_addr 2019-11-24 19:59:12 -08:00
zotlabs
027d9e211d more html5 br conversions 2019-11-21 20:00:57 -08:00
zotlabs
27d7e8ada4 public search sql error, convert more br self-closing tags to html5 2019-11-21 17:34:49 -08:00
zotlabs
359e09187b issue with bb_parse_app 2019-11-21 02:32:22 -08:00
zotlabs
8b7765598b cleanup 2019-11-20 18:50:05 -08:00
zotlabs
1da7b9be47 deprecate any special handling for emojis. They are just text/font characters and should be supported by your operating system or device. If they aren't, browser plugins and apps are available. 2019-11-20 15:46:55 -08:00
zotlabs
1fc8c046ea ocap -> provide tokenised link for url so private activities of type Article can be fetched from Mastodon which converts everything to a link. This is not optimal and presents potential privacy issues because these ocap links are visible and can be shared but the only other solution is getting Mastodon to accept and display basic HTML content and they are unwilling to do so. This is actually a fairly serious security compromise on our part in order to be at all compatible with Mastodon and this decision may need to be reviewed in the future. 2019-11-19 15:02:52 -08:00
zotlabs
7626365890 Merge branch 'dev' of ../apfed into dev 2019-11-19 15:01:57 -08:00
zotlabs
f9f3297cfb navbar local search issue 2019-11-19 15:01:19 -08:00
mjfriaza
f1a6e9a953 Best options for some strings in Spanish translation 2019-11-19 11:37:24 +01:00
zotlabs
dc6f09c867 obscure the RSS contact feature until we find a way to federate the message-ids to Z6 and AP. 2019-11-18 19:08:46 -08:00
zotlabs
7fbee8d5de Merge branch 'dev' 2019-11-18 14:03:26 -08:00
zotlabs
41f3279adc hyperdrive issue 2019-11-18 14:02:54 -08:00
zotlabs
9ece89aa16 remove swipe calls for now - textareas broken. 2019-11-17 19:06:14 -08:00
zotlabs
fb51dfa776 testing menu swipe - not yet usable 2019-11-17 17:07:32 -08:00
zotlabs
8741f4c42c more logo work 2019-11-14 19:37:42 -08:00
zotlabs
ab6f341310 icon update 2019-11-14 19:15:52 -08:00
zotlabs
c0e39018fa Merge branch 'dev' 2019-11-14 16:08:14 -08:00
zotlabs
290067b3ca update 2019-11-14 16:07:58 -08:00
zotlabs
e9161b9ce3 Merge branch 'dev' of ../p3 into dev 2019-11-14 14:47:32 -08:00
zotlabs
cec2f36e76 typo 2019-11-14 14:47:15 -08:00
zotlabs
036bedae89 saved (star) posts brought back, ap refresh implemented 2019-11-14 14:45:55 -08:00
zotlabs
b0eb7e2c6d Merge branch 'dev' of ../p3 into dev 2019-11-13 17:36:41 -08:00
zotlabs
ff0534ab49 whitespace only 2019-11-13 17:36:18 -08:00
zotlabs
5cf5f15acc Merge branch 'dev' of ../p3 into dev 2019-11-13 17:09:22 -08:00
zotlabs
9248f71d0f pf federation issues 2019-11-13 17:08:18 -08:00
zotlabs
d853cae642 Merge branch 'dev' 2019-11-12 21:04:51 -08:00