dd83f6f356
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-08-02 10:56:47 +02:00
69354e808f
this should sort out likes showing up as wall-to-wall posts on diaspora
redmatrix
2016-08-01 22:12:44 -07:00
3a7d3e3a54
This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
redmatrix
2016-08-01 20:12:52 -07:00
55eda16b61
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-08-01 14:07:18 +02:00
3d0c90cbc5
allow individual permissions on atokens
redmatrix
2016-07-31 23:17:07 -07:00
9b9621e10d
add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl)
redmatrix
2016-07-31 20:14:25 -07:00
86eb923f29
make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit.
redmatrix
2016-07-31 18:08:41 -07:00
5e5ec5a66a
catch all input fields (in preparation for acl in this place) and display the files to upload in the right order
Mario Vavti
2016-07-29 11:30:33 +02:00
856133b07d
fix it strings after merge stuffup
redmatrix
2016-07-28 16:53:18 -07:00
0b2d809309
github didn't accept the last push. Touching the files to force a git revision
redmatrix
2016-07-27 22:40:33 -07:00
ec383aca03
Updated language files for release
jeroenpraat
2016-07-28 21:33:02 +02:00
8925e0c6c9
Fixed bug where multiple post attachements by drag-and-drop were not being added to the post content.
Andrew Manning
2016-07-28 19:21:33 -04:00
500ee4c1bf
re-implement progress-bar to work with all browsers
Mario Vavti
2016-07-28 16:35:27 +02:00
fc105cf141
reusing the original form did not work so well via xhr upload - let us create a new form for this action. revert progressbar- only works nice in firefox
Mario Vavti
2016-07-28 15:35:45 +02:00
18f0961caa
Update DE translation strings
phellmes
2016-07-28 14:09:29 +02:00
e65949f594
make progressbar slightly more transparent and give it a default width of 3px to indicate which files are to be uploaded
Mario Vavti
2016-07-28 11:54:42 +02:00
b05c1a9829
use single quote for js and double quote for html with proper escapes and implement a simple progressbar
Mario Vavti
2016-07-28 11:45:57 +02:00
9fa3956aa8
translate mime types to icons, update some icons, move file preview (upload progress) below table header
Mario Vavti
2016-07-28 10:28:48 +02:00
02fc082e45
github didn't accept the last push. Touching the files to force a git revision
redmatrix
2016-07-27 22:40:33 -07:00
be1ffca6f4
fix italian strings (messed up by rtl variable); and finish removing openid from core
redmatrix
2016-07-27 22:28:30 -07:00
932aeebcf1
Enhanced visual feedback for file drag hover
Andrew Manning
2016-07-27 21:03:41 -04:00
5f3a8cbe93
add the hidden flag also
redmatrix
2016-07-27 16:14:46 -07:00
f808f1601b
rework drag and drop to drag directly into files area, implement the default upload button to work with the same mechanism as drag and drop, revert 560af7a5b8 since it did not work so well with the new cloud upload mechanism
Mario Vavti
2016-07-27 16:49:55 +02:00
e5a3179468
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-07-27 09:31:20 +02:00
redmatrix
Mario Vavti
zottel
Andrew Manning
jeroenpraat
Einer von Vielen
phellmes