Commit graph

14735 commits

Author SHA1 Message Date
redmatrix
de697a4267 issue #86 - like/dislike in photos not working 2015-10-14 14:16:16 -07:00
redmatrix
b2d949ce9a issue #82 - args not defined (should be arr) 2015-10-14 13:25:58 -07:00
redmatrix
9b4d32b68c Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-14 13:19:52 -07:00
redmatrix
f4e708a02f port of mail encoding 2015-10-14 13:19:28 -07:00
redmatrix
c7637a0c53 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-14 13:13:12 -07:00
redmatrix
9b1195c896 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-14 13:12:00 -07:00
redmatrix
732c6134dd support for mail sync 2015-10-14 13:11:24 -07:00
jeroenpraat
e98c871781 Regenerated messages.po. 2015-10-14 14:31:51 +02:00
redmatrix
d616099de6 Merge pull request #80 from git-marijus/master
fix /channel not updating after posting comment
2015-10-14 18:19:32 +11:00
Wave
e3070eb170 Merge pull request #81 from tuscanhobbit/master
Italian strings updated
2015-10-14 09:12:58 +02:00
Paolo Tacconi
319b02a757 Italian strings updated 2015-10-14 09:11:05 +02:00
redmatrix
64cdbb8e3b Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-13 16:19:33 -07:00
redmatrix
edeba4ca34 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/api.php
2015-10-13 16:19:25 -07:00
redmatrix
7e03f612b3 file migration - continued 2015-10-13 16:16:51 -07:00
redmatrix
578f1b8ece api extenesions for file migration 2015-10-13 16:15:34 -07:00
Mario Vavti
e2a15d0ec9 fix photo visibility switch on photo upload 2015-10-13 14:05:27 +02:00
Mario Vavti
3c74aec973 fix /channel not updating after posting comment 2015-10-13 12:05:55 +02:00
Mario Vavti
61e3ef2552 do not collapse content which is just slightly higher than we allow 2015-10-13 10:45:22 +02:00
redmatrix
136e5fdf95 port of file detail api call 2015-10-12 23:39:55 -07:00
redmatrix
75fe9f9cc4 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-12 23:37:35 -07:00
redmatrix
73dad85867 file detail api call (will not work for huge files) 2015-10-12 23:36:26 -07:00
redmatrix
91895c52ca missing underscore 2015-10-12 19:54:01 -07:00
redmatrix
fc28af8518 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/attach.php
2015-10-12 19:52:21 -07:00
redmatrix
3545626950 attach_list_files had some problems - wasn't used until now apparently 2015-10-12 19:49:06 -07:00
redmatrix
6a7079a594 small change to allow a person with sufficient privileges the ability to import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. 2015-10-12 18:55:02 -07:00
redmatrix
42db2bc93d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-12 16:16:14 -07:00
redmatrix
a2f5b55d10 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-12 16:12:51 -07:00
redmatrix
8e7e9b7040 version roll 2015-10-12 16:11:55 -07:00
jeroenpraat
43eefb5929 update es + nl strings 2015-10-13 00:43:23 +02:00
redmatrix
dcdcba9f1f Merge pull request #79 from HaakonME/master
Updated Help pages to include Hubzilla on OpenShift
2015-10-12 17:29:34 +11:00
Mario Vavti
dec37b3dbe another collapseHeight() fix 2015-10-11 22:58:59 +02:00
Mario Vavti
9431112f77 fix an issue with collapseHeight() and css margins/paddings in directory 2015-10-11 22:49:36 +02:00
Mario Vavti
7bdd5c9e0d Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-11 22:32:27 +02:00
Mario Vavti
c963aa98e8 some conv-item restructuring to allow full width elements 2015-10-11 22:32:06 +02:00
redmatrix
0f6e1c1c05 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-10-11 12:41:39 -07:00
redmatrix
ce8d49a47d Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-11 12:41:28 -07:00
redmatrix
70dc305f12 version roll 2015-10-11 12:40:23 -07:00
Haakon Meland Eriksen
df45374041 Updated Hubzilla on OpenShift HOWTO with use of logging 2015-10-11 14:32:01 +02:00
jeroenpraat
22a5a91bd5 Added Hubzilla banner to the Readme (for Github) 2015-10-11 00:05:41 +02:00
Haakon Meland Eriksen
d5788ba53a Updated help page for Hubzilla on OpenShift 2015-10-10 15:06:36 +02:00
Haakon Meland Eriksen
4d8a1c67c3 Updated help page for Hubzilla on OpenShift 2015-10-10 14:46:58 +02:00
Haakon Meland Eriksen
ea34e4bad8 Updated README for Hubzilla on OpenShift 2015-10-10 14:45:57 +02:00
Haakon Meland Eriksen
258e2d197a Updated help page for Hubzilla on OpenShift 2015-10-10 14:41:01 +02:00
Haakon Meland Eriksen
e75e09dae8 Updated help page for Hubzilla on OpenShift 2015-10-10 14:38:13 +02:00
Haakon Meland Eriksen
4aee8ba27f Added link to Hubzilla on OpenShift HOWTO using Projectname 2015-10-10 14:31:41 +02:00
Haakon Meland Eriksen
90c6276fe2 Added link to Hubzilla on OpenShift HOWTO 2015-10-10 14:28:17 +02:00
Haakon Meland Eriksen
1cae3baaea Hubzilla on OpenShift HOWTO added to Help 2015-10-10 14:24:35 +02:00
redmatrix
209882d5a9 Merge pull request #76 from kenrestivo/update-post-docs
Update the post docs adding how to post to a channel
2015-10-10 09:11:52 +11:00
redmatrix
2999096221 Merge pull request #77 from HaakonME/master
Updated Hubzilla on OpenShift README with HOWTO
2015-10-10 09:11:29 +11:00
redmatrix
d076255c98 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	mod/uexport.php
	view/tpl/uexport.tpl
2015-10-09 14:27:47 -07:00