wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
21706 commits 157 branches 562 tags 714 MiB
Commit graph

9265 commits

Author SHA1 Message Date
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