Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #716 from dawnbreak/docu | git-marijus | 2017-04-14 | 1 | -260/+293 |
|\ | | | | | Some documentation for include/network.php and some fixes. | ||||
| * | Some documentation for include/network.php and some fixes. | Klaus Weidenbach | 2017-04-14 | 1 | -260/+293 |
| | | | | | | | | Some variables had wrong names and have never been used. | ||||
* | | missing includes | Mario Vavti | 2017-04-13 | 3 | -1/+3 |
|/ | |||||
* | bs font set might work better for win and mac | Mario Vavti | 2017-04-13 | 1 | -1/+0 |
| | |||||
* | bump version | Mario Vavti | 2017-04-13 | 1 | -1/+1 |
| | |||||
* | update bs-dev | Mario Vavti | 2017-04-13 | 14 | -803/+334 |
| | |||||
* | Merge pull request #715 from zotlabs/cpp | git-marijus | 2017-04-13 | 7 | -4/+25 |
|\ | | | | | backend infrastructure for 'channel protection password'; which will … | ||||
| * | typo | zotlabs | 2017-04-12 | 1 | -1/+1 |
| | | |||||
| * | make sure the new fields don't leak through sync packets and break older ↵ | zotlabs | 2017-04-12 | 1 | -0/+2 |
| | | | | | | | | versions | ||||
| * | backend infrastructure for 'channel protection password'; which will be used ↵ | zotlabs | 2017-04-12 | 6 | -5/+24 |
| | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes | ||||
* | | correct the mastodon "boost" (aka 'share') author attribution by checking ↵ | zotlabs | 2017-04-12 | 2 | -54/+86 |
| | | | | | | | | for share activities and pulling the original author info from the activity:object | ||||
* | | ugly hack to webfinger to allow connections to be made to mastodon servers. | zotlabs | 2017-04-12 | 1 | -3/+10 |
| | | |||||
* | | some signatures showing as invalid because of recent import_author_zot() ↵ | zotlabs | 2017-04-12 | 1 | -7/+25 |
| | | | | | | | | changes. | ||||
* | | Merge pull request #714 from mjfriaza/dev | git-marijus | 2017-04-11 | 2 | -11218/+10642 |
|\ \ | |/ |/| | Updated the Spanish translation | ||||
| * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-04-10 | 2 | -11218/+10642 |
| | | |||||
* | | Merge pull request #713 from zotlabs/photo-zero | git-marijus | 2017-04-08 | 1 | -0/+1 |
|\ \ | | | | | | | Photo zero | ||||
| * | | photo size-0 issue | zotlabs | 2017-04-07 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-07 | 5 | -11099/+10602 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #712 from zotlabs/fr_update | git-marijus | 2017-04-07 | 2 | -11080/+10559 |
|\ \ \ | | | | | | | | | Fr update (Monret) | ||||
| * | | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
| | | | | |||||
* | | | | remove redundant string | Mario Vavti | 2017-04-07 | 1 | -2/+1 |
| | | | | |||||
* | | | | the string was there but the template var was wrong | Mario Vavti | 2017-04-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | css fixes and missing string | Mario Vavti | 2017-04-07 | 2 | -15/+8 |
| | | | | |||||
* | | | | only log zot_refresh content if json decode was successful. | zotlabs | 2017-04-07 | 1 | -2/+2 |
| | | | | |||||
* | | | | revisit the import_author_zot algorithm yet again. There was one bug that we ↵ | zotlabs | 2017-04-07 | 1 | -2/+34 |
| | | | | | | | | | | | | | | | | weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site. | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-06 | 1 | -1/+1 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | import_author_xchan - since we rarely refresh zot-info for non-connections, ↵ | zotlabs | 2017-04-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | force a cache reload once a week to catch things like profile photo updates and location changes | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-05 | 15 | -102/+130 |
| |/| | | |/ / |/| | | |||||
* | | | we should probably stick to 0.875rem font-size (this is equal to 14px with a ↵ | Mario Vavti | 2017-04-05 | 2 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
* | | | adjust font-size | Mario Vavti | 2017-04-05 | 1 | -1/+1 |
| | | | |||||
* | | | update bd-dev and remove hotfix | Mario Vavti | 2017-04-05 | 8 | -60/+64 |
| | | | |||||
* | | | create site_store_lowlevel() to initialise data structures for the site table | zotlabs | 2017-04-04 | 4 | -39/+63 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-04-03 | 9 | -62/+101 |
| |\ \ | |/ / |/| | | |||||
* | | | sql error photos_albums_list with non-logged-in viewer | zotlabs | 2017-04-03 | 2 | -3/+6 |
| | | | |||||
* | | | fix connectDefaultShare generated js function, though it isn't obvious if we ↵ | zotlabs | 2017-04-03 | 1 | -19/+11 |
| | | | | | | | | | | | | still use it. | ||||
* | | | change hook for perm_is_allowed while retaining backwards compatibility | zotlabs | 2017-04-03 | 1 | -3/+4 |
| | | | |||||
* | | | import_author_zot() - check for both hubloc and xchan entries. This should ↵ | zotlabs | 2017-04-03 | 1 | -5/+14 |
| | | | | | | | | | | | | catch and repair entries which were subject to transient storage failures. | ||||
* | | | app sorting issue | zotlabs | 2017-04-03 | 1 | -3/+13 |
| | | | |||||
* | | | logic error | zotlabs | 2017-04-03 | 1 | -2/+4 |
| | | | |||||
* | | | import authors from any unrecognised network as network 'unknown'. | zotlabs | 2017-04-03 | 1 | -3/+3 |
| | | | |||||
* | | | whitespace | zotlabs | 2017-04-03 | 1 | -12/+14 |
| | | | |||||
* | | | Merge pull request #711 from zotlabs/crypto-upgrade | git-marijus | 2017-04-03 | 3 | -15/+35 |
|\ \ \ | | | | | | | | | crypto updates | ||||
| * | | | crypto updates | zotlabs | 2017-04-02 | 3 | -15/+35 |
|/ / / | |||||
| * | | Revert "fr strings update (Monret)" | zotlabs | 2017-04-03 | 2 | -10559/+11080 |
| | | | | | | | | | | | | This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e. | ||||
| * | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
|/ / | |||||
* | | triple a is more sane | Mario Vavti | 2017-03-31 | 1 | -1/+1 |
| | | |||||
* | | minor css adjustments | Mario Vavti | 2017-03-31 | 1 | -1/+5 |
| | | |||||
* | | various form css fixes | Mario Vavti | 2017-03-31 | 10 | -42/+38 |
| | | |||||
* | | make btn-outline-secondary color slightly darker | Mario Vavti | 2017-03-31 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-31 | 4 | -7/+8 |
|\ \ |