aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | reference to deprecated function import_author_diaspora in socgraph.phpzotlabs2017-04-021-9/+1
* | remove some obsolete permissions stuffzotlabs2017-04-022-415/+6
* | fix connectDefaultShare generated js function, though it isn't obvious if we ...zotlabs2017-04-021-19/+11
* | change hook for perm_is_allowed while retaining backwards compatibilityzotlabs2017-04-021-3/+4
* | import_author_zot() - check for both hubloc and xchan entries. This should ca...zotlabs2017-04-021-5/+14
* | app sorting issuezotlabs2017-04-021-3/+13
* | logic errorzotlabs2017-04-021-2/+4
* | import authors from any unrecognised network as network 'unknown'.zotlabs2017-04-021-3/+3
* | harden securityzotlabs2017-04-021-10/+26
* | use aes-ctr which is slightly/arguably better than a poke in the eye and don'...zotlabs2017-04-013-20/+7
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-3114-60/+60
|\|
| * triple a is more saneMario Vavti2017-03-311-1/+1
| * minor css adjustmentsMario Vavti2017-03-311-1/+5
| * various form css fixesMario Vavti2017-03-3110-42/+38
| * make btn-outline-secondary color slightly darkerMario Vavti2017-03-311-0/+4
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-314-7/+8
| |\
| | * Merge pull request #710 from dawnbreak/importcsrfgit-marijus2017-03-314-7/+8
| | |\
| * | | css fixesMario Vavti2017-03-313-17/+9
| |/ /
| * | add max height to #navbar-collapse-2Mario Vavti2017-03-312-0/+2
| * | version bumpMario Vavti2017-03-311-1/+1
| * | regenerate hmessages.poMario Vavti2017-03-311-6525/+6399
| * | fix a couple more instances where we were still calling mail() directly for s...zotlabs2017-03-311-27/+27
| * | get rid of some more deprecated uses of $azotlabs2017-03-313-9/+7
| * | remove obsolete app argument from load_pdlzotlabs2017-03-313-3/+3
| * | get rid of get_app()zotlabs2017-03-317-30/+3