Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-01 | 25 | -1355/+1565 |
|\ | |||||
| * | More Bluegrid fine tuning and generic-content-wrapper-styled added to some ↵ | jeroenpraat | 2015-11-01 | 8 | -10/+53 |
| | | | | | | | | tpl-files and 2 php files, cause they dont have a tpl file. | ||||
| * | remove zotid.net from fallback dir and add hubzilla.site | Mario Vavti | 2015-11-01 | 1 | -1/+1 |
| | | |||||
| * | since other networks do not support cloning we only need hublocs for zot ↵ | Mario Vavti | 2015-11-01 | 1 | -1/+1 |
| | | | | | | | | contacts - fix #111 | ||||
| * | make sure we only have one profile photo for a cloned channel | Mario Vavti | 2015-11-01 | 2 | -16/+26 |
| | | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-01 | 9 | -1326/+1470 |
| |\ | |||||
| | * | Fix youtube and vimeo for Diaspora posts. Remove empty zrl's from Diaspora ↵ | jeroenpraat | 2015-10-31 | 1 | -4/+7 |
| | | | | | | | | | | | | posts (fixes also the not working and only translated into default hub language 'view full size'). Please revert when wrong. | ||||
| | * | update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. | jeroenpraat | 2015-10-31 | 6 | -1318/+1449 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-31 | 5 | -560/+671 |
| |\ \ | |||||
| * | | | make attachments appear in a dropdown in wall-item-tools-left | Mario Vavti | 2015-10-31 | 4 | -18/+19 |
| | | | | |||||
| * | | | fix photo item for search_item.tpl and a minor css fix | Mario Vavti | 2015-10-30 | 3 | -3/+3 |
| | | | | |||||
| * | | | possibly improve cloned profile images a bit - mod/photo would pick some ↵ | Mario Vavti | 2015-10-30 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | random photos if there are more than one kind of PHOTO_PROFILE | ||||
* | | | | improve /locs page with some field notes and the ability to do a forced sync | redmatrix | 2015-11-01 | 4 | -2/+25 |
| |_|/ |/| | | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-31 | 1 | -1/+9 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #110 from kenrestivo/add-directory-docs | redmatrix | 2015-10-31 | 1 | -1/+9 |
| |\ \ | | | | | | | | | Add directory docs | ||||
| | * | | Add directory docs based on my (possibly incorrect/incomplete?) reading of ↵ | ken restivo | 2015-10-30 | 1 | -1/+9 |
| | |/ | | | | | | | | | | https://macgirvin.com/display/4acdbf7403aa244044d403820274b1b1142f57bbc0b38d0ea0e35e49f36eceb7@macgirvin.com | ||||
* | / | make hubloc repair script a bit more selective | redmatrix | 2015-10-31 | 2 | -4/+14 |
|/ / | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-30 | 1 | -2/+2 |
|\| | |||||
| * | Merge pull request #107 from kenrestivo/fix-audio-preload | redmatrix | 2015-10-30 | 1 | -2/+2 |
| |\ | | | | | | | Save bandwidth on mobile networks. | ||||
| | * | Save bandwidth on mobile networks. | ken restivo | 2015-10-29 | 1 | -2/+2 |
| | | | |||||
* | | | add hubloc repair script (needed for deadsuperhero, probably temporary) | redmatrix | 2015-10-30 | 4 | -559/+662 |
|/ / | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-29 | 4 | -10/+6 |
|\ \ | |||||
| * | | fix #83 | Mario Vavti | 2015-10-29 | 2 | -2/+3 |
| | | | |||||
| * | | update to latest object | Mario Vavti | 2015-10-29 | 1 | -3/+2 |
| | | | |||||
| * | | move it up | Mario Vavti | 2015-10-29 | 1 | -1/+1 |
| | | | |||||
| * | | possibly better fox for profil photo image type issue | Mario Vavti | 2015-10-29 | 1 | -5/+1 |
| | | | |||||
* | | | issue #106 | redmatrix | 2015-10-29 | 1 | -5/+9 |
|/ / | |||||
* | | add entry for 'none' | redmatrix | 2015-10-29 | 1 | -10/+12 |
| | | |||||
* | | This may take a few iterations to discover the best way to present the ↵ | redmatrix | 2015-10-29 | 3 | -3/+24 |
| | | | | | | | | information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff. | ||||
* | | add text hint how to set language in connection filter | redmatrix | 2015-10-28 | 1 | -2/+2 |
| | | |||||
* | | fix the typo | redmatrix | 2015-10-28 | 1 | -1/+1 |
| | | |||||
* | | photos linked item visibility issue | redmatrix | 2015-10-28 | 2 | -1/+15 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-28 | 2 | -2/+11 |
|\ \ | |||||
| * \ | Merge pull request #105 from HaakonME/master | redmatrix | 2015-10-29 | 1 | -1/+3 |
| |\ \ | | | | | | | | | Updated Hubzilla on OpenShift help page to clarify hosting for three … | ||||
| | * | | Updated Hubzilla on OpenShift help page to clarify hosting for three gears ↵ | Haakon Meland Eriksen | 2015-10-28 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | is available at no cost as of this writing, 2015-10-28 | ||||
| * | | | re-enable pathinfo() check and try with getimagesize() if we have not got a ↵ | Mario Vavti | 2015-10-28 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | result | ||||
| * | | | pathinfo() does not work in this case. getimagesize() seems more reliabel. ↵ | Mario Vavti | 2015-10-28 | 1 | -0/+8 |
| |/ / | | | | | | | | | | this fixes transparent png avatars having a black background. | ||||
* / / | restrict sslify to img tags by default - set config system.sslify_everything ↵ | redmatrix | 2015-10-28 | 3 | -3/+13 |
|/ / | | | | | | | if you want to proxy media files also. | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-27 | 3 | -3/+33 |
|\ \ | |||||
| * | | Merge pull request #103 from kenrestivo/status-message | redmatrix | 2015-10-28 | 1 | -0/+1 |
| |\| | | | | | | | Add status monitor widget from Travis. | ||||
| | * | Add status monitor widget from Travis. | ken restivo | 2015-10-27 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #102 from kenrestivo/upload-fixes | redmatrix | 2015-10-28 | 2 | -3/+32 |
| |\ | | | | | | | Handle file names with more than one dot. | ||||
| | * | Add rudimentary unit test for z_mime_content_type. | ken restivo | 2015-10-27 | 1 | -0/+29 |
| | | | |||||
| | * | Support files with names like foo.0.1.3.ogg | ken restivo | 2015-10-27 | 1 | -3/+3 |
| |/ | |||||
* / | api posting with htmlstatus fails if it doesn't contain any html tags issue #104 | redmatrix | 2015-10-27 | 1 | -1/+3 |
|/ | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-27 | 12 | -25/+125 |
|\ | |||||
| * | Merge pull request #101 from kenrestivo/kens-fixes | redmatrix | 2015-10-28 | 2 | -1/+50 |
| |\ | | | | | | | Add YML file for travis CI suite, fix MIME types for audio files | ||||
| | * | Add yml file for travis, as an experiment. | ken restivo | 2015-10-27 | 1 | -0/+46 |
| | | | |||||
| | * | Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensions | ken restivo | 2015-10-27 | 1 | -1/+4 |
| |/ | |||||
| * | More fine tuning bluegrid schema. Extra generic-wrapper-styled. | jeroenpraat | 2015-10-27 | 7 | -14/+58 |
| | |