aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-037-393/+409
|\
| * backport small bits of the re-install fix; at least the damaging bitsredmatrix2015-11-031-6/+6
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-035-9/+28
| |\
| | * Update nl+esjeroenpraat2015-10-314-4/+14
| | * move it upMario Vavti2015-10-291-1/+1
| | * possibly better fix for profile photo image type issueMario Vavti2015-10-291-5/+14
| * | versionredmatrix2015-11-032-390/+389
| |/
| * 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-282-2/+10
| * do not treat profile photo change posts like photo-itemsMario Vavti2015-10-281-2/+6
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-252-1/+10
| |\
| | * hubzilla compatibility: improve photo item object - we now provide the infos ...Mario Vavti2015-10-251-1/+2
| | * photo object compatibility revampedMario Vavti2015-10-223-20/+9
| | * hubzilla photo object compatibilityMario Vavti2015-10-202-1/+20
| * | version and stringsredmatrix2015-10-252-3/+7
| |/
* | better re-install detection/protection. This necessitated a slight protocol c...redmatrix2015-11-032-24/+38
* | need better peer verification due to re-install issue, this is temporaryredmatrix2015-11-033-34/+45
* | provide admin setting to change directory serverredmatrix2015-11-033-4/+32
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-039-26/+38
|\ \
| * | Time for using my real namejeroenpraat2015-11-031-1/+1
| * | small update Ducth strings + fix dark schemajeroenpraat2015-11-033-21/+33
| * | timeago() works best with iso format. fix #118Mario Vavti2015-11-035-4/+4
* | | implement unfollow threadredmatrix2015-11-035-99/+41
|/ /
* | bug in hub/location syncredmatrix2015-11-021-4/+3
* | readabilityredmatrix2015-11-021-4/+4
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-021-0/+5
|\ \
| * \ Merge pull request #116 from HaakonME/masterredmatrix2015-11-031-0/+5
| |\ \
| | * | Changed default config to util/config system expire_delivery_reports 3 util/c...Haakon Meland Eriksen2015-11-021-0/+4
| | * | Added new directory server https://blablanet.comHaakon Meland Eriksen2015-11-021-1/+1
| | * | Added new directory server https://blablanet.comHaakon Meland Eriksen2015-11-021-0/+1
* | | | several more hidden configsredmatrix2015-11-021-1/+31
|/ / /
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-022-2/+2
|\ \ \
| * \ \ Merge pull request #117 from kenrestivo/add-rss-docsredmatrix2015-11-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Update RSS setting docs.ken restivo2015-11-021-1/+1
| * | | revert filtering by metworkMario Vavti2015-11-021-1/+1
* | | | directory docoredmatrix2015-11-023-1/+97
|/ / /
* | | provide discovery for local deletes in zot-finger and mark the hublocs invali...redmatrix2015-11-011-0/+9
* | | hubloc filtering to eliminate dead and deleted entriesredmatrix2015-11-011-1/+2
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-0125-1355/+1565
|\ \ \
| * | | More Bluegrid fine tuning and generic-content-wrapper-styled added to some tp...jeroenpraat2015-11-018-10/+53
| * | | remove zotid.net from fallback dir and add hubzilla.siteMario Vavti2015-11-011-1/+1
| * | | since other networks do not support cloning we only need hublocs for zot cont...Mario Vavti2015-11-011-1/+1
| * | | 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 branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-315-560/+671
| |\ \ \ \
| * | | | | 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
| | |_|/ / | |/| | |