Commit Graph

9809 Commits

Author SHA1 Message Date
Jenkins for ownCloud 8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Volkan Gezer 57452a3641 Keep spaces out of the string
Otherwise translators cannot notice them on Transifex.
2014-12-07 01:57:34 +01:00
Jenkins for ownCloud 94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Lukas Reschke 1be5a3ca89 Merge pull request #12166 from helmutschneider/aws-2.7.5
Upgrade AWS sdk to 2.7.5. Fixes #12023
2014-12-05 20:12:53 +01:00
Lukas Reschke 116a1b366a Merge pull request #11485 from brumsoel/master
Fix timestamp comparator return value
2014-12-05 19:53:09 +01:00
Vincent Petry 89db2a0277 Merge pull request #12523 from owncloud/port-11747
Only store user credentials when SMB_OC storage is enabled
2014-12-05 18:04:06 +01:00
Jenkins for ownCloud 4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Arthur Schiwon 1c369093e5 cache total user count
Conflicts:
	apps/user_ldap/user_ldap.php
2014-12-04 19:09:13 +01:00
Arthur Schiwon ee168a121d Forward port of #12493
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
2014-12-04 19:02:09 +01:00
Vincent Petry bf887eca8b Remove obsoleted filelist prototype backup in tests 2014-12-04 18:39:20 +01:00
Robin Appelman a369d78124 Use the mount config api for files_external 2014-12-04 16:47:30 +01:00
Robin Appelman f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Morris Jobke a0488453ac Merge pull request #12596 from owncloud/remove-travis-traces
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
Jörn Friedrich Dreyer 3cdaa4094f add quiet option, ref #8794 2014-12-04 13:44:30 +01:00
Jörn Friedrich Dreyer 7ef6df04da remove triggerupdate, ref #11872 2014-12-04 13:44:30 +01:00
Bjoern Schiessle 698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Bjoern Schiessle 1509dd1358 update error message 2014-12-04 12:01:11 +01:00
Bjoern Schiessle 0dd44eaf27 OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app 2014-12-04 11:17:44 +01:00
Morris Jobke 2c5e4b3d3f Remove last traces of travis integration 2014-12-04 10:09:13 +01:00
Jenkins for ownCloud 5aad902507 [tx-robot] updated from transifex 2014-12-04 01:54:42 -05:00
brumsel 0dcfd5f20b Modified filesort test cases to test for large sizes & timestamps 2014-12-03 23:45:57 +01:00
brumsel 4ba520e214 Merge remote-tracking branch 'upstream/master' 2014-12-03 23:04:49 +01:00
Bjoern Schiessle 0a173e2b58 fix typo 2014-12-03 19:46:32 +01:00
Morris Jobke 3fdb1937a3 Merge pull request #12382 from owncloud/enc_reorganize_folders2
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
Thomas Müller 6daa588e1c Merge pull request #12556 from owncloud/add-route-for-versions
Add route for download of versions
2014-12-03 14:01:58 +01:00
Lukas Reschke 8c8c257ce3 Merge pull request #12554 from owncloud/versions-app-autoload
Autoload lib files of versions app
2014-12-03 09:34:57 +01:00
Jenkins for ownCloud af50df8912 [tx-robot] updated from transifex 2014-12-03 01:54:32 -05:00
Lukas Reschke c4e0c02526 Add route for download of versions
Otherwise on master it was not possible anymore to download older versions.

Fixes itself.
2014-12-02 17:52:31 +01:00
Morris Jobke f9958153ef Merge pull request #12333 from owncloud/delete-selected-files
Fix deleting non deletable files by selecting them
2014-12-02 17:32:04 +01:00
Joas Schilling 1bd018a70c Autoload exception from files_trashbin 2014-12-02 17:26:42 +01:00
Joas Schilling 694003d147 Autoload lib files of versions app 2014-12-02 17:21:19 +01:00
Bjoern Schiessle 9ca9acf3f8 small fixes 2014-12-02 16:08:06 +01:00
Bjoern Schiessle 2e78217f17 delete old keys if file was moved to a different mount point 2014-12-02 16:03:54 +01:00
Bjoern Schiessle 49cfc30359 upgrade to new folder structure 2014-12-02 16:03:54 +01:00
Robin Appelman ce10b93519 Dont return cached date in shared cache when the file doesn't exist 2014-12-02 15:28:11 +01:00
Vincent Petry c02ef69521 Simple Plugin system for Javascript 2014-12-01 16:20:44 +01:00
Lukas Reschke 805be635fa Only store user credentials when SMB_OC storage is enabled
Conflicts:
	apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
Adam Williamson 415411a3d5 google: delete original after successful rename
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.

OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)

A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.

We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
2014-11-30 15:34:35 -08:00
Jenkins for ownCloud 40badba703 [tx-robot] updated from transifex 2014-11-30 01:54:25 -05:00
Jenkins for ownCloud 83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Jenkins for ownCloud 96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Jenkins for ownCloud 87a2aabb98 [tx-robot] updated from transifex 2014-11-27 01:54:46 -05:00
Morris Jobke 60f7a86323 Merge pull request #12448 from owncloud/no503forRoot
Don't show favicon to prevent iteration through subfolders
2014-11-26 17:06:43 +01:00
Lukas Reschke 8af346a84d Don't show favicon to prevent iteration through subfolders
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 12:38:26 +01:00
Robin Appelman a2457b5fb9 Merge pull request #6989 from AdamWill/google-1
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
Robin Appelman e8cbb8e2d8 Add js unit test 2014-11-26 12:14:35 +01:00
Robin Appelman 9c86665ef4 Dont show the delete button for selected files if one of the selected files is not deletable 2014-11-26 12:14:35 +01:00
Robin Appelman 4321d7522e Check if files are deletable before trying to delete them 2014-11-26 12:14:35 +01:00
Bjoern Schiessle a90606fb14 change private/public key names for consistency reasons 2014-11-26 10:57:47 +01:00
Bjoern Schiessle 266f1a2afa harmonize copyright notice 2014-11-26 10:57:47 +01:00
Bjoern Schiessle fd86d76f98 new folder structure for keys
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
Lukas Reschke c749570a06 Merge pull request #12411 from owncloud/unknown-command-windows
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Morris Jobke c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Jenkins for ownCloud 3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Thomas Müller e6a7022037 Merge pull request #12410 from owncloud/no_session_for_public_share_key
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
Joas Schilling 0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling 2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Bjoern Schiessle 4643a5d238 replace \OC:: with \OC::->getSession() 2014-11-25 16:15:32 +01:00
Bjoern Schiessle 1d33503487 we no longer need to keep the session open for encryption 2014-11-25 13:37:11 +01:00
Bjoern Schiessle 917bef39b7 don't store private public-share-key in session 2014-11-25 12:32:25 +01:00
Bjoern Schiessle f274833403 remove unused variable 2014-11-25 10:12:10 +01:00
Morris Jobke 6fb2477fb7 Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
Morris Jobke bc3c835f6a Merge pull request #12390 from owncloud/use-session-in-case
Close session only if encryption app is not enabled
2014-11-25 09:32:16 +01:00
Morris Jobke 02095d4f20 Merge pull request #11837 from owncloud/fix-11328
unify count filters and introduce display name attribute detection
2014-11-24 18:13:01 +01:00
Vincent Petry e689bc745f Improve FileActions JS to allow for custom rendering
This improves the OCA.Files.FileActions class to support passing a
"render" function in the action object.

The default function "_defaultRenderFunction" is used by default and
renders actions in the usual actions container.

Moved "Rename" and "Delete" to custom render functions.
2014-11-24 16:26:50 +01:00
Bjoern Schiessle 1645c8f819 use login name to verify password 2014-11-24 15:44:43 +01:00
Lukas Reschke 8589079590 Close session only if encryption app is not enabled
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
Morris Jobke 8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Jenkins for ownCloud 0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Jenkins for ownCloud fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Arthur Schiwon 9aef83b579 make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise) 2014-11-22 00:51:41 +01:00
Arthur Schiwon 503de94392 make updateCount work properly with new xp'd mode as well as without 2014-11-21 16:23:56 +01:00
Bjoern Schiessle a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Arthur Schiwon c07c338c90 fix counting when ldapPagingSize is 0 2014-11-21 14:51:20 +01:00
Jenkins for ownCloud f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Arthur Schiwon b5e707b1bf trigger count on the correct filter 2014-11-20 18:31:40 +01:00
Arthur Schiwon 6b6147dafd phpdoc and mixed up letters 2014-11-20 18:31:40 +01:00
Arthur Schiwon 031d6c179f better readbility, no effective changes 2014-11-20 18:31:40 +01:00
Arthur Schiwon 0e6d47123a use underscore.js for undefined checks 2014-11-20 18:31:40 +01:00
Arthur Schiwon d8bb8afee3 this happens already before counting, no need anymore 2014-11-20 18:31:40 +01:00
Arthur Schiwon c9e865629e JS doc 2014-11-20 18:31:40 +01:00
Arthur Schiwon 4a3fe42b16 a corrected email attribute needs to be saved, not only returned 2014-11-20 18:31:39 +01:00
Arthur Schiwon f9b4f5f4e5 to reassure that selected attributes still work, do not count all matching entries but limit it to 1 in order to make it faster 2014-11-20 18:31:39 +01:00
Arthur Schiwon 71944a59a5 detectors (email, displayname..) are now started in one place, triggered from only 2 places. more reliable structure and flow, saves requests 2014-11-20 18:31:39 +01:00
Arthur Schiwon f725cc66a3 consolidate user count filter in wizard and user back end 2014-11-20 18:31:39 +01:00
Arthur Schiwon cb3af1dce2 detect user display name attribute and return user count depending on its presence 2014-11-20 18:31:39 +01:00
Vincent Petry 391ece46e3 Fix file upload to ext storage when recovery key is enabled
Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
Lukas Reschke 713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Thomas Müller cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Morris Jobke 46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer 995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Morris Jobke 288acb55a0 Merge pull request #12305 from owncloud/sharelist-nodelete
Remove delete button in shared with others list
2014-11-20 13:32:07 +01:00
Vincent Petry 63fa8ec69a JSHint fixes in sharedfilelistSpec unit test file 2014-11-19 17:44:05 +01:00
Vincent Petry 98ec0451be Remove delete button in shared with others list
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.

This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
2014-11-19 17:42:57 +01:00
Joas Schilling 76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Joas Schilling bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Lukas Reschke 284ba5b688 Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
Lukas Reschke 1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Morris Jobke dc9eaf59dc Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled
Only show undelete capability if files_trashbin is enabled
2014-11-19 11:42:19 +01:00
Jenkins for ownCloud 705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke 61641293f4 Only show undelete capability if files_trashbin is enabled
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
2014-11-18 23:06:39 +01:00
Lukas Reschke a6ebb17610 Remove unused variable and make Scrutinizer happy. 2014-11-18 18:52:00 +01:00
Lukas Reschke f3ab4f3faf Don't disclose relative directory path for single shared files of user
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
2014-11-18 18:51:57 +01:00
Lukas Reschke 5f07fb15dc Fix case-sensitivity 2014-11-18 18:50:47 +01:00
Lukas Reschke 1b85f40cbe $file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
This feature only exists on master.
2014-11-18 17:14:26 +01:00
Morris Jobke 230e517f35 Merge pull request #12220 from owncloud/remove-unused-code
Remove unused code
2014-11-18 10:36:32 +01:00
Jenkins for ownCloud 91f7c0af6e [tx-robot] updated from transifex 2014-11-18 01:54:31 -05:00
Bjoern Schiessle f6efbfcf0b listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user 2014-11-17 17:50:20 +01:00
Morris Jobke 146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Lukas Reschke 8dbedbb849 Remove unused code
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
2014-11-17 14:01:39 +01:00
Lukas Reschke 8595b76df2 Remove phpass and migrate to new Hasher interface
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Joas Schilling 6625d5c88f Correctly restore previous root mount point after testing 2014-11-17 10:48:19 +01:00
Joas Schilling b228226700 Fix single run of encryption tests and usages of uniqid() and fopen() 2014-11-17 10:48:13 +01:00
Joas Schilling a3a064fe96 Skip some more tests on Windows which just can not work at all 2014-11-17 10:48:06 +01:00
Jenkins for ownCloud 9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05:00
Jenkins for ownCloud 55889d7eb4 [tx-robot] updated from transifex 2014-11-16 01:55:00 -05:00
Jenkins for ownCloud 580d27eed2 [tx-robot] updated from transifex 2014-11-15 01:54:28 -05:00
Vincent Petry c941c3fa51 Show warning when invalid user was passed
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
2014-11-14 16:43:23 +01:00
Vincent Cloutier fad621140b Added download size on public sharing 2014-11-14 16:26:59 +01:00
Lukas Reschke 988c85d292 Refactor file sharing public link handling
fixes download issue introduced by #10755

Conflicts:
	apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
Jörn Friedrich Dreyer df18bd3e0d Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
Do not remove dir entry if it has the same name as the parent
2014-11-14 10:37:10 +01:00
Jenkins for ownCloud 0811b39e5f [tx-robot] updated from transifex 2014-11-14 01:54:47 -05:00
Johan Björk e0056c4a0d Upgrade AWS sdk to 2.7.5 2014-11-13 23:37:34 +01:00
Vincent Petry 914f4cb6f2 Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
blizzz 559b34e53d Merge pull request #12005 from owncloud/bower-multiselect
Move multiselect to user_ldap
2014-11-13 14:43:06 +01:00
Vincent Petry 5ca869c324 Merge pull request #9177 from owncloud/jsdocexperiment
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Jenkins for ownCloud a069171cda [tx-robot] updated from transifex 2014-11-13 01:54:36 -05:00
Morris Jobke f39cb3fbc9 Migrate multiselect to user_ldap 2014-11-13 00:47:14 +01:00
Vincent Petry e0b797c43c Merge pull request #12087 from AdamWill/google-touch
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
2014-11-12 18:24:57 +01:00
Jenkins for ownCloud 1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Morris Jobke 081787d6ae Fix infinite loop if count and limit is 0
* otherwise it will always think it hits the limit and need another round to fetch additional results
2014-11-11 12:15:30 +01:00
Morris Jobke 9368de5a8b Merge pull request #11789 from owncloud/fix-11762
[LDAP] Login: dont fail with 500 if configured display name attribute is not set
2014-11-11 11:16:41 +01:00
Jenkins for ownCloud 664cc4ac0e [tx-robot] updated from transifex 2014-11-11 01:55:23 -05:00
Adam Williamson f76419d190 fix touch() when $mtime is set (Google wants RFC3339) #11267
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.

This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989).
2014-11-10 11:56:01 -08:00
Morris Jobke 2023878d53 Merge pull request #10966 from owncloud/storage-root-share-permissions
Dont' use mountpoint permissions as share permissions for external storages
2014-11-10 13:11:22 +01:00
Morris Jobke 8afb623f08 Merge pull request #12070 from owncloud/accessibility-fixes
Accessibility fixes
2014-11-10 13:06:46 +01:00
Vincent Petry 676b911b22 Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Jenkins for ownCloud c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Jenkins for ownCloud 46010655d2 [tx-robot] updated from transifex 2014-11-09 01:54:30 -05:00
Jenkins for ownCloud da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Adam Williamson c237acb395 google: disable compression when curl is not available
This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
2014-11-07 22:52:07 -08:00
Adam Williamson b3bccce267 update google-api-php-client to 1.0.6-beta
Latest version with various bugfixes, also implements support
for using curl instead of its own io class when available; this
avoids the bug that causes severe excess bandwidth use due to
some kind of zlib issue.
2014-11-07 22:33:40 -08:00
Bjoern Schiessle 2af7256267 only set the values we need and make sure that we write the file info for both
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
Bjoern Schiessle 3d19bb2e51 also try to get file info from part file 2014-11-07 15:17:24 +01:00
Bjoern Schiessle a10ae2816e clean up encryption exceptions 2014-11-07 13:48:31 +01:00
Lukas Reschke e345697cab Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Jenkins for ownCloud 7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Adam Williamson 04369fb9cc scrutinizer fix: explicitly declare Google class property $client 2014-11-06 21:28:05 -08:00
Adam Williamson f9bd43ff03 scrutinizer fix: correct @return for getDriveFile() 2014-11-06 21:27:12 -08:00
Adam Williamson 5935758b3a bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)
This is the upstream commit that merged my query separator fix. It's slightly
after the 1.0.3-beta tag. I eyeballed the other post 1.0.3-beta changes and
none of them looks like any kind of problem, so we may as well just use this
upstream state.
2014-11-06 18:47:11 -08:00
Adam Williamson 61d70b17ee google drive: set access type to 'offline' when requesting token
We need to do this in order to be able to refresh the access token without
prompting the user for their credentials every hour. This was the default
in 0.6 of the Google library, but needs to be explicitly specified in 1.0.
2014-11-06 18:47:11 -08:00
Adam Williamson 18707f5aba fix a bug in google-api-php-client: generates an auth url that doesn't work
Submitted upstream as https://github.com/google/google-api-php-client/issues/76
Google's php lib has a function to generate a URL for OAuth2 authentication.
It uses http_build_query() to generate the query part of the URL, and in PHP
5.3 or later, this uses an encoded ampersand - & - as the query separator,
not a raw one. However, Google's OAuth server apparently can't handle encoded
ampersands as separators and so it fails.

This patch explicitly sets a raw ampersand as the separator. If Google decides
to fix their OAuth server instead of merging this patch into google-api-php-
client, we can drop this patch as soon as that happens.
2014-11-06 18:47:11 -08:00
Adam Williamson d96c06f1a3 files_external/3rdparty: update google-api-php-client to 1.0.2-beta 2014-11-06 18:47:11 -08:00
Adam Williamson 62b859d66f Migrate Google Drive storage app to v1.0.0 of the client library 2014-11-06 18:47:11 -08:00
Robin Appelman 0f3fd89f7d Fix sharing tests 2014-11-06 18:31:41 +01:00
Robin Appelman 7ecd220715 Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user 2014-11-06 18:31:40 +01:00
Robin Appelman 9c79c2fa17 Dont make real users in tests 2014-11-06 18:31:40 +01:00
Jan-Christoph Borchardt a410055291 add relevant focus styles to the existing hover styles 2014-11-06 16:22:57 +01:00
Jan-Christoph Borchardt af743efff0 add alt text for file actions, but leave empty since text is directly next to it 2014-11-06 15:33:38 +01:00
Bjoern Schiessle 8104a4e24e check if the provided password is really the current log-in password 2014-11-06 11:12:20 +01:00
Morris Jobke 226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Jenkins for ownCloud fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Jan-Christoph Borchardt e869db47b0 unbold labels and folders 2014-11-05 14:13:09 +01:00
Thomas Müller 7f41048a33 Merge pull request #11962 from owncloud/fix-server-sharing-strings
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
Bjoern Schiessle c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Vincent Petry 97cbec8b8d Merge pull request #11853 from owncloud/close-session-for-trashbin
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
Thomas Müller 8116d903dd adjust strings - fixed #11930 2014-11-05 11:08:17 +01:00
Jenkins for ownCloud c8f55e7f87 [tx-robot] updated from transifex 2014-11-05 01:54:36 -05:00
Vincent Petry ee6d8c9d58 Store curl error message directly 2014-11-04 17:37:15 +01:00
Bjoern Schiessle 0580c232d7 still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue. 2014-11-04 17:16:36 +01:00
Vincent Petry 768f3979e0 Check for cert bundle existence before using it 2014-11-04 16:44:42 +01:00
Vincent Petry 79a7297880 Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
Only rescan trash folder when checking deleted versions
2014-11-04 14:16:58 +01:00
blizzz b26f11c16f Merge pull request #11362 from mark0n/rm_ldap_conf_cli
Add a CLI command that deletes an LDAP config
2014-11-04 13:19:45 +01:00
Vincent Petry 97a51c46ed Only rescan trash folder when checking deleted versions
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
2014-11-04 12:29:42 +01:00
Morris Jobke 1979ec70a5 JS unit tests fix - use toBeUndefined() instead of toEqual(null) 2014-11-04 10:37:16 +01:00
Jenkins for ownCloud 287faf9923 [tx-robot] updated from transifex 2014-11-04 01:55:05 -05:00
blizzz dc9ea893fd Merge pull request #11172 from owncloud/user-ldap-no-bcmath
Fix ldap convertSID2Str() / Remove BCMath dependency
2014-11-03 14:03:26 +01:00
Björn Schießle 79b650a023 Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
move versions if a file was renamed in a shared folder
2014-11-03 12:53:14 +01:00
Andreas Fischer d1410b46a9 user_ldap: Reimplement convertSID2Str() without BCMath dependency.
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
2014-11-03 12:07:53 +01:00
Jenkins for ownCloud fd480d6c40 [tx-robot] updated from transifex 2014-11-02 01:54:24 -05:00
Jenkins for ownCloud 469b2655d5 [tx-robot] updated from transifex 2014-11-02 01:54:29 -04:00
Jenkins for ownCloud d8f7780f4f [tx-robot] updated from transifex 2014-11-01 01:54:37 -04:00
Bjoern Schiessle ebe1d3df0a don't move versions if only the mount point was renamed 2014-10-31 16:42:54 +01:00
Robin Appelman 83126ab675 Add unit tests 2014-10-31 15:22:08 +01:00
Robin Appelman 307071cfec Keep the share permissions from mountpoints 2014-10-31 14:43:32 +01:00
Robin Appelman 2705588073 Dont' use mountpoint permissions as share permissions for external storages 2014-10-31 14:43:32 +01:00
Jörn Friedrich Dreyer fe9e6be35c test files external amazon s3 storage id migration 2014-10-31 14:26:09 +01:00
Jörn Friedrich Dreyer 69a3d8eb1a fix files_external storage id migration 2014-10-31 14:25:55 +01:00
Vincent Petry 0f3e6cb50a Improved Javascript docs for JSDoc
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
Lukas Reschke e0528c7598 Merge pull request #11876 from owncloud/remove-pointless-requires
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
Vincent Petry a9b41cbf54 Merge pull request #11850 from owncloud/fix-11848
on xp'ed mode and switching configurations: save raw mode instead of tog...
2014-10-31 08:38:05 +01:00
Jenkins for ownCloud e00f25e5b0 [tx-robot] updated from transifex 2014-10-31 01:55:39 -04:00
Vincent Petry 146c46b73a Merge pull request #11659 from jknockaert/master
rework getFileSize
2014-10-30 18:06:25 +01:00
Thomas Müller f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00
Jan-Christoph Borchardt 108cdeb892 Merge pull request #11867 from owncloud/settings-sidebar-admin
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
Jan-Christoph Borchardt 1dfabfb491 admin settings: fix LDAP settings header layout 2014-10-30 16:04:26 +01:00
Thomas Müller 24feb74638 fixing ldap listing in admin sidebar - needs styling review 2014-10-30 13:55:33 +01:00
Vincent Petry 5536f6edd0 Properly register sharing hooks and proxies
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.

Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
Jenkins for ownCloud ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Lukas Reschke 2cd35e94b4 Close session for files_trashbin
When restoring huge folders the interface will be unresponsive otherwise
2014-10-29 22:53:59 +01:00
Arthur Schiwon 8a48b088ed on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848 2014-10-29 18:53:07 +01:00
Vincent Petry 106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Morris Jobke 7d10ec41e6 Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
Vincent Petry e8f9b929bd Added encryption test when moving file as non-owner 2014-10-29 12:57:12 +01:00
Vincent Petry f44e617dfd Fix warning with unset extension check 2014-10-29 12:56:49 +01:00
Vincent Petry b920f888ae Fix moving share keys as non-owner to subdir
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
Thomas Müller 9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Lukas Reschke 206cb5ba63 Fix typo 2014-10-29 10:11:01 +01:00
Bjoern Schiessle 9d1be0bbaf get the source path and owner in a pre hook and the target path and owner in a
post hook
2014-10-29 10:11:01 +01:00
Vincent Petry ec1a73fab9 Added OC.L10N namespace with translation functions
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Jenkins for ownCloud cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
jknockaert 4faee4011d initialisation of cipher 2014-10-28 19:19:10 +01:00
Jenkins for ownCloud 23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04:00
Arthur Schiwon 05b2a037f2 dont fail with 500 if configured display name attribute is not set 2014-10-27 15:58:23 +01:00
Jenkins for ownCloud 5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud 214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Lukas Reschke acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible
Add type hinting to functions
2014-10-25 14:09:48 +02:00
Jenkins for ownCloud 3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04:00
Lukas Reschke b3a04840b5 Add type hinting to functions
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
Robin Appelman 4438c7de1d Fix shared cache getFolderContents 2014-10-24 12:32:55 +02:00
Robin Appelman 6ed9f53fcd also update shared watcher 2014-10-24 12:32:55 +02:00
Lukas Reschke d060180140 Use function outside of loop
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Lukas Reschke 9739a25547 Merge pull request #11758 from owncloud/fix-permissions
Make files non executable
2014-10-24 12:15:19 +02:00
Lukas Reschke 0525341a12 Merge pull request #11754 from owncloud/fix-division-null
Prevent division by zero
2014-10-24 11:59:29 +02:00
Lukas Reschke 2d2a4741ce Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
Jenkins for ownCloud 9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Lukas Reschke 3efac5a4f2 Prevent division by zero
Potentially fixes https://github.com/owncloud/core/issues/11742
2014-10-24 00:10:22 +02:00
Morris Jobke 7c14a17361 Merge pull request #11721 from owncloud/fix-s3-regression
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
Morris Jobke ca01530f57 Merge pull request #11726 from owncloud/s3-fixunittests
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
Jenkins for ownCloud e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Vincent Petry 188effa433 Fix S3 folder creation for new AWS API
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
Vincent Petry 71dce48bd3 Fix S3 connection 2014-10-22 22:17:07 +02:00
Vincent Petry 075e8d8e86 Lazy initialize external storages
Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
2014-10-22 12:42:36 +02:00
Jörn Friedrich Dreyer a9aa7841c9 Merge pull request #11684 from owncloud/guess_mimetype_on_touch
guess mimetype on touch
2014-10-22 12:32:09 +02:00
Jenkins for ownCloud 916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Lukas Reschke cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
Jörn Friedrich Dreyer 1c9004409b guess mimetype on touch 2014-10-21 12:58:26 +02:00
Lukas Reschke 3e499d1ac4 Merge pull request #11675 from owncloud/urlencode-for-special-characters
URLEncode filenames to be compatible with special characters
2014-10-21 10:05:00 +02:00
Jenkins for ownCloud 8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
jknockaert da44150a15 small fix 2014-10-20 23:25:54 +02:00
jknockaert d277ef6ac2 bugfixes 2014-10-20 23:04:11 +02:00
Lukas Reschke f451ecb8d8 URLEncode filenames to be compatible with special characters 2014-10-20 20:00:34 +02:00
Thomas Müller d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Jörn Friedrich Dreyer cb3a4d22b1 make tests compatible with hook based skeleton generation 2014-10-20 11:29:20 +02:00
Jörn Friedrich Dreyer 9b0f0df7f5 make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud 87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
jknockaert 1b7e9d66b3 ok; still some bugs that had to be fixed 2014-10-20 00:28:41 +02:00
jknockaert 3be57d0169 small fix 2014-10-19 22:54:34 +02:00
jknockaert e318858152 rework getFileSize 2014-10-19 22:27:15 +02:00
Jenkins for ownCloud 245ae7e071 [tx-robot] updated from transifex 2014-10-19 01:54:36 -04:00
Jenkins for ownCloud 68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Arthur Schiwon e16122f2a1 add one simple cache test 2014-10-17 20:16:04 +02:00
Arthur Schiwon 4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon 5170dc3ae6 fix retrievel of group members and cache group members
fix changed variable name
2014-10-17 20:14:52 +02:00
Björn Schießle 2e875bc6b6 Merge pull request #11631 from owncloud/fix-undefine-encryption-exception
fixing usage of EncryptionException
2014-10-17 14:18:59 +02:00
Morris Jobke f1a5ebd59d Merge pull request #11611 from owncloud/fix-svg-master
Fix SVG icons
2014-10-17 12:01:27 +02:00
Thomas Müller d37eee09a5 fixing usage of EncryptionException 2014-10-17 11:46:22 +02:00
Jörn Friedrich Dreyer e679a4c81c Merge pull request #11552 from owncloud/fix_files_external_flickering
Fix files external flickering
2014-10-17 09:49:52 +02:00
Jenkins for ownCloud 92f2914335 [tx-robot] updated from transifex 2014-10-17 01:58:25 -04:00
blizzz 8553e04a78 Merge pull request #11478 from owncloud/fix-11448
LDAP: add setting to wizard that disables auto-detection and enables raw mode
2014-10-16 15:35:30 +02:00
Lukas Reschke 9cfbf7ed1c Fix SVG icons
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
2014-10-16 12:35:51 +02:00
Robin Appelman c71deea0d5 Fix SPACE_UNKNOWN constant 2014-10-16 12:26:26 +02:00
Arthur Schiwon 7b15fcc3f8 left-align checkbox on server tab 2014-10-16 12:08:05 +02:00
Vincent Petry 08582d145c Merge pull request #11524 from nazar-pc/patch-1
Page size calculation based on real page height
2014-10-16 11:21:49 +02:00
Jörn Friedrich Dreyer 0254a3c406 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-16 10:15:43 +02:00
Jenkins for ownCloud c8d8578d1a [tx-robot] updated from transifex 2014-10-16 01:56:30 -04:00
Nazar Mokrynskyi 8198e70f24 Changed fileList.pageSize to function call 2014-10-15 19:18:35 +02:00
Nazar Mokrynskyi 63145f5765 Typo 2014-10-15 19:17:21 +02:00
Arthur Schiwon c714e9bf02 rephrase xp'ed user mode label 2014-10-15 17:44:41 +02:00
Arthur Schiwon b7db454fff remove debug output 2014-10-15 17:28:18 +02:00
Nazar Mokrynskyi da27797e8d Even better - usage of this.$container instead of this.$el.parent() 2014-10-15 15:24:03 +02:00
Thomas Müller b091394a90 introduce new app page layout
filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
Nazar Mokrynskyi 5033fc4e52 Stub for pageSize, because now it is dynamically calculated 2014-10-15 15:09:01 +02:00
Nazar Mokrynskyi 9de874f015 this.$el is not the same as $('#app-content')
That is why we use `this.$el.parent()` instead
2014-10-15 15:06:35 +02:00
Nazar Mokrynskyi 33ada11a64 Use function call for FileList.pageSize 2014-10-15 14:55:24 +02:00
Nazar Mokrynskyi 6ec9c99d48 Use this.$el instead of the absolute selector 2014-10-15 14:16:17 +02:00
Vincent Petry 4650101674 Merge pull request #11548 from owncloud/extstorage-ocfields
Allow specifying protocol in ext storage OC config
2014-10-15 13:27:23 +02:00
Arthur Schiwon ab6890b854 instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui 2014-10-15 12:51:46 +02:00
Arthur Schiwon 4385188920 show busy cursor and lock tabs on save 2014-10-15 12:41:53 +02:00
Vincent Petry 704ffaa6a3 Use body element when animating scroll in public page
In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.
2014-10-15 10:14:20 +02:00
Arthur Schiwon c26e9c675a show Spinner when stuff is being saved 2014-10-14 17:39:27 +02:00
Jenkins for ownCloud 526abf1ad6 [tx-robot] updated from transifex 2014-10-14 01:54:28 -04:00
Jörn Friedrich Dreyer 7535b09851 cleanup variable names and duplicate jQuery selectors 2014-10-13 18:40:57 +02:00
Jörn Friedrich Dreyer 7f1ba86789 fix flickering users 2014-10-13 17:58:29 +02:00
Vincent Petry ab5149f5df Allow specifying protocol in ext storage OC config
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
Vincent Petry 6cbabdf217 Fixed array detection on public download
When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.
2014-10-13 12:54:21 +02:00
Jenkins for ownCloud 4b9465b937 [tx-robot] updated from transifex 2014-10-13 01:54:35 -04:00
Jenkins for ownCloud a3635fedbb [tx-robot] updated from transifex 2014-10-12 01:54:39 -04:00
Nazar Mokrynskyi 257cf1fc34 Page size calculation based on real page height
This is fix for https://github.com/owncloud/core/issues/10060
Instead of hard coding page size as 20 items, we check real page height, and divide by 50 (height of one row).
This will allow to load fewer items on small screens and enough items on large screens (4k, portrait orientation, etc.).
Also checking page height on every load to respond on browser window resizing,
2014-10-11 15:10:54 +02:00
Jenkins for ownCloud a0db01ecd3 [tx-robot] updated from transifex 2014-10-11 01:55:02 -04:00
Björn Schießle 3f9cab00e3 Merge pull request #11507 from owncloud/versioning_expire
make sure that we always delete oldest first
2014-10-10 17:31:26 +02:00
Björn Schießle 87899db204 Merge pull request #11380 from owncloud/fix_performance_issue_sharing
[sharing] fix performance issues
2014-10-10 15:56:30 +02:00
Bjoern Schiessle 527e1d001f try to get path from filesystem 2014-10-10 14:47:41 +02:00
Arthur Schiwon 836f0839e5 show a spinner next to test filter button when the test is running 2014-10-10 13:41:32 +02:00
Arthur Schiwon ea7975ac8b always abort running ajax request when the method is fired up again 2014-10-10 13:30:03 +02:00
Lukas Reschke 4a4ea1dae9 Merge pull request #11499 from owncloud/ldap-warningwhenuidismissing
Log warning when no uid was found for user
2014-10-10 12:42:31 +02:00
Jan-Christoph Borchardt 4faa424157 Merge pull request #11480 from owncloud/ldap-enterkey-deletefix
Prevent button click when enter key is pressed in LDAP wizard
2014-10-10 12:37:44 +02:00
Bjoern Schiessle 3431d547a9 fix performance issues 2014-10-10 12:16:26 +02:00
Arthur Schiwon f31d4caf57 coding style, no effective code changes 2014-10-10 11:49:45 +02:00
Jenkins for ownCloud 2cc26c9022 [tx-robot] updated from transifex 2014-10-10 01:55:10 -04:00
Bjoern Schiessle 8e077cf1a4 make sure that we always delete oldest first 2014-10-09 19:15:58 +02:00
Vincent Petry 9dea79e341 Merge pull request #11305 from owncloud/ext-updateetagonmount
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
Arthur Schiwon 6f83b537fe remove debug output 2014-10-09 17:56:27 +02:00
Arthur Schiwon 2cf0102797 fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck 2014-10-09 17:17:50 +02:00
Lukas Reschke 16cd749065 Add support for keys in the info.xml
This allows to have links to different doc base URLs

a.
2014-10-09 15:48:30 +02:00
Vincent Petry 59f9107dd9 Log warning when no uid was found for user
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
2014-10-09 14:58:53 +02:00
blizzz cc717c27d6 Merge pull request #10527 from owncloud/fix-10526
properly cancel a Paginated Results operation in order to avoid protocol...
2014-10-09 12:40:13 +02:00
Arthur Schiwon 9f036e776e bump version 2014-10-09 11:15:56 +02:00
Vincent Petry f7fc0067e0 Revert "[WIP] fix retrieval of group members and cache group members" 2014-10-09 11:06:48 +02:00
Vincent Petry 3791de64ed Merge pull request #11161 from owncloud/fix-ldap-ingroup-for-9225
fix retrieval of group members and cache group members
2014-10-09 10:19:58 +02:00
Morris Jobke b11cf6f838 Merge pull request #11474 from owncloud/fix_trash_permission_check
check if I can create a file at the location
2014-10-09 08:59:48 +02:00
Jenkins for ownCloud 295c46ccb5 [tx-robot] updated from transifex 2014-10-09 01:55:33 -04:00
MTRichards c7f936cdcb Updated info.xml with
Added description in line with other apps.
2014-10-08 21:27:40 -04:00
MTRichards f511977832 Updated info.xml app description
Added updates description
2014-10-08 21:24:54 -04:00
MTRichards 511ad6e106 Forgot a '.' 2014-10-08 21:08:20 -04:00
MTRichards 3a2d50b76f Updated info.xml app description
Made app description paralell in structure to other app descriptions
2014-10-08 21:07:12 -04:00
MTRichards fc0ae29be5 Updated info.xml app description
Added larger app description
2014-10-08 20:49:22 -04:00
MTRichards d532683e20 Updated info.xml app description
Added new app description
Removed links to CE documentation
2014-10-08 20:48:00 -04:00
MTRichards 48980fbc46 Updated info.xml with description
Updated the description of the app for the app panel.
2014-10-08 20:44:09 -04:00
brumsoel 1e1be409b7 Fix timestamp comparator return value 2014-10-08 22:40:57 +02:00
Morris Jobke 2f1605cfc3 Merge pull request #11471 from brumsoel/master
Fix file size comparator return value
2014-10-08 20:39:13 +02:00
Jörn Friedrich Dreyer f664a31dec extract batchDelete(), better comments 2014-10-08 18:50:02 +02:00
André Gaul 0d0c9d0bb3 files_extern: remove empty Body and ContentLength in Amazon S3 mount
fixes #10501

Conflicts:
	apps/files_external/lib/amazons3.php
2014-10-08 18:49:59 +02:00
Jörn Friedrich Dreyer aa3ad898a9 fix amazon s3 issues
folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo
2014-10-08 18:49:47 +02:00
Jörn Friedrich Dreyer 18e3856092 log exceptions when listing files 2014-10-08 18:49:43 +02:00
Arthur Schiwon 02985c9ec5 smaller corrections to make scruitinizer happier, no effective changes 2014-10-08 16:20:52 +02:00
Vincent Petry bb424802c8 Prevent button click when enter key is pressed in LDAP wizard
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.
2014-10-08 15:09:02 +02:00
Arthur Schiwon ab3535855f more beautiful white spaces 2014-10-08 15:04:29 +02:00
Arthur Schiwon 39aa5868ac rename internal var name to avoid collision 2014-10-08 14:55:47 +02:00
Morris Jobke 6d94a88476 Merge pull request #11453 from owncloud/enc_visual_improvements
[encryption] some visual improvements
2014-10-08 14:36:24 +02:00
Vincent Petry 26e242a8a4 Added PHP docs for etag propagator 2014-10-08 14:22:18 +02:00
Robin Appelman bcf654127f More phpdoc 2014-10-08 14:22:17 +02:00
Robin Appelman 1030f0a763 Hookup the etag propagator 2014-10-08 14:22:17 +02:00
Robin Appelman 5d7bd8be42 Add EtagPropagator to handle etag changes when external storages are changed 2014-10-08 14:22:17 +02:00
Robin Appelman 9a5d0f6084 Fix add/remove mountpoint hooks 2014-10-08 14:22:17 +02:00
Vincent Petry 6585eaa5df Added failing unit tests for mount config hooks 2014-10-08 14:22:17 +02:00
Vincent Petry 0610937ac3 Added filesystem hooks for mount/unmount ext storage 2014-10-08 14:22:17 +02:00
Arthur Schiwon 29b0e9bfbc confirmation before switching to assisted mode when admin is experienced 2014-10-08 13:29:13 +02:00
Arthur Schiwon 7ba787e649 user and group counts are only upated on demand in experienced mode 2014-10-08 13:06:18 +02:00
Arthur Schiwon b6fc7f5599 Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once 2014-10-08 11:38:39 +02:00
Bjoern Schiessle 5b5e9d148e check if I can create a file at the location 2014-10-08 10:56:06 +02:00
Jenkins for ownCloud a9c9b5edf4 [tx-robot] updated from transifex 2014-10-08 01:54:49 -04:00
brumsoel 40174b6b10 Fix file size comparator return value 2014-10-08 01:17:45 +02:00
Arthur Schiwon 3ff4c8e3fc sets user filters to raw mode when marking user as experienced 2014-10-07 17:28:09 +02:00
Arthur Schiwon efd940133b must be empty not auto 2014-10-07 16:45:22 +02:00
Arthur Schiwon 67292a5345 add checkbox for experienced users to server tab 2014-10-07 16:43:58 +02:00
Morris Jobke 814bce4cac Merge pull request #11451 from owncloud/reduce-bottom-padding
reduce bottom padding in filelist, fix perceived glitching, fix #11213
2014-10-07 14:45:21 +02:00
Bjoern Schiessle b060123155 improved visual feedback if user enabled recovery key 2014-10-07 12:52:01 +02:00
Bjoern Schiessle 794d3ef949 improved visual feedback if recovery key password gets changed 2014-10-07 12:32:09 +02:00
Bjoern Schiessle 5fa1cbc4e5 improved visual feedback if recovery key gets enabled/disabled 2014-10-07 12:32:09 +02:00
Vincent Petry 396a71b005 Merge pull request #11378 from owncloud/sort-indicator-style
fix position and style of sort indicator
2014-10-07 11:06:37 +02:00
Jan-Christoph Borchardt 2b8066bff3 reduce bottom padding in filelist, fix perceived glitching, fix #11213 2014-10-07 10:44:01 +02:00
Jenkins for ownCloud 01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Morris Jobke e5b4e54141 Merge pull request #11392 from owncloud/fix_version_previews
we also encrypt/decrypt files in the versions folder
2014-10-06 13:03:48 +02:00
Bjoern Schiessle 9147219377 we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled 2014-10-06 12:02:08 +02:00
Jenkins for ownCloud 6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Jenkins for ownCloud f191e5b088 [tx-robot] updated from transifex 2014-10-05 01:54:50 -04:00
Jenkins for ownCloud 537f046e66 [tx-robot] updated from transifex 2014-10-02 01:54:48 -04:00
Arthur Schiwon 3b3ad0bc4f fix changed variable name 2014-10-01 21:44:36 +02:00
Jan-Christoph Borchardt 3cd6b99a0b fix position and style of sort indicator 2014-10-01 15:21:28 +02:00
Lukas Reschke 001f223baa Merge pull request #10104 from owncloud/s3-overwrite
Fix S3 copy and rename overwriting target directory
2014-10-01 13:07:28 +02:00
Jenkins for ownCloud 553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Arthur Schiwon 6c502e11f8 make scrutinizer happy, very minor changes 2014-10-01 11:55:53 +02:00
Arthur Schiwon f9e085b020 init a new paged search on read operations to satisfy OpenLDAP 2014-09-30 17:00:25 +02:00
Lukas Reschke 306bf71c62 Use SVG previews for public sharing
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
2014-09-30 15:49:49 +02:00
Arthur Schiwon 2b9696efae abandond paged search only if PHP supports them 2014-09-30 13:13:52 +02:00
Arthur Schiwon 53ec32807a abandon ongoing paged search before starting a new one 2014-09-30 12:42:37 +02:00
Arthur Schiwon 9a63693227 properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526 2014-09-30 12:42:37 +02:00
Jenkins for ownCloud 5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Martin Konrad fd9b79b218 Add a CLI command that deletes an LDAP config
With this change LDAP configurations can be managed completely from
the command line.
2014-09-30 03:23:00 +02:00
Lukas Reschke 659b9fc030 Merge pull request #11337 from danbartram/better_encryption_recovery_labels
Add clickable labels to encryption recovery radios
2014-09-29 22:06:00 +02:00
Lukas Reschke b13b86502f Merge pull request #11347 from mark0n/create_empty_config
Add a CLI command that creates an empty LDAP config
2014-09-29 21:42:07 +02:00
Lukas Reschke 8c8e5c168e Merge pull request #10107 from owncloud/sharing_group_shares
[sharing] group shares
2014-09-29 20:26:41 +02:00
Lukas Reschke 6b45cb5416 Merge pull request #11321 from owncloud/ldap-fix-memberof-detection
dn needs to be fetched to be able to detect memberOf support
2014-09-29 14:46:10 +02:00
Bjoern Schiessle 6e7acb8ae0 some small fixed, suggested by scrutinizer 2014-09-29 11:23:18 +02:00
Bjoern Schiessle e5f0dded84 throw a exception if we can't handle the provided path 2014-09-29 11:13:06 +02:00
Jenkins for ownCloud 63726ea9e2 [tx-robot] updated from transifex 2014-09-29 01:54:33 -04:00
Martin Konrad b57960aeec Add a CLI command that creates an empty LDAP config
This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).
2014-09-29 00:21:20 -04:00
Jenkins for ownCloud 84923475c0 [tx-robot] updated from transifex 2014-09-28 01:55:09 -04:00
Dan Bartram 1b9c31d349 Add clickable labels to encryption recovery radios
Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal

Pressing on the radio button text now toggles the state of the radio
button.
2014-09-27 16:20:06 +01:00
Jenkins for ownCloud 3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Arthur Schiwon 6041ae6224 dn needs to be fetched to be able to detect memberOf support 2014-09-26 15:36:49 +02:00
Jenkins for ownCloud 1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Bjoern Schiessle 52b6469b0c call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-09-25 14:26:31 +02:00
Bjoern Schiessle d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Jenkins for ownCloud f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Robin Appelman e8280c80da Show a proper error message when trying to scan the filesystem for a non existing user 2014-09-24 15:48:54 +02:00
Bjoern Schiessle 5c7fe91041 clear share table after each test run 2014-09-24 14:02:02 +02:00
Lukas Reschke aeb516c3c9 Check for blacklisted characters
Fixes https://github.com/owncloud/core/issues/11264

(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
2014-09-23 19:30:32 +02:00
Jan-Christoph Borchardt 1e915cc145 Merge pull request #11109 from owncloud/nstamm-patch-1
DragnDrop Upload text style
2014-09-23 14:03:08 +02:00
Jan-Christoph Borchardt 8c33a8e6fd adjust text size and opacity of drag'n'drop upload text style 2014-09-23 13:36:47 +02:00
Jan-Christoph Borchardt a062db4fd0 Merge pull request #11234 from owncloud/fix-icon-classes
Fix icon classes, disappeared delete icon
2014-09-23 12:39:06 +02:00
Vincent Petry 75593f87d5 Merge pull request #11137 from owncloud/enc-pregfix
Fix share key pattern matching
2014-09-23 12:36:34 +02:00
Vincent Petry 1e631754d7 Fix share key finding algorithm in various cases
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
2014-09-23 12:33:07 +02:00
Lukas Reschke 5d977f97b0 Merge pull request #11032 from owncloud/harden-redirect
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Lukas Reschke ff6c5331e9 Merge pull request #11224 from owncloud/fix_recovery_admin_user
first check if a private key exists, if not it is always a recovery szenario
2014-09-23 10:13:58 +02:00
Jenkins for ownCloud 479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Lukas Reschke 6eeb905871 Do only follow HTTP and HTTPS redirects
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Jan-Christoph Borchardt 1583ae1ed6 force show the loading icon in list for deletion, not only on hover 2014-09-22 18:24:52 +02:00
Jan-Christoph Borchardt 2ac953e6a8 correct progress-icon to icon-loading-small 2014-09-22 18:24:32 +02:00
Jan-Christoph Borchardt 91d9d45c6c correct delete-icon to icon-delete, fix #11128 2014-09-22 18:17:33 +02:00
Bjoern Schiessle 9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle 89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Vincent Petry 828ae65681 Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition
Added extra check to avoid deleting key folders
2014-09-22 16:36:23 +02:00
Morris Jobke 70937dabcd Merge pull request #11167 from owncloud/env-movetomountreenableproxy
Reenable file proxy when renaming between mount points
2014-09-22 16:30:19 +02:00
Bjoern Schiessle 744110905b first check if a private key exists, if not it is always a recovery szenario 2014-09-22 15:05:03 +02:00
Volkan Gezer d16b8c03e9 fix button text l10n 2014-09-22 09:32:03 +02:00
Georg Ehrke 9fd23d2edf files_sharing: add route for ajax/publicpreview 2014-09-21 18:21:42 +02:00
Jenkins for ownCloud a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Jenkins for ownCloud e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Vincent Petry 8aca127e52 Added extra check to avoid deleting key folders
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
2014-09-19 19:01:02 +02:00
Volkan Gezer 01808c8c84 fix typo 2014-09-19 18:22:09 +02:00
Lukas Reschke fed8100177 Merge pull request #10968 from owncloud/admin-groupsselect2
Use select2 for the groups excluded from sharing in admin page
2014-09-19 16:50:56 +02:00
Lukas Reschke fb033cce98 Merge pull request #11104 from owncloud/enc_create_backup_on_recovery
[encryption] create backup from all keys before recovery
2014-09-19 16:40:19 +02:00
Lukas Reschke e94ec409ae Merge pull request #11171 from owncloud/fix-route
Match more URL fragments
2014-09-19 16:04:29 +02:00
Bjoern Schiessle a280859bf8 make sure that we really catch the files folder only 2014-09-19 11:47:18 +02:00
Bjoern Schiessle 2ee14c4734 create backup from all keys before recovery 2014-09-19 11:47:18 +02:00
Jenkins for ownCloud 786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Lukas Reschke 7956765c12 Match more URL fragments
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
2014-09-18 23:18:07 +02:00
Vincent Petry f2a01dddbc Reenable file proxy when renaming between mount points
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
2014-09-18 19:21:04 +02:00
Morris Jobke 112e570989 Merge pull request #11141 from owncloud/update_encrytionlink
update encryption doc link
2014-09-18 18:19:53 +02:00
Volkan Gezer ccaea93d6b update encryption doc link
I don't know how we missed to update this :/

update ldap doc link
2014-09-18 18:14:51 +02:00
Arthur Schiwon 4ed926b954 fix retrievel of group members and cache group members 2014-09-18 17:12:35 +02:00
Morris Jobke 338db48c0b Merge pull request #9541 from owncloud/force_loading_of_encryption_app
force loading of encryption app to show correct error
2014-09-18 09:04:53 +02:00
Jenkins for ownCloud dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Lukas Reschke 7db0d55129 Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix
Tentative fix for legacy file actions unit test side effect
2014-09-17 18:10:49 +02:00
Lukas Reschke 14571d4103 force loading of encryption app 2014-09-17 17:13:25 +02:00
Robin Appelman 6d60630f08 Skip test for unsuported feature for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman 11ac9ce28b Fix copy overwrite for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman 3b08b3fad4 Fix amazon s3 rename overwrite 2014-09-17 15:51:57 +02:00
Robin Appelman 6e12d830d5 Fix AmazonS3 rmdir on the root 2014-09-17 15:50:27 +02:00
Robin Appelman 2f22e67570 Also check if the file itself is updatable 2014-09-17 11:35:16 +02:00
Robin Appelman d25a9a118f Check if a folder is deletable before we try to recursively delete it 2014-09-17 11:35:16 +02:00
Jenkins for ownCloud 2a89bc7b51 [tx-robot] updated from transifex 2014-09-17 01:55:27 -04:00
Lukas Reschke 45b17207cc Merge pull request #10745 from owncloud/fix-10708-doctrine
Use Doctrine Platform to generate SQL query for table truncation.
2014-09-16 23:56:20 +02:00
Lukas Reschke 21afcb3e94 Merge pull request #10902 from owncloud/fix-ellepsis
Adding link to ellipsis and fixing styling
2014-09-16 21:09:47 +02:00
Lukas Reschke 368391e401 Merge pull request #11009 from owncloud/tobiasKaminsky-route
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Nicolas Stamm a2a1f5da6a DragnDrop Upload text style
The 8px margin was uggly.
2014-09-16 16:51:48 +02:00
Lukas Reschke 4669ea3835 Merge pull request #10680 from helmutschneider/aws-2.6.15
Update AWS sdk to 2.6.15
2014-09-16 16:34:16 +02:00
Thomas Müller 7e2bff8545 adding unit test to truncate the table 2014-09-16 16:17:25 +02:00
Vincent Petry 05cf940983 Tentative fix for legacy file actions unit test side effect
Sometimes the JS unit test with legacy file actions fail.

This fix runs the legacy file actions tests on a dummy instead of the
real one.
2014-09-16 15:38:44 +02:00
Clark Tomlinson 140c89f1c3 Adding link to ellipsis and fixing styling 2014-09-16 09:18:01 -04:00
tobiasKaminsky e62d5b7e55 Route for thumbnail generation
Thumbnail generation

Removed Log

Added requested changes

Added requested changes.

- Fix code style
- Add exception if file does not exist
- Switch route styling

Replaces https://github.com/owncloud/core/pull/10805

Fix codestyle

Fix codestyle

Migrate to appframework

Fix typo
2014-09-16 15:00:58 +02:00
Lukas Reschke ba5d3fb96b Merge pull request #11081 from owncloud/trash_fix_expire
also expire file if timestamp = limit, happens if trashbin_retention_obl...
2014-09-16 13:58:12 +02:00
Morris Jobke 61b040cbe8 Merge pull request #10663 from owncloud/files_trashbin_original_path
Show original path information in trashbin and for shares
2014-09-16 12:49:17 +02:00
Jenkins for ownCloud 1e6ac31bde [tx-robot] updated from transifex 2014-09-16 01:54:33 -04:00
Lukas Reschke 627252fe81 Merge pull request #11060 from owncloud/rmobslang
remove obsolete language files
2014-09-15 17:31:10 +02:00
Bjoern Schiessle f23116ce50 also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero 2014-09-15 13:00:04 +02:00
Andreas Fischer 31898aa635 Merge pull request #11021 from owncloud/do-not-double-decode
Do not double decode values

* owncloud/do-not-double-decode:
  Do not double decode values
2014-09-15 07:58:45 +02:00
Jenkins for ownCloud 8d647fa267 [tx-robot] updated from transifex 2014-09-15 01:54:26 -04:00
Lukas Reschke 90e91a9d10 Merge pull request #11050 from owncloud/enc-flockfix
Remove passing by reference to allow for proper GC
2014-09-15 00:31:10 +02:00
Jenkins for ownCloud d8c7a52979 [tx-robot] updated from transifex 2014-09-14 01:54:35 -04:00
Volkan Gezer 5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Jenkins for ownCloud 518ed10c77 [tx-robot] updated from transifex 2014-09-13 05:17:34 -04:00
Vincent Petry da9f9ae9b3 Remove passing by reference to allow for proper GC
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.

This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-12 19:51:47 +02:00
Jenkins for ownCloud d6834b6389 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
Robin McCorkell 99d41bec5d Show original path information in trashbin and sharing views
Path will only be shown if in subdirectory, not in root.
2014-09-11 15:45:42 +01:00
Lukas Reschke 99e9e762d1 Do not double decode values
Fixes https://github.com/owncloud/core/issues/11012
2014-09-11 15:34:57 +02:00
Thomas Müller e6af67d5ea Merge pull request #9698 from owncloud/fix-9666
Load apps in tests, fixes #9666
2014-09-11 08:05:00 +02:00
Jenkins for ownCloud 0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
Robin McCorkell 08e38a1072 Fix mkdir error in mountconfig.php 2014-09-10 17:28:25 +02:00
Robin McCorkell b754a8261a Load apps in test situations 2014-09-10 17:28:25 +02:00
Jenkins for ownCloud c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Lukas Reschke c3d90b96c8 Merge pull request #10922 from owncloud/explicit-scan-transactions
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Vincent Petry 412da87e65 Move select2 from files_external to core 2014-09-09 18:03:05 +02:00
Jenkins for ownCloud 317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
Lukas Reschke 70abce0482 Merge pull request #10739 from owncloud/eventsource-public
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Lukas Reschke 0ec9c2ccf8 Merge pull request #10885 from owncloud/swift-hasupdated
Fix hasUpdated for folders in openstack swift
2014-09-08 18:19:59 +02:00
Lukas Reschke c79c894dbb Merge pull request #10755 from owncloud/shorter_sharing_links
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke 2d847934ed Merge pull request #10938 from owncloud/useSecureMimetype
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
Lukas Reschke bca57b4b28 Merge pull request #10890 from owncloud/fix-10888
if only one attribute is requested, the returned array has 0 as key inst...
2014-09-08 16:39:48 +02:00
Lukas Reschke 312ed18d15 Use secure mimetype for content delivery
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
Vincent Petry bd63f475bc Merge pull request #10891 from owncloud/files-moveoperationcatchexception
Catch exceptions when moving files
2014-09-08 15:09:02 +02:00
Robin Appelman 644755df66 Use bigger transactions when doing explicit file system scans 2014-09-08 14:15:41 +02:00
Jenkins for ownCloud 9fc45016f9 [tx-robot] updated from transifex 2014-09-07 01:54:42 -04:00
Jenkins for ownCloud 6ca2ba6fde [tx-robot] updated from transifex 2014-09-06 01:55:03 -04:00
Clark Tomlinson 50993c1a05 Merge pull request #10860 from owncloud/scrolltofix
Scroll to file on search or add
2014-09-05 10:35:59 -04:00
Vincent Petry e43c9b84c4 Catch exceptions when moving files
When moving files on storages that don't expose permissions, the storage
itself might throw an exception when the permission is denied.

This fix ensures that exceptions are caught and forwarded to the client
instead of just hanging.
2014-09-05 14:54:06 +02:00
Arthur Schiwon 3c9668f605 if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888 2014-09-05 14:05:37 +02:00
Robin Appelman a1f4a0601b Fix hasUpdated for folders in swift backend 2014-09-05 13:23:10 +02:00
Robin Appelman 3d7aff84e5 Fix configuration of rackspace 2014-09-05 13:22:35 +02:00
Vincent Petry 5913a694de Merge pull request #10870 from owncloud/dnd-droponreadonlyfolderfix
Added permission check for drag and drop
2014-09-05 12:20:48 +02:00
Jenkins for ownCloud 0736a6695e [tx-robot] updated from transifex 2014-09-05 01:54:39 -04:00
Vincent Petry f1bfe35cda Added permission check for drag and drop
When dropping files onto a read-only folder, a notification
is now shown instead of attempting to upload.

This for both the drag for upload and drag from inside the file list
cases.
2014-09-04 20:18:24 +02:00
kondou 2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
Robin Appelman fa3393674c Better phpdoc and method naming 2014-09-04 13:26:51 +02:00
Vincent Petry 6ca9e27438 Scroll to new file/folder after adding
When creating a new file from the menu, the list now scrolls to that
file.
2014-09-04 12:34:17 +02:00
Vincent Petry 9ae000676c Fixed scrollto for search results
Now passing the "scrollto" URL argument to the file list class which
will also automatically scroll and highlight the matching element.

This code is triggered by the search box when in a different folder and
also by the activity app.
2014-09-04 12:20:11 +02:00
Jenkins for ownCloud a8861c70c8 [tx-robot] updated from transifex 2014-09-04 01:55:22 -04:00
pdessauw 63dff87953 Merge pull request #9195 from owncloud/fix-733
Scroll to uploaded file in file list
2014-09-03 15:07:22 -04:00
Clark Tomlinson 27de0e5621 Hiding add to your own cloud if server2server sharing is not enabled 2014-09-03 10:04:46 -04:00
pdessauw 0d078e48ce Highlight every uploaded files and scroll down to the last one 2014-09-03 09:59:01 -04:00
Robin Appelman 65608d7c92 Use the public api to get event sources 2014-09-03 13:36:15 +02:00
Johan Björk d2979da864 Fix failing AmazonS3::touch on updated aws sdk 2014-09-03 12:09:12 +02:00
Johan Björk dadb1fad2a Update AWS sdk to 2.6.15 2014-09-03 12:09:06 +02:00
Jenkins for ownCloud 8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Robin Appelman 724ff6264a Remove unneeded file initialization in encryption, already handled in a hook 2014-09-02 16:15:42 +02:00
Jenkins for ownCloud 689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Jenkins for ownCloud e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
Lukas Reschke 8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman 2fcedcc503 fix test 2014-08-31 10:47:50 +02:00
Robin Appelman c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman 298011bf29 fix indention 2014-08-31 10:45:11 +02:00
Robin Appelman dcc4f96d3e Verify names of certificates 2014-08-31 10:45:11 +02:00
Robin Appelman c2ebc192a6 Make external shares work with imported self-signed certificates 2014-08-31 10:45:11 +02:00
Robin Appelman ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Robin Appelman d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud 23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Robin McCorkell a8dc4368c0 Merge pull request #10428 from owncloud/files_external_better_config
Improve external storage configuration UI
2014-08-30 15:11:39 +01:00
Robin McCorkell 0e8a973579 Improve UI of external storage configuration
* Highlight fields that need to be filled
 * Remove (required) and (optional) strings where possible
 * Focus first configuration field when creating new external storage
 * Add ability to force external storage re-check
 * Various jQuery improvements
 * Prevent wrapping of checkboxes in configuration
2014-08-30 09:02:37 +01:00
Jenkins for ownCloud 53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Andreas Fischer 7458e21f2c Use Doctrine Platform to generate SQL query for table truncation. 2014-08-29 20:53:51 +02:00
Morris Jobke 033b0361ed Merge pull request #9214 from owncloud/wizard_email_detection
LDAP: Wizard email attribute detection
2014-08-29 12:58:51 +02:00
Thomas Müller 2b63c375a4 Merge pull request #10719 from owncloud/files-external-personal-undefined
Prevent undefined index error loading external storages
2014-08-29 11:59:34 +02:00
Arthur Schiwon aa0ddf21b5 adjust static method vars as well 2014-08-29 11:14:36 +02:00
Arthur Schiwon 371cab367d trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing 2014-08-29 11:14:36 +02:00
Arthur Schiwon 34761dabb1 write log message, if original value was changed 2014-08-29 11:14:36 +02:00
Arthur Schiwon f47a4a8c15 add unit test for mail detection 2014-08-29 11:14:35 +02:00
Arthur Schiwon 441c600c90 remove Access as hard dependency, inject it instead 2014-08-29 11:14:16 +02:00
Arthur Schiwon baa49cd58a Wizad: email attribute detection 2014-08-29 11:14:16 +02:00
Jörn Friedrich Dreyer f551917a3c kill OC::$session
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Robin McCorkell bffccdbea7 Add missing 'personal' mount configuration option 2014-08-29 09:08:46 +01:00
Jenkins for ownCloud 359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Clark Tomlinson 54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs
Implementing momentjs
2014-08-28 11:47:37 -04:00
Vincent Petry f4e6cd5f3e Merge pull request #10658 from owncloud/sftp_prevent_error
Prevent errors on broken SFTP config
2014-08-28 17:09:36 +02:00
Clark Tomlinson 92685acf60 Implementing moment.js
Updating Usages

Removing unused method

Adding JS Doc
2014-08-28 09:28:45 -04:00
blizzz 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
Arthur Schiwon 1c0cc6c7bc fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc 2014-08-28 11:53:40 +02:00
Arthur Schiwon 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
Jenkins for ownCloud 1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Robin McCorkell 87167d3141 Prevent errors on broken SFTP config 2014-08-27 09:02:14 +01:00
Jenkins for ownCloud 2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Jenkins for ownCloud c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Clark Tomlinson 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
Vincent Petry 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
Lukas Reschke f33312f767 Use AppFramework instead of custom controller 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer 6202ef3258 use displayname lookup route in files_external settings 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer e09e11b93e no need to load user display names 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer 393d136faf fix deletion of shares 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer 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
Jörn Friedrich Dreyer bff39f796e add select2 to app specific thirdparty 2014-08-25 11:49:23 +02:00
Vincent Petry 8ab1c84161 Merge pull request #10591 from owncloud/routes_for_files_external
explicit routes for files_external
2014-08-25 11:45:41 +02:00
Jenkins for ownCloud adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud 70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud 047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Jörn Friedrich Dreyer ffe54e260a explicit routes for files_external 2014-08-22 11:51:39 +02:00
Jenkins for ownCloud 8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
blizzz 52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Morris Jobke 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
Bernhard Posselt ba8eed0788 Better description to prevent people from misunderstanding the use case 2014-08-21 12:05:56 +02:00
Jenkins for ownCloud 952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Clark Tomlinson 61f63718ce Merge pull request #10562 from Volker-E/master
fixing #10561 & HTML structure
2014-08-20 17:27:25 -04:00
Lukas Reschke 92c80dd946 Merge pull request #10518 from owncloud/fix_storage_const_autoload
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Volker E. 98d0d48b54 fix HTML structure by rmv. obsolete input end tag 2014-08-20 22:36:58 +02:00
Jörn Friedrich Dreyer 6c593c6adf Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource
urlencode s3 copyObject() copysource
2014-08-20 15:48:51 +02:00
Jenkins for ownCloud ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Clark Tomlinson 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
Jan-Christoph Borchardt e713e97df5 remove obsolete 'Download preparing' message for zip downloads, fix #3755 2014-08-19 16:44:28 +02:00
Jan-Christoph Borchardt 3d8031564e fix multiselect bar offset on shared page 2014-08-19 15:51:10 +02:00
Lukas Reschke 381340c9b2 Add routing to user_ldap 2014-08-19 15:26:15 +02:00
Lukas Reschke b12af9ea7f Add routing to files_versions 2014-08-19 15:25:16 +02:00
Lukas Reschke 8524e61fcc Add routing to files_trashbin 2014-08-19 15:24:47 +02:00
Lukas Reschke 520ee969f2 Add routing to files_encryption 2014-08-19 15:23:45 +02:00
Lukas Reschke ad202250a8 Add routing to files_sharing 2014-08-19 15:22:54 +02:00
Lukas Reschke f9881abf25 Use proper routes for files 2014-08-19 15:19:18 +02:00
Morris Jobke b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik 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
Björn Schießle 19610157d3 Merge pull request #10425 from owncloud/set_default_share_folder
Set default share folder
2014-08-19 10:21:21 +02:00
Björn Schießle 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
Morris Jobke 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
Jenkins for ownCloud 77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
blizzz 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
Arthur Schiwon 97fd39e983 unify tests 2014-08-18 16:55:08 +02:00
Lukas Reschke 594078e22f Fix copyright 2014-08-18 16:52:48 +02:00
Bjoern Schiessle 193a0b1a17 fix broken unit tests 2014-08-18 16:52:48 +02:00
Bjoern Schiessle c25915cde4 update unit tests with configurable share folder 2014-08-18 16:52:48 +02:00
Bjoern Schiessle c9903f2e68 make share folder configurable 2014-08-18 16:52:48 +02:00
Bjoern Schiessle 043cd1d02b set incognitoMode to true, getUser should always return false during public upload 2014-08-18 16:39:25 +02:00
Vincent Petry 1de5ae8845 Hide sharing sections in files app when sharing API is disabled 2014-08-18 16:33:29 +02:00
Jenkins for ownCloud 4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke 69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Jenkins for ownCloud b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Lukas Reschke 283b99a42d Merge pull request #10276 from owncloud/skip-webdavput
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
Morris Jobke 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
Jenkins for ownCloud c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Lukas Reschke 8d112ff61f Merge pull request #10449 from owncloud/share-clientsidesortnoservercall
Client side sort for sharing overview
2014-08-15 21:25:30 +02:00
Volkan Gezer 3da69ed7d0 ssl capital 2014-08-15 20:41:40 +02:00
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
Robin Appelman bbe17f35a1 Remove no longer existing files from the cache when scanning external storage 2014-08-14 14:50:52 +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