6fa609325c
Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external
...
Ajaxify user list for files external
2014-08-28 13:39:21 +02:00
1c0cc6c7bc
fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc
2014-08-28 11:53:40 +02:00
dbd51d15e1
Port of #8623
...
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise will always get the same value and we end up in an infinite loop
add unit test to make sure the infinite loop never comes back
Conflicts:
apps/user_ldap/tests/wizard.php
2014-08-28 11:52:33 +02:00
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
87167d3141
Prevent errors on broken SFTP config
2014-08-27 09:02:14 +01:00
2740908a5b
[tx-robot] updated from transifex
2014-08-27 01:54:40 -04:00
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
58ab105515
Merge pull request #10421 from owncloud/share-external-delete
...
Remove no longer existing files from the cache when scanning external storage
2014-08-25 11:28:50 -04:00
5e2f627d3d
Merge pull request #10108 from owncloud/files_external-allowed-backend
...
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
f33312f767
Use AppFramework instead of custom controller
2014-08-25 11:50:19 +02:00
6202ef3258
use displayname lookup route in files_external settings
2014-08-25 11:50:19 +02:00
e09e11b93e
no need to load user display names
2014-08-25 11:50:19 +02:00
393d136faf
fix deletion of shares
2014-08-25 11:50:19 +02:00
308e8d6379
replace chosen with select2 to provide ajaxified user and group selection for files_external, fixes #7499
...
remove minified select2 js
show avatars for users, simpler results
remove unneeded users and groups from settings template
fix css, escape user and group names
2014-08-25 11:50:19 +02:00
bff39f796e
add select2 to app specific thirdparty
2014-08-25 11:49:23 +02:00
8ab1c84161
Merge pull request #10591 from owncloud/routes_for_files_external
...
explicit routes for files_external
2014-08-25 11:45:41 +02:00
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
ffe54e260a
explicit routes for files_external
2014-08-22 11:51:39 +02:00
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
0cb189353f
Merge pull request #10548 from owncloud/encryption-app-description
...
Better description to prevent people from misunderstanding the use case of encryption app
2014-08-21 13:01:18 +02:00
ba8eed0788
Better description to prevent people from misunderstanding the use case
2014-08-21 12:05:56 +02:00
952fac8493
[tx-robot] updated from transifex
2014-08-21 01:56:31 -04:00
61f63718ce
Merge pull request #10562 from Volker-E/master
...
fixing #10561 & HTML structure
2014-08-20 17:27:25 -04:00
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
98d0d48b54
fix HTML structure by rmv. obsolete input end tag
2014-08-20 22:36:58 +02:00
6c593c6adf
Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource
...
urlencode s3 copyObject() copysource
2014-08-20 15:48:51 +02:00
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
5ddea98df2
Merge pull request #10525 from owncloud/remove-download-message
...
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 14:17:15 -04:00
e713e97df5
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 16:44:28 +02:00
3d8031564e
fix multiselect bar offset on shared page
2014-08-19 15:51:10 +02:00
381340c9b2
Add routing to user_ldap
2014-08-19 15:26:15 +02:00
b12af9ea7f
Add routing to files_versions
2014-08-19 15:25:16 +02:00
8524e61fcc
Add routing to files_trashbin
2014-08-19 15:24:47 +02:00
520ee969f2
Add routing to files_encryption
2014-08-19 15:23:45 +02:00
ad202250a8
Add routing to files_sharing
2014-08-19 15:22:54 +02:00
f9881abf25
Use proper routes for files
2014-08-19 15:19:18 +02:00
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
2df52e54d7
Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
...
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
19610157d3
Merge pull request #10425 from owncloud/set_default_share_folder
...
Set default share folder
2014-08-19 10:21:21 +02:00
312ed53307
Merge pull request #10494 from owncloud/fix_upload_to_public_folder
...
set incognitoMode to true during upload to a public folder
2014-08-19 10:13:38 +02:00
df963b3ccf
Merge pull request #10492 from owncloud/hidesharesectionswhendisabled
...
Hide sharing sections in files app when sharing API is disabled
2014-08-19 08:53:19 +02:00
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
8f7676c762
Merge pull request #10340 from owncloud/fix-9887
...
better check whether string resembles a DN, fixes #9887
2014-08-18 19:24:41 +02:00
97fd39e983
unify tests
2014-08-18 16:55:08 +02:00
594078e22f
Fix copyright
2014-08-18 16:52:48 +02:00
193a0b1a17
fix broken unit tests
2014-08-18 16:52:48 +02:00
c25915cde4
update unit tests with configurable share folder
2014-08-18 16:52:48 +02:00
c9903f2e68
make share folder configurable
2014-08-18 16:52:48 +02:00
043cd1d02b
set incognitoMode to true, getUser should always return false during public upload
2014-08-18 16:39:25 +02:00
1de5ae8845
Hide sharing sections in files app when sharing API is disabled
2014-08-18 16:33:29 +02:00
4dd07f572c
[tx-robot] updated from transifex
2014-08-18 01:56:30 -04:00
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
283b99a42d
Merge pull request #10276 from owncloud/skip-webdavput
...
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
5498186333
Merge pull request #10447 from owncloud/share-foldericonfix
...
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
8d112ff61f
Merge pull request #10449 from owncloud/share-clientsidesortnoservercall
...
Client side sort for sharing overview
2014-08-15 21:25:30 +02:00
3da69ed7d0
ssl capital
2014-08-15 20:41:40 +02:00
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
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
5a2fef4309
login as user1 before performing a test
2014-08-15 15:48:44 +02:00
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
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
240b952333
use S3Client::encodeKey(), fixes #8325
2014-08-14 21:46:50 +02:00
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
bbe17f35a1
Remove no longer existing files from the cache when scanning external storage
2014-08-14 14:50:52 +02:00
27d94e9273
Merge pull request #10295 from owncloud/file_actions_error_handling
...
file actions improved error handling
2014-08-14 11:44:50 +02:00
67b7160e7b
[tx-robot] updated from transifex
2014-08-14 01:55:35 -04:00
fc462c5edb
Merge pull request #10396 from owncloud/kill-filesync
...
Kill filesync.php in files/appinfo
2014-08-13 23:56:59 +02:00
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
bba59bf815
Cast file id's to int so we can compare them properly
2014-08-13 19:18:34 +02:00
9509bc403a
Give a better error message for external shares with self-signed ssl certificates
2014-08-13 16:46:04 +02:00
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
f282a5cff0
Merge pull request #9754 from owncloud/enc_support_aes_256
...
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
609a52ebe2
[tx-robot] updated from transifex
2014-08-13 01:54:44 -04:00
d4eaa74b76
fixes from git push force
2014-08-12 21:29:05 +02:00
53c5a84eac
add unit tests
2014-08-12 21:15:39 +02:00
da1feafc78
fix detection of system wide mount points
2014-08-12 21:14:22 +02:00
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
eb7d70fc39
adjust login test to code changes
2014-08-12 16:13:17 +02:00
e18b0fca47
Merge pull request #10357 from owncloud/l10n-alert-fix
...
Fix alert text
2014-08-12 13:56:33 +02:00
e4221869c2
[tx-robot] updated from transifex
2014-08-12 01:56:16 -04:00
f2a775acb8
Fix alert text
2014-08-12 01:13:30 +02:00
4dd9414f2c
Transifex suggestion by mnestis
2014-08-11 21:31:15 +02:00
c46b60e822
Merge pull request #9848 from dupondje/master
...
Fix memberOf detection. Fixes : #9835
2014-08-11 16:58:30 +02:00
fc6793f2ae
better check whether string resembles a DN, fixes #9887
2014-08-11 16:40:41 +02:00
e46fc7a18a
Fix initializing in #9848
2014-08-11 13:50:13 +02:00
173059f6d0
Fixed file list sorting
...
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)
- added OC.Util.naturalSortComparator that uses the same algo that was
used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
86ae3bd1e7
Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name
...
use OC_Util::basename
2014-08-11 13:10:45 +02:00
bc8e1ebf75
new unit test added
2014-08-11 12:03:08 +02:00
5b75b15292
no error if we try to delete a file which no longer exists
2014-08-11 12:03:08 +02:00
5bbecdb9ee
no special action for folder named 'Shared' needed
2014-08-11 12:03:08 +02:00
b3cff4beb6
add error message if user wants to rename a file which no longer exists
2014-08-11 12:03:08 +02:00
fc662917e7
Fix remarks in #9848
2014-08-11 09:15:56 +02:00
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
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
c24957565c
check quota when trying to download a file via new -> web
2014-08-08 14:35:33 +02:00
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
fa260b1649
Merge pull request #10280 from owncloud/lazyloading-earlier
...
trigger lazy loading earlier, fix #9823
2014-08-08 10:02:43 +02:00
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
5ee0a57598
trigger lazy loading earlier, fix #9823
2014-08-08 00:27:31 +02:00
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
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
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
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
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
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
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
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
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
2fb8fcf6cb
we can only close the session if encryption is not used
2014-08-07 11:07:11 +02:00
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
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
4bbea118c2
fix tiny thumbnails in public preview/share mode
2014-08-06 19:32:21 +01:00
eb8683e6ee
trim leading slash
2014-08-06 14:57:54 +02:00
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
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
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
e15b4d08a6
Disable encryption migration tests
2014-08-05 18:35:53 +02:00
e717833b07
mark tests as skipped - TODO travis
...
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
785ae5dc9a
add unit test to make sure getVersions returns the correct result
2014-08-05 17:26:23 +02:00
b7ada5da57
make sure that the versions array contains the correct path
2014-08-05 17:25:55 +02:00
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
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
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
b68275baba
close session right before the download starts - this enables parallel downloads
2014-08-05 11:21:42 +02:00
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
5a2952e2eb
[tx-robot] updated from transifex
2014-08-04 01:54:39 -04:00
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
73607e5d16
Only load personal external storages for allowed backends
2014-08-01 17:15:46 +02:00
4886c8582d
Merge pull request #9529 from helmutschneider/fix-8326
...
Fixes #8326 : deletion of directories on S3
2014-08-01 14:04:21 +02:00
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
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
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
1af436cb59
add test for search() in shared cache
2014-07-31 15:07:49 +02:00
a7b4cd77b1
traverse folders in php to search in shared files
2014-07-31 12:05:29 +02:00
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
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
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
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
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
3d0bcb7c46
don't preload videos on public sharing, fixes #10042
2014-07-30 17:06:41 +02:00
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
1a797f90bb
add unit test for rename and copy operation
2014-07-30 15:14:01 +02:00
blizzz
Jenkins for ownCloud
Robin McCorkell
Clark Tomlinson
Vincent Petry
Lukas Reschke
Jörn Friedrich Dreyer
Morris Jobke
Bernhard Posselt
Volker E.
Jan-Christoph Borchardt
Stephan Peijnik
Björn Schießle
Volkan Gezer
Robin Appelman
Thomas Müller
Volkan Gezer
Oliver Gasser
Jean-Louis Dupond
pzy
Dan Jones
Remco Brenninkmeijer
Georg Ehrke