Vincent Petry
3a99f15af2
Client side sort for sharing overview
...
Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
2014-08-15 16:52:41 +02:00
Vincent Petry
607ea636be
Fixed folder icon update routine when share owner exists
...
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Bjoern Schiessle
5a2fef4309
login as user1 before performing a test
2014-08-15 15:48:44 +02:00
Jenkins for ownCloud
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
Jan-Christoph Borchardt
f6a6f8541a
Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file
...
Compare upload limit against biggest file
2014-08-14 23:24:18 +02:00
Jörn Friedrich Dreyer
240b952333
use S3Client::encodeKey(), fixes #8325
2014-08-14 21:46:50 +02:00
Robin Appelman
a645da3640
Merge pull request #10398 from owncloud/external-share-ssl-warn
...
Give a better error message for external shares with self-signed ssl certificates
2014-08-14 16:10:29 +02:00
Björn Schießle
27d94e9273
Merge pull request #10295 from owncloud/file_actions_error_handling
...
file actions improved error handling
2014-08-14 11:44:50 +02:00
Jenkins for ownCloud
67b7160e7b
[tx-robot] updated from transifex
2014-08-14 01:55:35 -04:00
Thomas Müller
fc462c5edb
Merge pull request #10396 from owncloud/kill-filesync
...
Kill filesync.php in files/appinfo
2014-08-13 23:56:59 +02:00
Volkan Gezer
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
Robin Appelman
bba59bf815
Cast file id's to int so we can compare them properly
2014-08-13 19:18:34 +02:00
Robin Appelman
9509bc403a
Give a better error message for external shares with self-signed ssl certificates
2014-08-13 16:46:04 +02:00
Morris Jobke
cad52dbce9
Kill filesync.php in files/appinfo
...
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
2014-08-13 15:58:43 +02:00
Vincent Petry
f282a5cff0
Merge pull request #9754 from owncloud/enc_support_aes_256
...
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
Jenkins for ownCloud
609a52ebe2
[tx-robot] updated from transifex
2014-08-13 01:54:44 -04:00
Morris Jobke
d4eaa74b76
fixes from git push force
2014-08-12 21:29:05 +02:00
Bjoern Schiessle
53c5a84eac
add unit tests
2014-08-12 21:15:39 +02:00
Bjoern Schiessle
da1feafc78
fix detection of system wide mount points
2014-08-12 21:14:22 +02:00
Oliver Gasser
eb2669448d
Compare upload limit against biggest file
...
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
2014-08-12 19:46:04 +02:00
Arthur Schiwon
eb7d70fc39
adjust login test to code changes
2014-08-12 16:13:17 +02:00
Volkan Gezer
e18b0fca47
Merge pull request #10357 from owncloud/l10n-alert-fix
...
Fix alert text
2014-08-12 13:56:33 +02:00
Jenkins for ownCloud
e4221869c2
[tx-robot] updated from transifex
2014-08-12 01:56:16 -04:00
Volkan Gezer
f2a775acb8
Fix alert text
2014-08-12 01:13:30 +02:00
Volkan Gezer
4dd9414f2c
Transifex suggestion by mnestis
2014-08-11 21:31:15 +02:00
blizzz
c46b60e822
Merge pull request #9848 from dupondje/master
...
Fix memberOf detection. Fixes : #9835
2014-08-11 16:58:30 +02:00
Arthur Schiwon
fc6793f2ae
better check whether string resembles a DN, fixes #9887
2014-08-11 16:40:41 +02:00
Jean-Louis Dupond
e46fc7a18a
Fix initializing in #9848
2014-08-11 13:50:13 +02:00
Robin Appelman
86ae3bd1e7
Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name
...
use OC_Util::basename
2014-08-11 13:10:45 +02:00
Bjoern Schiessle
bc8e1ebf75
new unit test added
2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5b75b15292
no error if we try to delete a file which no longer exists
2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5bbecdb9ee
no special action for folder named 'Shared' needed
2014-08-11 12:03:08 +02:00
Bjoern Schiessle
b3cff4beb6
add error message if user wants to rename a file which no longer exists
2014-08-11 12:03:08 +02:00
Jean-Louis Dupond
fc662917e7
Fix remarks in #9848
2014-08-11 09:15:56 +02:00
Jenkins for ownCloud
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
Jenkins for ownCloud
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
Jenkins for ownCloud
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
Thomas Müller
7b6b99f55a
Merge pull request #10290 from owncloud/check_quota_on_new_via_web
...
check quota when trying to download a file via new -> web
2014-08-08 17:32:50 +02:00
Jörn Friedrich Dreyer
c24957565c
check quota when trying to download a file via new -> web
2014-08-08 14:35:33 +02:00
Bjoern Schiessle
008498dcad
only show "share with others" and "share by link" navigation bar entries if user is allowed to share files
2014-08-08 12:12:24 +02:00
Morris Jobke
fa260b1649
Merge pull request #10280 from owncloud/lazyloading-earlier
...
trigger lazy loading earlier, fix #9823
2014-08-08 10:02:43 +02:00
Jenkins for ownCloud
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
Jan-Christoph Borchardt
5ee0a57598
trigger lazy loading earlier, fix #9823
2014-08-08 00:27:31 +02:00
Morris Jobke
5e7b164560
Merge pull request #10248 from owncloud/enc_remove_keys_from_session
...
add logout hook to remove keys from session
2014-08-07 23:01:11 +02:00
Thomas Müller
461fdd854f
Merge pull request #10261 from owncloud/fix-9829
...
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...
2014-08-07 21:38:12 +02:00
Arthur Schiwon
2676e681e9
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829
2014-08-07 17:15:36 +02:00
Bjoern Schiessle
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
Thomas Müller
6da9c09467
Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
...
we can only close the session if encryption is not used
2014-08-07 14:29:54 +02:00
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
9e6b65fabe
Merge pull request #10223 from dannosaur/patch-1
...
fix tiny thumbnails in public preview/share mode
2014-08-07 12:36:57 +02:00
Thomas Müller
8b2fe69bb2
Merge pull request #10218 from owncloud/pzy-master
...
Adding link tag to enable facebook timeline previews
2014-08-07 12:14:30 +02:00
Thomas Müller
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
Thomas Müller
2fb8fcf6cb
we can only close the session if encryption is not used
2014-08-07 11:07:11 +02:00
pzy
dc15633111
Update public.php
...
added tag to make facebook load a preview picture
Update public.php
add check ifMimeSupported and put the thumbsize in a variable
generate preview for all supported mimes
2014-08-07 10:44:07 +02:00
Jenkins for ownCloud
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
Dan Jones
4bbea118c2
fix tiny thumbnails in public preview/share mode
2014-08-06 19:32:21 +01:00
Robin Appelman
eb8683e6ee
trim leading slash
2014-08-06 14:57:54 +02:00
Robin Appelman
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
Thomas Müller
6599dc1b5c
Merge pull request #10186 from owncloud/versioning_fix_path
...
[versioning] make sure that getVersions() return the correct path
2014-08-06 09:30:28 +02:00
Morris Jobke
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
Morris Jobke
e15b4d08a6
Disable encryption migration tests
2014-08-05 18:35:53 +02:00
Morris Jobke
e717833b07
mark tests as skipped - TODO travis
...
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
Bjoern Schiessle
785ae5dc9a
add unit test to make sure getVersions returns the correct result
2014-08-05 17:26:23 +02:00
Bjoern Schiessle
b7ada5da57
make sure that the versions array contains the correct path
2014-08-05 17:25:55 +02:00
Morris Jobke
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Morris Jobke
c83c90342e
Merge pull request #10168 from owncloud/parallel-download-on-public-shared-folder-master
...
close session right before the download starts - this enables parallel d...
2014-08-05 14:54:44 +02:00
Arthur Schiwon
7fd7706542
Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
...
Conflicts:
apps/user_ldap/css/settings.css
2014-08-05 12:14:29 +02:00
Thomas Müller
b68275baba
close session right before the download starts - this enables parallel downloads
2014-08-05 11:21:42 +02:00
Jenkins for ownCloud
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
Jenkins for ownCloud
5a2952e2eb
[tx-robot] updated from transifex
2014-08-04 01:54:39 -04:00
Jenkins for ownCloud
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
Robin Appelman
4886c8582d
Merge pull request #9529 from helmutschneider/fix-8326
...
Fixes #8326 : deletion of directories on S3
2014-08-01 14:04:21 +02:00
Morris Jobke
6cbfe8fd98
Merge pull request #10067 from owncloud/fix-#9119
...
Quick fix for #9119 . Increase preview to keep empty message more centered
2014-08-01 09:25:15 +02:00
Jenkins for ownCloud
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
Jörn Friedrich Dreyer
dc6180427c
Merge pull request #10048 from owncloud/fix_search_in_shared_files
...
traverse folders in php to search in shared files
2014-07-31 18:27:47 +02:00
Jörn Friedrich Dreyer
1af436cb59
add test for search() in shared cache
2014-07-31 15:07:49 +02:00
Jörn Friedrich Dreyer
a7b4cd77b1
traverse folders in php to search in shared files
2014-07-31 12:05:29 +02:00
Thomas Müller
4eb2b4e1b0
Merge pull request #10051 from owncloud/preview-empty-text
...
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
Jenkins for ownCloud
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
Remco Brenninkmeijer
a1b5bc8684
Quick fix for #9119 . Increase preview to keep empty message more centered and push footer down.
2014-07-30 22:41:17 +02:00
Jan-Christoph Borchardt
8389ff5875
Merge pull request #10054 from owncloud/dont_preload_videos
...
don't preload videos on public sharing, fixes #10042
2014-07-30 21:10:57 +02:00
Morris Jobke
62b37fbb99
Merge pull request #10024 from owncloud/preview-restrict-height
...
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
Georg Ehrke
3d0bcb7c46
don't preload videos on public sharing, fixes #10042
2014-07-30 17:06:41 +02:00
Robin Appelman
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
Bjoern Schiessle
1a797f90bb
add unit test for rename and copy operation
2014-07-30 15:14:01 +02:00
Bjoern Schiessle
dba2574c52
make sure that we always find all versions
2014-07-30 15:14:01 +02:00
Bjoern Schiessle
c738f71657
make the versions and encryption app aware of the copy operation
2014-07-30 15:14:01 +02:00
Robin Appelman
c066320208
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 13:52:40 +02:00
Björn Schießle
2946a63f6b
Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook
...
[encryption] define type in pre hook
2014-07-29 16:29:28 +02:00
Björn Schießle
f7d60f1190
Merge pull request #9951 from owncloud/enc_inproved_error_messages
...
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-29 16:27:24 +02:00
Björn Schießle
03f7c5c561
Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview
...
update attributes for share-with-user view
2014-07-29 14:00:57 +02:00
Jenkins for ownCloud
29a3f1e2af
[tx-robot] updated from transifex
2014-07-29 09:16:02 +02:00
Bjoern Schiessle
aff948925a
update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view
2014-07-28 22:04:13 +02:00
Björn Schießle
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Jan-Christoph Borchardt
13ca1c6a99
Merge pull request #9585 from owncloud/design-fix-public-footer
...
move public page footer rules from sharing app to core so it is used by other apps too
2014-07-28 12:53:29 +02:00
Bjoern Schiessle
b7958f79c3
adjust error code
2014-07-28 12:39:22 +02:00
Bjoern Schiessle
de4233bc1c
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-28 11:31:06 +02:00
Jenkins for ownCloud
a169572223
[tx-robot] updated from transifex
2014-07-28 01:54:30 -04:00
Jenkins for ownCloud
9a4d2871eb
[tx-robot] updated from transifex
2014-07-27 01:54:31 -04:00