aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make sure we only have one profile photo for a cloned channelMario Vavti2015-11-012-16/+26
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-019-1326/+1470
|\
| * Fix youtube and vimeo for Diaspora posts. Remove empty zrl's from Diaspora po...jeroenpraat2015-10-311-4/+7
| * update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.jeroenpraat2015-10-316-1318/+1449
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-311-1/+9
| |\
| * | make hubloc repair script a bit more selectiveredmatrix2015-10-312-4/+14
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-315-560/+671
|\ \ \ | | |/ | |/|
| * | Merge pull request #110 from kenrestivo/add-directory-docsredmatrix2015-10-311-1/+9
| |\ \ | | |/ | |/|
| | * Add directory docs based on my (possibly incorrect/incomplete?) reading of ht...ken restivo2015-10-301-1/+9
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-301-2/+2
| |\|
| * | add hubloc repair script (needed for deadsuperhero, probably temporary)redmatrix2015-10-304-559/+662
* | | make attachments appear in a dropdown in wall-item-tools-leftMario Vavti2015-10-314-18/+19
* | | fix photo item for search_item.tpl and a minor css fixMario Vavti2015-10-303-3/+3
* | | possibly improve cloned profile images a bit - mod/photo would pick some rand...Mario Vavti2015-10-301-0/+22
| |/ |/|
* | Merge pull request #107 from kenrestivo/fix-audio-preloadredmatrix2015-10-301-2/+2
|\ \ | |/ |/|
| * Save bandwidth on mobile networks.ken restivo2015-10-291-2/+2
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-294-10/+6
|\ \
| * | fix #83Mario Vavti2015-10-292-2/+3
| * | update to latest objectMario Vavti2015-10-291-3/+2
| * | move it upMario Vavti2015-10-291-1/+1
| * | possibly better fox for profil photo image type issueMario Vavti2015-10-291-5/+1
* | | issue #106redmatrix2015-10-291-5/+9
|/ /
* | add entry for 'none'redmatrix2015-10-291-10/+12
* | This may take a few iterations to discover the best way to present the inform...redmatrix2015-10-293-3/+24
* | add text hint how to set language in connection filterredmatrix2015-10-281-2/+2
* | fix the typoredmatrix2015-10-281-1/+1
* | photos linked item visibility issueredmatrix2015-10-282-1/+15
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-282-2/+11
|\ \
| * \ Merge pull request #105 from HaakonME/masterredmatrix2015-10-291-1/+3
| |\ \
| | * | Updated Hubzilla on OpenShift help page to clarify hosting for three gears is...Haakon Meland Eriksen2015-10-281-1/+3
| * | | re-enable pathinfo() check and try with getimagesize() if we have not got a r...Mario Vavti2015-10-281-3/+2
| * | | pathinfo() does not work in this case. getimagesize() seems more reliabel. th...Mario Vavti2015-10-281-0/+8
| |/ /
* / / restrict sslify to img tags by default - set config system.sslify_everything ...redmatrix2015-10-283-3/+13
|/ /
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-273-3/+33
|\ \
| * | Merge pull request #103 from kenrestivo/status-messageredmatrix2015-10-281-0/+1
| |\|
| | * Add status monitor widget from Travis.ken restivo2015-10-271-0/+1
| |/
| * Merge pull request #102 from kenrestivo/upload-fixesredmatrix2015-10-282-3/+32
| |\
| | * Add rudimentary unit test for z_mime_content_type.ken restivo2015-10-271-0/+29
| | * Support files with names like foo.0.1.3.oggken restivo2015-10-271-3/+3
| |/
* / api posting with htmlstatus fails if it doesn't contain any html tags issue #104redmatrix2015-10-271-1/+3
|/
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-2712-25/+125
|\
| * Merge pull request #101 from kenrestivo/kens-fixesredmatrix2015-10-282-1/+50
| |\
| | * Add yml file for travis, as an experiment.ken restivo2015-10-271-0/+46
| | * Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensionsken restivo2015-10-271-1/+4
| |/
| * More fine tuning bluegrid schema. Extra generic-wrapper-styled.jeroenpraat2015-10-277-14/+58
| * css fixesMario Vavti2015-10-271-2/+2
| * first the image than the bodyMario Vavti2015-10-271-1/+1
| * fix sharing of photo itemsMario Vavti2015-10-272-8/+15
* | revisionredmatrix2015-10-271-1/+1
|/
* Better -styled.jeroenpraat2015-10-271-1/+1