ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
0811d2e304
added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong
2013-10-15 17:52:06 +02:00
beaed2195d
fix comment
2013-10-15 17:36:52 +02:00
0d4117f6d5
added simple test for getFileSize proxy
2013-10-15 17:33:31 +02:00
e2cc7e7bf9
Fix avatar unittest
2013-10-15 17:23:47 +02:00
04ea419f50
Merge pull request #5334 from owncloud/files-sharing-actionsafterupload
...
Files sharing actions + navigation fixes
2013-10-15 08:11:17 -07:00
85d2c864d9
Merge pull request #5350 from owncloud/files-preventdeletemountpoint
...
Prevent renaming/deleting mount points
2013-10-15 07:24:14 -07:00
c6f14001bb
Fixed drag and drop upload to breadcrumb
2013-10-15 16:14:23 +02:00
92e646413a
Fixed drag and drop onto folders
...
Fixes #5351
2013-10-15 15:59:45 +02:00
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
8c25b5a0c1
Merge pull request #5295 from owncloud/show-eye-in-personal
...
Shows The Eye permanently in the Confirm Password field in Personal Settings
2013-10-15 02:59:53 -07:00
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
0b8273c768
test should work now
2013-10-15 11:53:32 +02:00
52501d6ba3
Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files
...
check if we are writing to user/files, otherwise skip encryption
2013-10-15 02:44:14 -07:00
a6d9319328
Merge pull request #5269 from owncloud/ocs_share_api_add_received_from
...
ocs share api: add "received_from" and "received_from_displayname" field
2013-10-15 02:17:23 -07:00
2def1a8853
Removes Bogus showpassword js. thx @PVince81
2013-10-15 14:41:18 +05:30
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
4eed240296
Should Display PasswordToggle Eye Everywhere.
2013-10-15 11:36:44 +05:30
7caf011b9a
fixing syntax for openssl config
2013-10-15 00:44:55 +02:00
bf99d9233c
on windows we supply an openssl.cnf file in order to execute the unit tests properly
2013-10-15 00:29:47 +02:00
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
86f6f0ca92
Merge branch 'master' into coverage-on-windows-master
2013-10-15 00:09:00 +02:00
2bb4527269
Merge pull request #5340 from owncloud/fixing-5251-master
...
streamCopy() should return proper structure.
2013-10-14 14:29:36 -07:00
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
8ac518bb3e
Show (group) after groups in share dropdown
2013-10-14 20:17:45 +02:00
4ae1d08241
Merge pull request #5330 from owncloud/files-removedfileactionsbkg
...
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 09:23:06 -07:00
fab4102c51
Disabled ajax mode for public files view
...
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
2013-10-14 17:47:38 +02:00
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
09b084dfed
Fixed file permissions after public upload
...
Fixes #5328
2013-10-14 17:28:53 +02:00
d3af7a9aa4
check if we are writing to user/files, otherwise skip encryption
2013-10-14 17:13:14 +02:00
e79d853867
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 17:05:24 +02:00
58196304b8
fix array key
2013-10-14 16:43:18 +02:00
4151fd3ed9
try to fix unencrypted file size if it doesn't look plausible
2013-10-14 16:34:14 +02:00
c60f52ddf7
Fixed app list right container to not overlap left container scrollbar
...
- Container widths in apps list now use pixels instead of em
- Container widths now match properly and rightcontainer doesn't overlap
the scrollbar any more
2013-10-14 16:29:33 +02:00
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
c6314b1c03
Merge pull request #5323 from owncloud/files-external-missinggridstyle
...
Added missing "grid" class on external storage's table
2013-10-14 06:31:35 -07:00
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
b8285ca316
Added missing "grid" class on external storage's table
2013-10-14 14:02:39 +02:00
e9ce704f17
Merge pull request #5297 from owncloud/quota-style
...
Fixes Default Quota Style in User Management.
2013-10-14 03:59:51 -07:00
de920736c5
Merge pull request #5320 from owncloud/fix_app_sorting
...
Fix app sorting
2013-10-14 02:29:27 -07:00
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
a201a66878
fix style
2013-10-14 10:57:00 +02:00
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
e0d3046590
Fixes Default Quota Style in User Management.
2013-10-14 10:35:24 +02:00
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
Björn Schießle
Jenkins for ownCloud
Bjoern Schiessle
kondou
Morris Jobke
Vincent Petry
Raghu Nayyar
icewind1991
Andreas Fischer
Ramiro Aparicio
Frank Karlitschek
Georg Ehrke
Jan-Christoph Borchardt