Commit graph

14934 commits

Author SHA1 Message Date
redmatrix
d3183467e0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-01 15:52:35 -08:00
redmatrix
b62614bbd4 improve /locs page with some field notes and the ability to do a forced sync 2015-11-01 15:51:45 -08:00
jeroenpraat
618155e6ab More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file. 2015-11-01 22:59:32 +01:00
Mario Vavti
bd75d32c1b remove zotid.net from fallback dir and add hubzilla.site 2015-11-01 22:02:24 +01:00
Mario Vavti
5acfef8edb since other networks do not support cloning we only need hublocs for zot contacts - fix #111 2015-11-01 21:32:28 +01:00
Mario Vavti
7ce3ebc46d make sure we only have one profile photo for a cloned channel 2015-11-01 21:04:55 +01:00
Mario Vavti
0353b0e04f Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-01 11:17:04 +01:00
jeroenpraat
ca81ab784a Fix youtube and vimeo for Diaspora posts. Remove empty zrl's from Diaspora posts (fixes also the not working and only translated into default hub language 'view full size'). Please revert when wrong. 2015-10-31 22:38:16 +01:00
jeroenpraat
3262d819de update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. 2015-10-31 22:34:59 +01:00
redmatrix
a8cdbd44e8 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-31 13:59:08 -07:00
redmatrix
04820ba09e make hubloc repair script a bit more selective 2015-10-31 13:58:26 -07:00
Mario Vavti
d6d96e8c89 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-31 12:04:20 +01:00
redmatrix
2b34dd7373 Merge pull request #110 from kenrestivo/add-directory-docs
Add directory docs
2015-10-31 18:19:08 +11:00
redmatrix
7a87343c71 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-30 22:46:31 -07:00
redmatrix
5f80121637 add hubloc repair script (needed for deadsuperhero, probably temporary) 2015-10-30 22:43:38 -07:00
Mario Vavti
5920a96da7 make attachments appear in a dropdown in wall-item-tools-left 2015-10-31 00:38:01 +01:00
ken restivo
0acaa839b9 Add directory docs based on my (possibly incorrect/incomplete?) reading of https://macgirvin.com/display/4acdbf7403aa244044d403820274b1b1142f57bbc0b38d0ea0e35e49f36eceb7@macgirvin.com 2015-10-30 12:01:21 -07:00
Mario Vavti
f8b767ed32 fix photo item for search_item.tpl and a minor css fix 2015-10-30 18:46:16 +01:00
Mario Vavti
d0b0d0ec72 possibly improve cloned profile images a bit - mod/photo would pick some random photos if there are more than one kind of PHOTO_PROFILE 2015-10-30 15:08:28 +01:00
redmatrix
e0463f5a74 Merge pull request #107 from kenrestivo/fix-audio-preload
Save bandwidth on mobile networks.
2015-10-30 15:25:18 +11:00
ken restivo
1b30210120 Save bandwidth on mobile networks. 2015-10-29 20:50:52 -07:00
redmatrix
a1e28bb669 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-29 15:11:58 -07:00
redmatrix
dc4bd531a4 issue #106 2015-10-29 15:11:41 -07:00
Mario Vavti
c5aedb14a9 fix #83 2015-10-29 19:46:21 +01:00
Mario Vavti
ec28dee728 update to latest object 2015-10-29 12:58:32 +01:00
Mario Vavti
d66be62516 move it up 2015-10-29 11:34:30 +01:00
Mario Vavti
0a9b2b6b15 possibly better fox for profil photo image type issue 2015-10-29 11:29:11 +01:00
redmatrix
bb469deb85 add entry for 'none' 2015-10-29 01:35:49 -07:00
redmatrix
96402a2354 This may take a few iterations to discover the best way to present the 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. 2015-10-29 01:23:56 -07:00
redmatrix
4fec7aa991 add text hint how to set language in connection filter 2015-10-28 20:11:58 -07:00
redmatrix
b5dfc54be3 fix the typo 2015-10-28 19:45:02 -07:00
redmatrix
848e3f6c5d photos linked item visibility issue 2015-10-28 19:43:35 -07:00
redmatrix
1f5818cec8 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-28 16:59:23 -07:00
redmatrix
06ec5424c7 restrict sslify to img tags by default - set config system.sslify_everything if you want to proxy media files also. 2015-10-28 16:58:13 -07:00
redmatrix
b9551862b4 Merge pull request #105 from HaakonME/master
Updated Hubzilla on OpenShift help page to clarify hosting for three …
2015-10-29 10:06:20 +11:00
Mario Vavti
a5f1fa3168 re-enable pathinfo() check and try with getimagesize() if we have not got a result 2015-10-28 21:52:15 +01:00
Mario Vavti
1375ed6aea pathinfo() does not work in this case. getimagesize() seems more reliabel. this fixes transparent png avatars having a black background. 2015-10-28 20:01:50 +01:00
Haakon Meland Eriksen
52f06cabd2 Updated Hubzilla on OpenShift help page to clarify hosting for three gears is available at no cost as of this writing, 2015-10-28 2015-10-28 07:34:11 +01:00
redmatrix
612efe56f1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-27 21:18:03 -07:00
redmatrix
07c0bc7b04 api posting with htmlstatus fails if it doesn't contain any html tags issue #104 2015-10-27 21:16:59 -07:00
redmatrix
f5774bba6f Merge pull request #103 from kenrestivo/status-message
Add status monitor widget from Travis.
2015-10-28 14:49:09 +11:00
ken restivo
714832bb49 Add status monitor widget from Travis. 2015-10-27 20:15:58 -07:00
redmatrix
3bc8d4d0eb Merge pull request #102 from kenrestivo/upload-fixes
Handle file names with more than one dot.
2015-10-28 14:02:30 +11:00
ken restivo
8083a86581 Add rudimentary unit test for z_mime_content_type. 2015-10-27 19:53:27 -07:00
ken restivo
b3528c314a Support files with names like foo.0.1.3.ogg 2015-10-27 19:48:14 -07:00
redmatrix
65587be737 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-27 18:37:03 -07:00
redmatrix
9c24e1ccfb revision 2015-10-27 18:36:50 -07:00
redmatrix
0147186565 Merge pull request #101 from kenrestivo/kens-fixes
Add YML file for travis CI suite, fix MIME types for audio files
2015-10-28 12:28:34 +11:00
ken restivo
8924cb0960 Add yml file for travis, as an experiment. 2015-10-27 17:36:25 -07:00
ken restivo
869735e4b5 Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensions 2015-10-27 15:35:39 -07:00