aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-181-1/+10
|\
| * Merge pull request #721 from zotlabs/client_e2eegit-marijus2017-04-181-1/+10
| |\ | | | | | | allow downloading via viewsrc to support client side e2ee
| | * allow downloading via viewsrc to support client side e2eezotlabs2017-04-171-1/+10
| |/
* / the caret beside the lock seems a little overkillMario Vavti2017-04-183-3/+3
|/
* missing clearfixMario Vavti2017-04-161-1/+1
|
* css fixesMario Vavti2017-04-161-4/+4
|
* Merge pull request #717 from dawnbreak/simplepiegit-marijus2017-04-1559-15887/+21031
|\ | | | | :arrow_up: Update SimplePie library.
| * We do not parse the body in discover_by_url(), so no need to preserve ↵Klaus Weidenbach2017-04-151-7/+1
| | | | | | | | iframes in SimplePie.
| * :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-1559-15886/+21036
|/ | | | | | | | | | | As a follow up to issue #699 update SimplePie from 1.2.1-dev (around 6years old) to current git master (1.4.4-dev). We use the master branch until the next release because it contains our patch for enclosure titles already. The other patches in the library from us can be done by configuring the SimplePie object in our code instead. Used composer to manage this library and use class autoloading. Add some unit tests for include/feedutils.php, but the interesting parts are unfortunately not testable with the current code.
* Merge pull request #716 from dawnbreak/docugit-marijus2017-04-141-260/+293
|\ | | | | Some documentation for include/network.php and some fixes.
| * Some documentation for include/network.php and some fixes.Klaus Weidenbach2017-04-141-260/+293
| | | | | | | | Some variables had wrong names and have never been used.
* | missing includesMario Vavti2017-04-133-1/+3
|/
* bs font set might work better for win and macMario Vavti2017-04-131-1/+0
|
* bump versionMario Vavti2017-04-131-1/+1
|
* update bs-devMario Vavti2017-04-1314-803/+334
|
* Merge pull request #715 from zotlabs/cppgit-marijus2017-04-137-4/+25
|\ | | | | backend infrastructure for 'channel protection password'; which will …
| * typozotlabs2017-04-121-1/+1
| |
| * make sure the new fields don't leak through sync packets and break older ↵zotlabs2017-04-121-0/+2
| | | | | | | | versions
| * backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-126-5/+24
| | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
* | correct the mastodon "boost" (aka 'share') author attribution by checking ↵zotlabs2017-04-122-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.zotlabs2017-04-121-3/+10
| |
* | some signatures showing as invalid because of recent import_author_zot() ↵zotlabs2017-04-121-7/+25
| | | | | | | | changes.
* | Merge pull request #714 from mjfriaza/devgit-marijus2017-04-112-11218/+10642
|\ \ | |/ |/| Updated the Spanish translation
| * Updated the Spanish translationManuel Jiménez Friaza2017-04-102-11218/+10642
| |
* | Merge pull request #713 from zotlabs/photo-zerogit-marijus2017-04-081-0/+1
|\ \ | | | | | | Photo zero
| * | photo size-0 issuezotlabs2017-04-071-0/+1
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-075-11099/+10602
| |\ \ | |/ / |/| |
* | | Merge pull request #712 from zotlabs/fr_updategit-marijus2017-04-072-11080/+10559
|\ \ \ | | | | | | | | Fr update (Monret)
| * | | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| | | |
* | | | remove redundant stringMario Vavti2017-04-071-2/+1
| | | |
* | | | the string was there but the template var was wrongMario Vavti2017-04-071-1/+1
| | | |
* | | | css fixes and missing stringMario Vavti2017-04-072-15/+8
| | | |
* | | | only log zot_refresh content if json decode was successful.zotlabs2017-04-071-2/+2
| | | |
* | | | revisit the import_author_zot algorithm yet again. There was one bug that we ↵zotlabs2017-04-071-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_mergezotlabs2017-04-061-1/+1
| | |\ \ | |_|/ / |/| | |
* | | | import_author_xchan - since we rarely refresh zot-info for non-connections, ↵zotlabs2017-04-061-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_mergezotlabs2017-04-0515-102/+130
| |/| | | |/ / |/| |
* | | we should probably stick to 0.875rem font-size (this is equal to 14px with a ↵Mario Vavti2017-04-052-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-sizeMario Vavti2017-04-051-1/+1
| | |
* | | update bd-dev and remove hotfixMario Vavti2017-04-058-60/+64
| | |
* | | create site_store_lowlevel() to initialise data structures for the site tablezotlabs2017-04-044-39/+63
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-039-62/+101
| |\ \ | |/ / |/| |
* | | sql error photos_albums_list with non-logged-in viewerzotlabs2017-04-032-3/+6
| | |
* | | fix connectDefaultShare generated js function, though it isn't obvious if we ↵zotlabs2017-04-031-19/+11
| | | | | | | | | | | | still use it.
* | | change hook for perm_is_allowed while retaining backwards compatibilityzotlabs2017-04-031-3/+4
| | |
* | | import_author_zot() - check for both hubloc and xchan entries. This should ↵zotlabs2017-04-031-5/+14
| | | | | | | | | | | | catch and repair entries which were subject to transient storage failures.
* | | app sorting issuezotlabs2017-04-031-3/+13
| | |
* | | logic errorzotlabs2017-04-031-2/+4
| | |
* | | import authors from any unrecognised network as network 'unknown'.zotlabs2017-04-031-3/+3
| | |
* | | whitespacezotlabs2017-04-031-12/+14
| | |