Commit graph

19277 commits

Author SHA1 Message Date
zotlabs
9d425b4727 typo 2017-04-12 18:48:30 -07:00
zotlabs
07d62bc111 typo 2017-04-12 18:48:06 -07:00
zotlabs
91d0f87181 make sure the new fields don't leak through sync packets and break older versions 2017-04-12 18:46:41 -07:00
zotlabs
1c32564536 backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes 2017-04-12 18:46:15 -07:00
zotlabs
da07108be9 make sure the new fields don't leak through sync packets and break older versions 2017-04-12 17:43:27 -07:00
zotlabs
d7f4526a00 backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes 2017-04-12 17:32:28 -07:00
zotlabs
63dd6ad01a don't allow any null fields in notify creation 2017-04-11 23:05:56 -07:00
zotlabs
7b173a75e4 correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object 2017-04-12 07:04:22 +02:00
zotlabs
cb5a047e5d ugly hack to webfinger to allow connections to be made to mastodon servers. 2017-04-12 07:04:10 +02:00
zotlabs
ed5abe5981 some signatures showing as invalid because of recent import_author_zot() changes. 2017-04-12 07:03:20 +02:00
zotlabs
940534e303 webfinger cleanup 2017-04-11 22:02:29 -07:00
zotlabs
1609473e5d correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object 2017-04-11 20:17:22 -07:00
git-marijus
1f951e2bd3 Merge pull request #714 from mjfriaza/dev
Updated the Spanish translation
2017-04-11 06:55:12 +02:00
zotlabs
ed8e4962b9 ugly hack to webfinger to allow connections to be made to mastodon servers. 2017-04-10 20:31:45 -07:00
Manuel Jiménez Friaza
10f9f9cc80 Updated the Spanish translation 2017-04-10 12:50:42 +02:00
zotlabs
56c8e00b84 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-09 20:27:54 -07:00
zotlabs
063577c19e some signatures showing as invalid because of recent import_author_zot() changes. 2017-04-09 20:25:41 -07:00
git-marijus
57f20c0c22 Merge pull request #713 from zotlabs/photo-zero
Photo zero
2017-04-08 10:15:40 +02:00
zotlabs
e682b93883 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-07 15:00:31 -07:00
zotlabs
a32b097e3c photo size-0 issue 2017-04-07 14:57:29 -07:00
zotlabs
2ebf76cd50 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-04-07 14:56:53 -07:00
zotlabs
65e5894363 photo size-0 issue 2017-04-07 14:56:12 -07:00
zotlabs
dbef80f7bd fix from downstream 2017-04-07 13:37:18 -07:00
git-marijus
06b0c89aee Merge pull request #712 from zotlabs/fr_update
Fr update (Monret)
2017-04-07 21:00:37 +02:00
Mario Vavti
113bfe8fa2 remove redundant string 2017-04-07 18:41:13 +02:00
Mario Vavti
df4e193990 the string was there but the template var was wrong 2017-04-07 13:35:17 +02:00
Mario Vavti
28207c3313 css fixes and missing string 2017-04-07 11:31:10 +02:00
zotlabs
e685c580f2 only log zot_refresh content if json decode was successful. 2017-04-07 11:08:55 +02:00
zotlabs
e6139c9f49 revisit the import_author_zot algorithm yet again. There was one bug that we weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site. 2017-04-07 11:08:26 +02:00
zotlabs
1352e334b1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-06 20:07:15 -07:00
zotlabs
69ab6639b2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-04-06 20:05:53 -07:00
zotlabs
d52ee7ae27 only log zot_refresh content if json decode was successful. 2017-04-06 19:55:43 -07:00
zotlabs
ebcfc7f2b2 revisit the import_author_zot algorithm yet again. There was one bug that we weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site. 2017-04-06 16:24:19 -07:00
zotlabs
b347e1d861 import_author_xchan - since we rarely refresh zot-info for non-connections, force a cache reload once a week to catch things like profile photo updates and location changes 2017-04-06 20:19:27 +02:00
zotlabs
8cb4a29a51 revert grid and bars icon size change 2017-04-05 19:21:27 -07:00
zotlabs
9fb08fb502 make legal_webbie() pluggable - * this should not be merged with federated projects unless the federation drivers make use of the hooks. 2017-04-05 19:08:43 -07:00
zotlabs
6710a77c26 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-05 17:14:11 -07:00
zotlabs
e442fe753e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-04-05 17:11:35 -07:00
zotlabs
a4685e6df3 import_author_xchan - since we rarely refresh zot-info for non-connections, force a cache reload once a week to catch things like profile photo updates and location changes 2017-04-05 17:08:13 -07:00
Mario Vavti
a4f6c24273 we should probably stick to 0.875rem font-size (this is equal to 14px with a default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size. 2017-04-05 21:34:36 +02:00
Mario Vavti
53853814ff adjust font-size 2017-04-05 21:13:48 +02:00
Mario Vavti
fb31f629c6 update bd-dev and remove hotfix 2017-04-05 14:12:18 +02:00
zotlabs
50612565e9 create site_store_lowlevel() to initialise data structures for the site table 2017-04-04 10:02:33 +02:00
zotlabs
a92256e1cb legal_webbie() now provides different character rules depending on whether you federate or not. Added some comments in a few places that needed them. 2017-04-03 22:13:12 -07:00
zotlabs
d6c23486d5 create site_store_lowlevel() to initialise data structures for the site table 2017-04-03 16:43:30 -07:00
zotlabs
d2bafdb2bf fr strings update (Monret) 2017-04-03 15:56:47 -07:00
zotlabs
f2f2b534e6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-04-03 15:55:22 -07:00
zotlabs
2d9ae8ff2c Revert "fr strings update (Monret)"
This reverts commit 4e4d406d23.
2017-04-03 15:55:03 -07:00
zotlabs
4e4d406d23 fr strings update (Monret) 2017-04-03 15:53:48 -07:00
zotlabs
a9bda2b12e sql error photos_albums_list with non-logged-in viewer 2017-04-03 10:55:42 +02:00