aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* backend infrastructure for 'channel protection password'; which will be used ...zotlabs2017-04-126-5/+25
* don't allow any null fields in notify creationzotlabs2017-04-111-2/+3
* webfinger cleanupzotlabs2017-04-111-20/+23
* correct the mastodon "boost" (aka 'share') author attribution by checking for...zotlabs2017-04-112-54/+86
* ugly hack to webfinger to allow connections to be made to mastodon servers.zotlabs2017-04-101-3/+10
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-090-0/+0
|\
| * Merge pull request #713 from zotlabs/photo-zerogit-marijus2017-04-081-0/+1
| |\
| | * 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 branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-061-1/+1
| | |\
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-0515-102/+130
| | |\ \
* | | | | some signatures showing as invalid because of recent import_author_zot() chan...zotlabs2017-04-091-7/+25
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-073-11094/+10565
|\| | | |
| * | | | Merge pull request #712 from zotlabs/fr_updategit-marijus2017-04-072-11080/+10559
| |\ \ \ \
| | * | | | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| | |/ / /
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-04-039-62/+101
| | |\ \ \
| | * | | | Revert "fr strings update (Monret)"zotlabs2017-04-032-10559/+11080
| | * | | | 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
| | |_|_|/ | |/| | |
* | | | | photo size-0 issuezotlabs2017-04-071-0/+1
* | | | | fix from downstreamzotlabs2017-04-072-1963/+1903
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-060-0/+0
|\| | | |
| * | | | import_author_xchan - since we rarely refresh zot-info for non-connections, f...zotlabs2017-04-061-1/+1
| | |_|/ | |/| |
* | | | only log zot_refresh content if json decode was successful.zotlabs2017-04-061-2/+2
* | | | revisit the import_author_zot algorithm yet again. There was one bug that we ...zotlabs2017-04-061-2/+34
* | | | revert grid and bars icon size changezotlabs2017-04-051-1/+1
* | | | make legal_webbie() pluggable - * this should not be merged with federated pr...zotlabs2017-04-054-17/+44
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-0512-63/+99
|\| | |
| * | | we should probably stick to 0.875rem font-size (this is equal to 14px with a ...Mario Vavti2017-04-052-2/+2
| * | | 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
| | |/ | |/|
| * | 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
| * | 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 ca...zotlabs2017-04-031-5/+14
| * | 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
| * | Merge pull request #711 from zotlabs/crypto-upgradegit-marijus2017-04-033-15/+35
| |\ \ | | |/ | |/|
| | * crypto updateszotlabs2017-04-023-15/+35
| |/
* | import_author_xchan - since we rarely refresh zot-info for non-connections, f...zotlabs2017-04-051-1/+1
* | legal_webbie() now provides different character rules depending on whether yo...zotlabs2017-04-031-25/+42
* | create site_store_lowlevel() to initialise data structures for the site tablezotlabs2017-04-034-39/+63
* | sql error photos_albums_list with non-logged-in viewerzotlabs2017-04-022-3/+6