Commit Graph

7837 Commits

Author SHA1 Message Date
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
Arthur Schiwon 3d2ab76347 add tests for cumulativeSearchOnAttribute 2014-03-21 00:17:51 +01:00
Arthur Schiwon a085d7715f fix potential infinite loop when the DN of the first entry was already read. 2014-03-20 22:59:41 +01:00
Arthur Schiwon 561d699ca6 Use the LDAP wrapper for checking resources, needs for proper testing 2014-03-20 22:58:57 +01:00
Arthur Schiwon bd881348e8 Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway 2014-03-20 22:57:50 +01:00
Robin McCorkell 7c3da27bf6 Fix duplicate ipauniqueid 2014-03-20 20:38:06 +00:00
Robin McCorkell 7a0eccfc63 Correct field modifier checking
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
Robin McCorkell ed0c10a10b Enable the use of 'optional' on password fields
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
Lukas Reschke 2c561c9c50 Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Vincent Petry d95fde3924 Removed comment 2014-03-20 15:24:05 +01:00
Arthur Schiwon 057c2638e4 LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530 2014-03-20 13:58:08 +01:00
Morris Jobke 5747e0e3f9 remove executable flag for file-upload.js 2014-03-20 13:26:21 +01:00
Morris Jobke 95a13e2690 Merge pull request #7814 from oskholl/master
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
Vincent Petry 1e4e0cfcd5 Lazy load phpseclib in ext storage config 2014-03-20 13:21:34 +01:00
Robin Appelman cf23defa52 Fix typo in mount loading 2014-03-20 12:52:09 +01:00
Thomas Müller 8a81df0f2c Merge pull request #7651 from owncloud/close-session-faster-master
Close session faster
2014-03-20 11:07:21 +01:00
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Oskar Hollmann 90839b784f Comment moved to prevent 'Line is too long' warning. 2014-03-19 23:05:03 +01:00
Oskar Hollmann fa28c089fa Fix: 'Upload button tooltip doesn't disappear'
Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
Robin McCorkell ca595611f5 Add FreeIPA UUID compatibility, fixes #7796
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
Scott Arciszewski 36da3bc359 Update crypt.php
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?

Also, 183 bytes = 1464 bits.

Here's a safe alternative: 2048 bits, with comment-code sanity
2014-03-19 13:31:51 -04:00
Vincent Petry 9116c39a82 Fixed ext storage password field order issue
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
Vincent Petry 5b6c36347b Fixed ext storage unit test for groups
Now creating real users and groups for testing external storage mounts
2014-03-19 17:55:34 +01:00
Vincent Petry 8e0a5ed5df Added tests to check mount point list for a target user 2014-03-19 15:21:54 +01:00
Robin Appelman 214357ca68 Improve sorting performance of large lists of files 2014-03-19 13:53:59 +01:00
Vincent Petry 4cb53f77b2 Moved external storage mounting code to files_external app
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
Thomas Müller c216c4777b Merge branch 'master' into close-session-faster-master
Conflicts:
	apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Vincent Petry 80180bea32 Added IV for ext storage password encryption 2014-03-19 11:42:22 +01:00
Thomas Müller 33e96597d1 Merge pull request #7790 from owncloud/fix/7788
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Vincent Petry 40a70ecf79 Added password obfuscation for external storage config
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
Vincent Petry e0dada704c Added ext storage unit tests for writing then reload the mount config 2014-03-19 10:52:22 +01:00
Vincent Petry ff5b79edeb Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage
Fix validation of allowed personal backend
2014-03-19 10:00:12 +01:00
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Robin McCorkell 340cd2734b Merge pull request #7766 from Xenopathic/master
Fix smb4php to work with home shares
2014-03-18 19:42:04 +00:00
Vincent Petry 1f79f368ef Added unit tests for when adding ext storage mount points
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
  doing an actual check/connection (note: this is necessary because the
  static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
Thomas Müller 76961ce072 fixing javascript error where $(Files.breadcrumbs[1]).get(0) returns undefined - happens on resize to a very small width 2014-03-18 17:59:21 +01:00
Vincent Petry 8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00
Thomas Müller 6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Jan-Christoph Borchardt 285fc5ba96 mobile: change CSS order so rename and versions are hidden 2014-03-18 11:50:08 +01:00
Thomas Müller 153eadd753 Merge branch 'master' into close-session-faster-master 2014-03-17 21:57:48 +01:00
Thomas Müller 756bbe8786 Merge pull request #7649 from owncloud/routing-public
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Thomas Müller ea8705bac8 additional class is added to the file actions called e.g. 'action-share', 'action-rename'
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
2014-03-17 20:15:10 +01:00
Robin Appelman 38b1529c2a More robust way to check if the folder is empty 2014-03-17 17:03:32 +01:00
Robin Appelman 332c14a878 Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache 2014-03-17 16:35:08 +01:00
Robin McCorkell 792d0d3314 Fix smb4php to work with home shares
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
2014-03-17 15:03:25 +00:00
Frank Karlitschek 8a24e1eb96 clearify the use-case of this app 2014-03-17 12:29:17 +01:00
Morris Jobke 7ffaf0d70a Merge pull request #7734 from owncloud/icon-class-remove
remove unneeded icon class
2014-03-16 10:24:57 +01:00
Jenkins for ownCloud c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Thomas Müller bbbbb033f3 in case of phpunit executions calling header() and exit() is too bad 2014-03-14 18:20:33 +01:00
Jan-Christoph Borchardt 55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Jan-Christoph Borchardt ec67d7e635 mobile: first mobile fixes for Files. We still need to hide Rename and Versions 2014-03-14 09:16:53 +01:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
ben-denham 8a8a32cf43 Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. 2014-03-14 09:17:39 +13:00
Björn Schießle b2757e621c Merge pull request #7686 from owncloud/ocs_fix_paths
finally fix the paths for the OCS Share API
2014-03-13 20:27:07 +01:00
Robin Appelman eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Bjoern Schiessle 9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Morris Jobke 206364cd1c remove invalid shares with one SQL statement 2014-03-13 13:09:32 +01:00
Vincent Petry 02be15ce2f Added backticks for Oracle in sharing updater unit test 2014-03-13 13:09:32 +01:00
Morris Jobke 4bb303cbd6 Clean up database before setup the database for testing 2014-03-13 13:09:32 +01:00
Morris Jobke ec54bc7709 Refactor update script to class and add unit test 2014-03-13 13:09:32 +01:00
Jamie McClelland d58fda7ff3 fix update to remove shares where file doesn't exist on postgres
Without patch, breaks with: Failed to upgrade "files_sharing".
Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR:
invalid input syntax for integer: "5,179""

See: https://github.com/owncloud/core/issues/5758

removing unnecessary cruft - no parameter is set, none to pass.

https://github.com/owncloud/core/issues/5758

removing subquery, making more readable

See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979

parameters to sql calls should be arrays

https://github.com/owncloud/core/pull/6016

boosting version to ensure fix gets executed

properly escaping the sql select statement

removing extraneous closing paren.
2014-03-13 13:09:31 +01:00
Vincent Petry 9fa9c791eb Merge pull request #7671 from fpiraneo/patch-1
Update index.php
2014-03-13 13:04:30 +01:00
Alexander Bergolth c76d952dac make getGroupsChunk() protected instead of private 2014-03-13 10:57:19 +01:00
Alexander Bergolth 7f8b04d3e0 adapt coding style 2014-03-13 09:33:07 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Lukas Reschke b506de6f08 Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master
remove Sabre_DAV_Browser_Plugin
2014-03-12 22:28:01 +01:00
Vincent Petry b92be2ef1c Merge pull request #7669 from owncloud/versions_predelete
add preDelete hook for files_versions app
2014-03-12 17:23:54 +01:00
Vincent Petry 881739cbac Merge pull request #7668 from owncloud/trashbin_predelete
add preDelete hook for files_trashbin app
2014-03-12 17:23:38 +01:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller ae13ff112f remove Sabre_DAV_Browser_Plugin 2014-03-12 00:10:16 +01:00
Björn Schießle 03f40116e1 Merge pull request #7665 from owncloud/fix_ocs_share_api_paths
Fix ocs share api paths
2014-03-11 16:55:52 +01:00
Francesco Piraneo G. 3f4a0778c8 Update index.php
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
2014-03-11 14:29:26 +01:00
Georg Ehrke 9a5c2d0080 add preDelete hook for files_versions app 2014-03-11 14:17:08 +01:00
Georg Ehrke 0f864c38bb add preDelete hook for files_trashbin app 2014-03-11 14:10:12 +01:00
Robin Appelman d55c7223a9 Merge branch 'master' into foldersize-reuse
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Bjoern Schiessle a09df0083e add 'received_from' info to the share, so that every share can have a different value 2014-03-11 12:59:37 +01:00
Bjoern Schiessle 36885dc64c fix path creation for re-shares, issue #7662 2014-03-11 12:58:46 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Vincent Petry 022d76c7bb Fixed warning when browsing Shared folder
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
2014-03-10 17:25:16 +01:00
Thomas Müller 41f814515e Merge branch 'master' into close-session-faster-master 2014-03-10 17:00:09 +01:00
Thomas Müller 9fb9684da7 Merge pull request #7646 from owncloud/fix_ocs_api_unshare
we need the file_source to delete a share successfully
2014-03-10 16:06:17 +01:00
Vincent Petry 4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db
[trash] fall back if file is not in db
2014-03-10 16:04:47 +01:00
Bjoern Schiessle 5ddabd7cd0 fix mimetype detection, introduce fake etag to identify preview images 2014-03-10 15:13:28 +01:00
Bjoern Schiessle 4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Bjoern Schiessle abad625cac only enable previews if the encryption is disabled 2014-03-10 15:13:28 +01:00
Bjoern Schiessle eab844e226 if file is not in db, fall back to restore file to the users root 2014-03-10 15:13:28 +01:00
Thomas Müller 58c216d0e8 close the session on all file operations 2014-03-10 14:39:27 +01:00
Robin Appelman 8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry 0ffd32a1ae Merge pull request #7629 from owncloud/files-allfileswarningtypo
Fixed log warning when deleting a single file
2014-03-10 11:40:28 +01:00
Bjoern Schiessle 9548670da7 we need the file_source to delete a share successfully 2014-03-10 11:35:54 +01:00
Vincent Petry 92df8deb0a Merge pull request #7631 from ichEben/master
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
2014-03-10 10:04:54 +01:00
Vincent Petry 26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
IchEben e7d5715114 only initialise upload dropZone if public upload is allowed 2014-03-07 17:45:24 +01:00
Vincent Petry 5671aac5ca Fixed log warning when deleting a single file 2014-03-07 15:03:35 +01:00
Vincent Petry 48d63a6278 Return unencrypted_size of folder when queried
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
icewind1991 3eb58d9973 Merge pull request #7529 from owncloud/getlocalfile-cache
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
ben-denham ef65381a0b Moved LdapFilter into a separate js file in user_ldap. 2014-03-07 10:10:42 +13:00
ben-denham 43e79f41f3 Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. 2014-03-07 09:17:41 +13:00
Vincent Petry 536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
Vincent Petry 0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Vincent Petry 07f78c8248 Added unit tests for "add()" method for file upload
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
  cases
2014-03-06 13:53:34 +01:00
Robin Appelman 84cf40ed82 merge master into webdav-injection 2014-03-06 13:35:06 +01:00
Alexander Bergolth f850fcfac5 "reset" ldap pagedSearch control by setting it to a high value 2014-03-06 12:23:20 +01:00
root 6585bd5a50 "reset" ldap pagedSearch control by setting it to a high value
call nextEntry via invokeLDAPMethod
2014-03-06 12:07:03 +01:00
root 8fcc29ee8b only check ldap_errno if an ldap_* function actually fails
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
  (avoids json_encode(): Invalid UTF-8 sequence in argument errors)
2014-03-06 12:07:03 +01:00
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Vincent Petry 1785c0c9b9 Merge pull request #7575 from owncloud/issue/7571
Do not set #dir when on public.php
2014-03-05 19:57:25 +01:00
Lukas Reschke e3156fa5ad Merge pull request #7354 from pschmitt/master
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
Joas Schilling 1ab10cb4f7 Do not set #dir when on public.php
Fix #7571
2014-03-05 18:46:55 +01:00
Björn Schießle 9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
Jan-Christoph Borchardt 7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Jan-Christoph Borchardt bd86642747 Merge pull request #7261 from owncloud/issue/6793
Allow admins to disable certain external storages for users
2014-03-05 14:41:36 +01:00
Vincent Petry 36d7c0b6a7 Merge pull request #7556 from owncloud/enc_dont_create_files_folder
[enc] don't create users files folder
2014-03-05 13:30:11 +01:00
Robin Appelman a687498547 Fix encryption webdav tests 2014-03-05 13:19:08 +01:00
Bjoern Schiessle 2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Bjoern Schiessle fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00
Vincent Petry 2cfd875e61 Merge pull request #7012 from owncloud/display-share-owner-master
adding share owner information to the file list
2014-03-05 12:43:10 +01:00
root 84550fbfb4 fix another oversight... sigh.. 2014-03-05 10:42:35 +01:00
root 4645d0a93a getGroups(): fix overall max search limit for paged searches 2014-03-04 21:12:47 +01:00
root eb1e361824 getGroups() $limit was not handled correctly 2014-03-04 21:07:27 +01:00
root eb59e63c3b revert updateGroups job to use getGroups() instead of getAllGroups() 2014-03-04 19:47:49 +01:00
root 039f7b054a merge functionality of getAllGroups into getGroups 2014-03-04 18:02:27 +01:00
root 15ef3145f8 Merge branch 'ldap_paging_chunksize' into ldap_get_all_groups 2014-03-04 17:24:46 +01:00
root a5813acb64 add ldap_paging_size config option 2014-03-04 17:23:04 +01:00
Vincent Petry 1da90fab84 Merge pull request #7508 from owncloud/ldap-configkeycasing
Fixed configkey casing for PostgreSQL
2014-03-04 17:08:29 +01:00
Robin Appelman a8c67dc675 Add caching for getLocalFile on remote storages 2014-03-04 15:44:58 +01:00
Thomas Müller f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string
fix https://github.com/owncloud/core/issues/6825
2014-03-04 14:30:30 +01:00
root bacda81bf7 use getAllGroup() in the updateGroups background job
needed in active directory deployments with > 1000 groups
2014-03-04 14:17:22 +01:00
root a135f1ebbb add getAllGroups() that uses a paged search if available
this circumvents server side search limits
(active directory has a limit of 1000 by default)
2014-03-04 14:17:22 +01:00
Robin Appelman 5ef37c28d1 Remove the need for a custom SabreDav server constructor 2014-03-04 13:28:48 +01:00
Frank Karlitschek 0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Vincent Petry fd5dec0298 Fixed configkey casing for PostgreSQL 2014-03-03 16:15:23 +01:00
Arthur Schiwon b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
Thomas Müller 9f087a2070 fixing download url in files app 2014-03-02 23:41:14 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master
Conflicts:
	apps/files_sharing/lib/cache.php
2014-02-28 14:54:10 +01:00
Robin Appelman da386aad59 Allow re-using already known fileinfo when calculating folder sizes 2014-02-28 14:23:07 +01:00
icewind1991 8a93a2e7d5 Merge pull request #7455 from owncloud/rawlist-fileinfo
Update rawlist to work with new fileinfo object
2014-02-28 12:36:56 +01:00
Björn Schießle 61bc76fdd6 Merge pull request #7454 from owncloud/enc_remember_fopen_mode
[enc] remember original fopen access type in pre-proxy
2014-02-28 09:57:58 +01:00
Vincent Petry fefd724858 Fixed wrong field name
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
2014-02-27 23:53:29 +01:00
Bjoern Schiessle 4ace1a273d remember original fopen access type in pre-proxy because sometimes they change
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
2014-02-27 14:16:03 +01:00
Robin Appelman 7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Thomas Müller ba4b593f84 Merge pull request #7446 from owncloud/etag_assert_fixes
use assertSame and assertNotSame for etag checks
2014-02-27 13:51:14 +01:00
Vincent Petry 577e47e207 Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all
close encryption session after decryption was finished
2014-02-27 11:10:45 +01:00
Jörn Friedrich Dreyer 39f2f564a9 use assertSame and assertNotSame for etag checks 2014-02-27 09:39:34 +01:00
Thomas Müller 9e59e64c79 Merge pull request #7421 from owncloud/password-input
disable autocomplete for shared link password input, fix #7419
2014-02-26 22:21:00 +01:00
Bjoern Schiessle 86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +01:00
Björn Schießle b7385986ae Merge pull request #7393 from owncloud/fix_path_in_sharing_results
fix path in sharing results if it is a file in the Shared folder
2014-02-26 15:19:30 +01:00
Joas Schilling 932c4ee927 Allow admins to disable certain external storages for users
Fix issue #6793
2014-02-26 15:02:41 +01:00
Jan-Christoph Borchardt 6c5cc46380 disable autocomplete for shared link password input, fix #7419 2014-02-26 14:48:15 +01:00
Thomas Müller 4b8717df9d Merge pull request #7416 from owncloud/share_api_7311
[share api] only add "received_from" field if a share was found
2014-02-26 14:42:31 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Robin Appelman bc49c6be04 Manually triger the filecache update hooks before any other hook 2014-02-26 14:29:13 +01:00
Bjoern Schiessle 3be5e48b0c only add "received_from" if a share was found 2014-02-26 12:52:35 +01:00
Jan-Christoph Borchardt 2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 2014-02-26 10:16:54 +01:00
Bjoern Schiessle e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Robin Appelman 3a21755963 Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object 2014-02-25 16:23:09 +01:00
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
VicDeo ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups
Add LDAP nested groups
2014-02-25 15:41:10 +02:00
Björn Schießle e10ca7c2e9 Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
[encryption] don't overwrite keys if rename was done by a stream copy
2014-02-25 12:34:49 +01:00
Bjoern Schiessle d3a24e945b add test case if a file gets moved out from the shared folder 2014-02-24 17:56:00 +01:00
Bjoern Schiessle ebd73aee8f don't overwrite keys if rename was done by a stream copy 2014-02-24 17:24:43 +01:00
Morris Jobke 5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
Robin Appelman 7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Vincent Petry 539ea0882b Fixed mount config path 2014-02-24 10:35:24 +01:00
Lukas Reschke 11ca014034 Merge pull request #7305 from owncloud/extstorage-configclass
Added extra checks for ext storage class
2014-02-22 08:10:31 +01:00
root 300b1131b4 replace spaces with tabs
use true instead of 1
2014-02-21 17:09:36 +01:00
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg
Use SVG icons in New file menu
2014-02-21 16:18:43 +01:00
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 2014-02-21 15:51:41 +01:00
Jan-Christoph Borchardt 6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt 877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman 4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 2014-02-21 14:00:17 +01:00
Philipp Schmitt 43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Bjoern Schiessle 0c0e4fced5 fix test so that it doesn't depend on the array order 2014-02-21 13:37:47 +01:00
Bjoern Schiessle 6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Jan-Christoph Borchardt b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00
Thomas Müller fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test
LDAP: fix and extend tests
2014-02-21 00:42:43 +01:00
Luke Policinski 089052b13a Fixed issue with drag and drop not in the root directory, for folders and files 2014-02-20 20:18:27 +00:00
Lukas Reschke 6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
Morris Jobke 65843e2459 Improve jQuery element selector
see https://github.com/owncloud/core/pull/7012/files#r9337198
http://24ways.org/2011/your-jquery-now-with-less-suck/
2014-02-20 18:24:43 +01:00
Thomas Müller d0c8b310b9 uppercase text and fix dialog popup 2014-02-20 18:24:42 +01:00
Thomas Müller 179fbada32 show share owner within shared folders as well 2014-02-20 18:24:42 +01:00
Thomas Müller 2b84f5e0b9 remove duplicate selectors and declaration 2014-02-20 18:24:42 +01:00
Thomas Müller 271684dcfe update share owner 2014-02-20 18:24:42 +01:00
Thomas Müller d6e89a9a28 store the share owner in a data-attribute instead of a separate span 2014-02-20 18:24:42 +01:00
Thomas Müller 7c68025010 adding share owner information to the file list 2014-02-20 18:24:42 +01:00
Robin Appelman f710205ee7 Make unit tests expect the svg icons 2014-02-20 16:56:09 +01:00
Robin Appelman 0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
icewind1991 d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463
Correctly redirect to settings page when not selecting cert file for upload
2014-02-20 16:24:31 +01:00
blizzz 984ea7b3ff Merge pull request #7205 from owncloud/fix_7153
LDAP: prevent other configuration from being deleted when deleting the f...
2014-02-20 16:22:43 +01:00
Morris Jobke 658758c3f7 fix intendation 2014-02-20 15:36:52 +01:00
Vincent Petry 44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +01:00
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
Vincent Petry 476444ab1a Fixed title format 2014-02-20 14:56:28 +01:00
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Arthur Schiwon d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Lukas Reschke 719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Vincent Petry b060a17b59 Added extra checks for ext storage class 2014-02-20 10:40:10 +01:00
Vincent Petry 49f2014e0c Revert "Added extra checks for ext storage class"
This reverts commit 9e9a5b9ea1.

Unit tests weren't ready, need further tweaking.
2014-02-20 10:01:49 +01:00
Lukas Reschke 8f22535e75 Merge pull request #7284 from owncloud/ldap_filter_compilation
LDAP: improve compilation of filters
2014-02-20 09:55:02 +01:00
Lukas Reschke 38d6c56249 Merge pull request #7294 from owncloud/extstorage-configclass
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
Guillaume AMAT 577559458d Uses OC.basename instead of custom code 2014-02-19 22:50:49 +01:00
Luke Policinski b01492fecd Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:28:32 +00:00
Luke Policinski 79a6d89bcc Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:23:39 +00:00
Vincent Petry 9e9a5b9ea1 Added extra checks for ext storage class 2014-02-19 19:08:28 +01:00
Vincent Petry b2b35cd335 Fixed ext storage webdav path encoding
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
  support/return it
- Fixed touch() to return false if the server doesn't implement
  PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
  lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
Joas Schilling 513940f4a4 Correctly redirect to settings page when not selecting cert file for upload
Fix #5463
2014-02-19 17:07:29 +01:00
Robin Appelman f33d35cd07 Fix svg icons for public shares and external/shared files 2014-02-19 15:08:05 +01:00
Robin Appelman 609a91a9b1 Show svg mime icons when no preview is available 2014-02-19 14:47:29 +01:00
Vincent Petry 952584e9c7 Merge pull request #7195 from owncloud/files-selectall
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
Arthur Schiwon c0328b4f0f LDAP: improve compilation of filters 2014-02-19 13:13:01 +01:00
Jan-Christoph Borchardt 7330f61a94 Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
Morris Jobke bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
Joas Schilling fdb0d2067f Remove duplicated definition and move OC.msg to js/js.js
Fix issue #7166
2014-02-19 10:20:52 +01:00
Vincent Petry e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Thomas Müller 1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Vincent Petry 797e0a614c Added extra checks for invalid file chars in newfile.php and newfolder.php
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters
2014-02-18 17:54:32 +01:00
Lukas Reschke 3b1083f46e Merge pull request #7176 from owncloud/style
Some style fixes
2014-02-18 17:30:26 +01:00
Robin Appelman d18b9f6ea4 use a FileInfo object of the directory when generting the filelist 2014-02-18 15:39:35 +01:00
Jan-Christoph Borchardt 323cc1166b Merge pull request #7235 from DavidVentura/master
small change for compatibility
2014-02-17 21:16:39 +01:00
Vincent Petry 5a80339b51 Merge pull request #7211 from mattcaron/master
Fit shared videos to viewer, just like images. Issue #1648
2014-02-17 20:59:29 +01:00
Matthew Caron aa1a50f5b3 Consolidate two sections, per code review. Issue #1648 2014-02-17 12:57:54 -05:00
Vincent Petry 94b3296a71 Trashbin select all now doesn't send file list
- Fixed "delete" and "restore" actions to not send the file list when
  all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
  value based on the current dir
2014-02-17 18:34:59 +01:00
David a282afcbbb small change for compatibility 2014-02-17 13:27:07 -03:00
Arthur Schiwon 54f9db403f LDAP: improve wizard strings, fixes #5567 2014-02-17 17:19:48 +01:00
Bjoern Schiessle 6778dc5a4a don't block login forever if we are stuck in the middle of the initial encryption 2014-02-17 10:03:57 +01:00
Bjoern Schiessle f2f5769df7 catch errors during decryption 2014-02-17 10:03:57 +01:00
Bjoern Schiessle 2ab062193a catch errors during initial encryption 2014-02-17 09:58:46 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Matthew Caron 2887fb1f48 Fit shared videos to viewer, just like images. Issue #1648 2014-02-14 16:09:51 -05:00
Bjoern Schiessle 2933668355 fileinfo is no longer a array 2014-02-14 18:05:59 +01:00
Arthur Schiwon d88c6778ff LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons 2014-02-14 15:34:22 +01:00
icewind1991 2a7509ee50 Merge pull request #6748 from owncloud/fileinfo
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Vincent Petry d7f4547717 Merge pull request #6726 from owncloud/fix_6630
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00
Thomas Müller 595b908b74 Merge pull request #7183 from owncloud/remove-force-lowercase
remove forced lowercase from extension, fix #4747
2014-02-14 13:58:42 +01:00
Vincent Petry afe133d5d1 Merge pull request #7168 from owncloud/issue/7152
Send correct path on file upload when using public app
2014-02-14 12:25:20 +01:00
Vincent Petry d5397d813c Do not send file list for select all on Download/delete
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
  with root
- Delete will send "allfiles" to the server that will find the file
  list or the passed directory by itself
2014-02-13 20:28:52 +01:00
Robin Appelman 181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Guillaume AMAT 01dc7c5482 Gets the page title from oc_defaults in Files app 2014-02-13 10:48:01 +01:00
Jan-Christoph Borchardt 6e17d71a0d remove forced lowercase from extension, fix #4747, also coding style fixes 2014-02-13 10:39:38 +01:00
Thomas Müller 30662fa7ac Merge pull request #7178 from owncloud/issue/6277
External FTP Storage should request hostname instead of URL
2014-02-12 23:01:41 +01:00
Joas Schilling 658af627ce External FTP Storage should request hostname instead of URL
Fix issue #6277
2014-02-12 18:20:10 +01:00
root d10f6e94dc fix coding style to blizzz happy.. ;-) 2014-02-12 16:56:17 +01:00
Joas Schilling 9619459e37 Send correct path on file upload when using public app
Fix issue #7152
2014-02-12 15:49:09 +01:00
icewind1991 7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Bart Visscher 1fb5f96c37 Style fixes 2014-02-12 09:09:51 +01:00
Guillaume AMAT a62b393d02 Update page title when navigating through directories 2014-02-12 00:54:35 +01:00
Thomas Müller 3699728a3a Merge pull request #7085 from owncloud/quick-fix-7019-master
Load authentication apps to get users from all backends
2014-02-11 18:41:08 +01:00
Arthur Schiwon 14d1abf63f LDAP: improve debug message 2014-02-10 14:45:37 +01:00
Arthur Schiwon 18e1a10e96 LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image 2014-02-10 14:45:31 +01:00
Morris Jobke eba1d574cf Merge pull request #7134 from owncloud/issue/5794
Make google drive client secret and dropbox api secret a password field
2014-02-10 14:34:24 +01:00
Robin Appelman 753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Morris Jobke 02bdb47049 Merge pull request #7140 from owncloud/enc_dont_login_during_encryption
refuse login as long as the initial encryption is running
2014-02-10 13:25:39 +01:00
Arthur Schiwon 299d37154b LDAP: add documentation info in info.xml 2014-02-10 12:59:11 +01:00
Vincent Petry 6b5a7035ee Merge pull request #7126 from nickvergessen/issue/6683
Only add files to file list when uploading to current directory
2014-02-10 12:14:05 +01:00
Arthur Schiwon e156f85bfb Rephrase and clarify log message 2014-02-10 11:29:08 +01:00
Arthur Schiwon a76840d206 Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670 2014-02-10 11:29:02 +01:00
Arthur Schiwon e825a008c9 Wizard: disable LDAP referrals, fixes #6670 2014-02-10 11:28:55 +01:00
Arthur Schiwon a908bd5695 throw an info message, when base dn test failed 2014-02-10 11:28:46 +01:00
Arthur Schiwon bc17b40650 LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard 2014-02-10 11:28:38 +01:00
Bjoern Schiessle 050e84a08f refuse login as long as the initial encryption is running 2014-02-10 10:56:11 +01:00
Thomas Müller e7db48cd7f Merge pull request #7133 from owncloud/fix-implied-eval
Fix implied evals and doubled definition of variable
2014-02-10 10:08:40 +01:00
Joas Schilling b330d07b51 Fix more documentation failes
Issue #7111
2014-02-08 11:47:55 +01:00
Joas Schilling 828985dc60 Make google drive client secret and dropbox api secret a password field
Fix issue #5794
2014-02-07 18:12:01 +01:00
Bjoern Schiessle 91254c304d name users after test 2014-02-07 18:07:38 +01:00
Morris Jobke 13fa0e2a9d Fix implied evals and doubled definition of variable
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Joas Schilling af7366cd30 Only add files to file list when uploading to current directory
Fix Issue #6683
2014-02-07 13:06:50 +01:00
Bjoern Schiessle a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer 2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Vincent Petry aff1cafaca Merge pull request #7089 from owncloud/sharing-searchbymime
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
Thomas Müller 79fc4f3126 Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging 2014-02-06 11:34:27 +01:00
Thomas Müller 21207c6a73 remove superfluous $RUNTIME_APPTYPES 2014-02-06 09:50:11 +01:00
Pellaeon Lin 946fccc0dd Remove unused template variable assignment of files_sharing/template/public.php 2014-02-06 12:26:36 +08:00
Pellaeon Lin 8c56e21ced Move template variable assignment to correct place 2014-02-06 12:06:16 +08:00
Jan-Christoph Borchardt b0692af29a Merge pull request #7064 from owncloud/files-scrolltopafterupdate
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
Björn Schießle 697b25f165 Merge pull request #7032 from owncloud/enc_fix_delete
Encryption replace delete proxy with pre/post hooks and add tests
2014-02-05 14:26:52 +01:00
Robin Appelman 1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Vincent Petry fa5ddc3e18 Fixed searchByMime in shared cache
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
Thomas Müller 9d9f360b77 Load authentication apps to get users from all backends - fixes #7019 2014-02-05 12:54:31 +01:00
Thomas Müller 6d3b61f388 Merge pull request #7011 from owncloud/jshint
Added .jshintrc
2014-02-04 12:11:32 -08:00
Vincent Petry fe2a63ffd4 Scroll to the top after switching dir
Fixes #7061
2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt 0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Jan-Christoph Borchardt 3692260174 Merge pull request #7055 from owncloud/ellipsize-modified-date
ellipsize long modified dates to make room for showing delete button
2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt 6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
Björn Schießle 9a0d7c5be4 Merge pull request #7014 from owncloud/fix_ocs_share_api
remove needless element tag from the ocs share api
2014-02-03 08:02:54 -08:00
Bjoern Schiessle 97921d0c25 add function to extract filename from sharekey name + tests 2014-02-03 13:39:05 +01:00
Bjoern Schiessle fe5f512272 added tests for the delete hooks if the trash bin is disabled 2014-02-01 20:08:23 +01:00
Bjoern Schiessle bef58f5361 don't expect OC_FilesystemView, this is depreciated 2014-01-31 20:39:52 +01:00
Bjoern Schiessle 4d1086c35f better error detection and don't use glob() 2014-01-31 20:39:11 +01:00
Bjoern Schiessle 5610842e56 move unlink proxy to a hook which handles pre and post conditions 2014-01-31 20:38:35 +01:00
Georg Ehrke 1f30bffba3 Merge pull request #7017 from owncloud/trashpreview
Fixed image preview in trashbin subdirs
2014-01-31 07:29:08 -08:00
raghunayyar 5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
Vincent Petry c5767b67b1 Fixed image preview in trashbin subdirs 2014-01-30 17:03:13 +01:00
Vincent Petry d49c7ad4fb Fixed double file encoding for previews 2014-01-30 16:34:37 +01:00
Georg Ehrke c5742520e1 don't urldecode get var, php does this automatically 2014-01-30 16:32:45 +01:00
Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Vincent Petry ba1b9df8a9 Fixed file name validation unit test + added newline
- fixed file name validation unit test
- added "\n" as forbidden character in isFileNameValid()
2014-01-30 13:40:01 +01:00
Vincent Petry d36a2ff9ee Added .jshintrc
- Also fixes a few JSHint warnings in files app
- Added "global" comment on top of files app to suppress warning and
  also inform devs about what globals are use
2014-01-30 13:40:01 +01:00
Bjoern Schiessle f9d9a62e58 remove needless element tag 2014-01-30 13:34:41 +01:00
Vincent Petry bc598f1919 Updated unit tests for rename action
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
  including the rename one
2014-01-30 10:07:08 +01:00
raghunayyar 85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Jan-Christoph Borchardt 271088a7a2 Merge pull request #6777 from owncloud/mobile-style
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt edea7781b7 make header scroll up for single shares, more view of content on small screens 2014-01-29 17:20:55 +01:00
Tigran Mkrtchyan 8cc9727520 mount: make location of mount.json configurable
do not share users data with config files

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
Thomas Müller 7655728ddf - adding class to header div: share-folder or share-file
- for supported previews are shown with a size of 500px; icons with a size of 128px
2014-01-29 16:52:30 +01:00
Morris Jobke afa00318bc Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
Added error message for when target folder was removed
2014-01-29 07:48:50 -08:00
Robin Appelman 4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt 5a869732d1 adjust file type icon placement for when no preview can be generated 2014-01-29 15:28:57 +01:00
Pellaeon Lin 929c930b0a Use $storageInfo['free'] 2014-01-29 21:24:31 +08:00
Vincent Petry 58c7042e70 Added error message for when target folder was removed
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.

In the case of upload of multiple files, the upload is cancelled.

This situation can happen if the target folder was renamed or removed
from another browser window or client.
2014-01-29 12:46:11 +01:00
Björn Schießle 609d5f2458 Merge pull request #6987 from owncloud/share_api_and_encryption
[ocs share api] public upload is also possible with encryption enabled, since OC6
2014-01-29 02:50:25 -08:00
Jan-Christoph Borchardt d310df505c permanently show download action on mobile, only icon 2014-01-29 11:43:34 +01:00
Jan-Christoph Borchardt 8f81f007cd fix horizontal scrollbar appearing when footer is too long, footer wraps now 2014-01-29 11:06:19 +01:00
Jan-Christoph Borchardt 13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Vincent Petry e6f93fc841 Fix warnings in logs when renaming over the web UI
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.

This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
2014-01-29 10:43:13 +01:00
Morris Jobke cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Bjoern Schiessle cd4e044f66 public upload is also possible with encryption enabled, since OC6 2014-01-28 17:28:20 +01:00
Bjoern Schiessle 7f83f2a8f2 use more accurate error codes 2014-01-28 13:31:43 +01:00
VicDeo 0a77d41178 Merge pull request #6965 from owncloud/unused-free-space
Remove unused $freeSpace
2014-01-27 10:27:51 -08:00
Robin Appelman b590f019f6 Remove unused $freeSpace 2014-01-27 16:51:32 +01:00
Thomas Müller ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman 3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Morris Jobke 0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Vincent Petry 11ef12a106 Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Jan-Christoph Borchardt 46745895ae Merge pull request #5153 from owncloud/core-em-to-px
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt 6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
Björn Schießle 1d3da8b0ed Merge pull request #6916 from owncloud/encryption_update_filecache
[encryption] update file cache after the file was written
2014-01-27 01:37:52 -08:00
raghunayyar 2a0e8329f9 Fixes settings.css and converts more styles. 2014-01-26 03:02:52 +05:30
raghunayyar 932e8f9f58 Fixes width of the dropdown menus as per computed styles. 2014-01-26 02:59:28 +05:30
Jan-Christoph Borchardt c767ebcc03 fix multiselect bar being too short on big displays 2014-01-24 18:20:52 +01:00
Morris Jobke dff2675efa Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
Fixed max upload size input field style
2014-01-24 07:05:50 -08:00
Björn Schießle 6875e3d9c7 Merge pull request #6921 from owncloud/trash_mimetype_size
increase size of mimetype column
2014-01-24 07:05:18 -08:00
Bjoern Schiessle 83878b9a7d only update file cache with the unenecrypted size when the file was written 2014-01-24 16:01:00 +01:00
Pellaeon Lin 19675c2c9d Fix variable name 2014-01-24 22:54:16 +08:00
Morris Jobke 1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
Vincent Petry 9f003a3546 Merge pull request #5954 from owncloud/extstorage-stream-sftp
[Ext storage] Now using SFTP stream wrapper from phpseclib
2014-01-24 06:20:23 -08:00
Vincent Petry c6695bbd76 Fixed download URL in public page
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry 0671c58e36 Fixed filelist unit tests hidden params
Also added dummy table
2014-01-24 13:19:44 +01:00
Thomas Müller 9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Vincent Petry 4734146580 Fixed max upload size input field style
Added "type=text" makes it look like nice like all other fields
2014-01-23 20:50:09 +01:00