aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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
* | | 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, f...zotlabs2017-04-061-1/+1
* | | 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
| * 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
| * 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
| |/
* | Revert "fr strings update (Monret)"zotlabs2017-04-032-10559/+11080
* | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
|/
* 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
| |\
| | * :lock: Add CSRF protection for import and import_items.Klaus Weidenbach2017-03-304-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
* | add 'author_is_pmable()' function with plugin hooks to control whether or not...zotlabs2017-03-313-3/+42
* | provide platform specific install scriptzotlabs2017-03-311-3/+5
* | provide compatibility with old-style update systemzotlabs2017-03-311-6/+16
* | get rid of 'davguest' and allow for project specific DB updates (currently db...zotlabs2017-03-314-2138/+2128
* | move db_upgrade to zlibzotlabs2017-03-316-199/+129
|/
* Merge pull request #709 from dawnbreak/docuKlaus2017-03-305-323/+465
|\
| * Add some documentation for import functions.Klaus Weidenbach2017-03-305-323/+465