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

2779 commits

Author SHA1 Message Date
Vincent Petry
c7fcd42edb Merge pull request #13870 from owncloud/drop-oc-preferences-2 
drop OC\Preferences
 2015-02-09 17:49:05 +01:00
Vincent Petry
b7b8c0c2e5 Merge pull request #13869 from owncloud/drop-oc-preferences 
drop OC_Preferences
 2015-02-09 17:48:36 +01:00
Lukas Reschke
47c7eb4e70 Merge pull request #13973 from owncloud/enhancement/security/13366 
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
 2015-02-09 17:35:19 +01:00
Vincent Petry
5d8f1a1de3 Merge pull request #13854 from owncloud/avatar-exists 
Add a better way to check if an avatar exists for the user
 2015-02-09 17:06:24 +01:00
Robin Appelman
45e3cbefc9 Check directory handle before we use it 2015-02-09 12:36:18 +01:00
Lukas Reschke
770fa761b8 Respect mod_unique_id and refactor OC_Request::getRequestId 
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs.

Testplan:

- [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`.
- [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string
- [ ] The generated Id is stable over the lifespan of one request

Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI.

Fixes https://github.com/owncloud/core/issues/13366
 2015-02-09 11:53:11 +01:00
Lukas Reschke
0e604aa875 Merge pull request #13948 from owncloud/cache-move-transaction 
Use transactions when renaming directory contents
 2015-02-08 19:08:52 +01:00
Morris Jobke
90556cb70b Merge pull request #12283 from oparoz/sfnt-fonts 
Updated the media type of some font types
 2015-02-07 13:33:49 +01:00
Morris Jobke
11ded92a73 Merge pull request #13830 from owncloud/fix-redirect-404 
Don't encode url unecessary twice
 2015-02-07 13:24:47 +01:00
Robin Appelman
6c00521e8b Use transactions when renaming directory contents 2015-02-06 15:20:53 +01:00
Thomas Müller
bc56fef619 Merge pull request #13932 from owncloud/revert-sabredav-etag-master 
Revert "adding OC-ETag header"
 2015-02-06 12:05:32 +01:00
Lukas Reschke
4d91fa4c93 Normalize before processing 2015-02-06 15:03:29 +01:00
Vincent Petry
8210200770 Revert "adding OC-ETag header" 
This reverts commit 96a931929e.
 2015-02-05 20:43:37 +01:00
Björn Schießle
486f49ed72 Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint 
detect root of mountpoint also if the trailing slash is missed
 2015-02-04 14:44:02 +01:00
Bjoern Schiessle
21c45925fe detect root of mountpoint also if the trailing slash is missed 2015-02-04 12:47:04 +01:00
Morris Jobke
4df7c0a1ed drop OC\Preferences 2015-02-04 00:31:09 +01:00
Morris Jobke
909a53e087 drop OC_Preferences 2015-02-04 00:06:29 +01:00
Thomas Müller
23c6a0cf99 Merge pull request #13843 from owncloud/fix-files-disabled 
Fix disabled files app
 2015-02-03 16:13:15 +01:00
Robin Appelman
c644ed89a7 Add a better way to check if an avatar exists for the user 2015-02-03 14:54:06 +01:00
Morris Jobke
d70160c607 enabled disabled files app in repair step 2015-02-03 14:03:43 +01:00
Thomas Müller
9e222ec841 Merge pull request #13791 from owncloud/extstorage-fixdavexceptions 
Fix DAV exceptions, some will still return false now
 2015-02-03 13:31:32 +01:00
Morris Jobke
a7eedf0149 Disallow disabling of files app 2015-02-03 00:39:01 +01:00
Lukas Reschke
2bd1c17345 Don't encode url unecessary twice 
The URL was previously encoded twice which leads to getting redirected to a 404 page when the password has been entered incorrect at least once.

Testplan:

- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin` redirects to the admin page when providing the correct credentials
- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin` redirects to the admin page when providing the invalid credentials and then providing valid ones.
- [ ] Logging in as admin then going to the admin page and clearing the cookies and refreshing will show the login and when repeating the above test steps you're redirected correctly.

Fixes https://github.com/owncloud/core/issues/9804
 2015-02-02 15:09:59 +01:00
Thomas Müller
92bc1b44d5 Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag 
include core version into js/css version tag
 2015-02-02 15:02:11 +01:00
Thomas Müller
24daee836a include core version into js/css version tag - fixes #13702 2015-02-02 13:02:11 +01:00
Thomas Müller
82b271855c add libs which have no version number 2015-02-02 10:49:46 +01:00
Morris Jobke
e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache 
Dont remove a file from cache if the delete operation failed
 2015-01-30 14:08:44 +01:00
Vincent Petry
5ade2854ee Fix DAV exceptions, some will still return false now 
Since the Storage interface isn't ready to work directly with exceptions
like Forbidden and NotFound, the DAV storage has been adapted to still
return false when expected.
 2015-01-30 12:02:23 +01:00
Vincent Petry
790622e9fd Merge pull request #13772 from owncloud/closecursor-allconfig 
Close cursor after checking for existing config values
 2015-01-29 19:31:21 +01:00
Morris Jobke
b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares 
make sure that we always create a public share key for remote shares
 2015-01-29 17:54:04 +01:00
Robin Appelman
ce0aa02aac Dont do a cache rename if we cant delete the source file 2015-01-29 15:52:40 +01:00
Robin Appelman
2124540d1d Dont remove a file from cache if the delete operation failed 2015-01-29 15:39:56 +01:00
Lukas Reschke
65ec950b27 Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces 
Scroll to file in folder, when using "search in other places" link
 2015-01-29 15:36:25 +01:00
Björn Schießle
2c1bacadca Merge pull request #13762 from owncloud/ignore_trailing_slash 
ignore trailing slash for remote URL
 2015-01-29 15:00:44 +01:00
Morris Jobke
acf0582029 Merge pull request #13752 from owncloud/closecursor1 
Close cursor early in calculateFolderSize
 2015-01-29 14:23:16 +01:00
Bjoern Schiessle
c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Bjoern Schiessle
82de50d5b9 remove trailing slash 2015-01-29 14:03:09 +01:00
Robin Appelman
05035ef4af Fix webdav put for single file webdav shares 2015-01-29 12:47:12 +01:00
Robin Appelman
ddee63fa00 Fix resolving paths for views rooted in a file 2015-01-29 12:47:11 +01:00
Joas Schilling
54303484eb Scroll to file in folder, when using "search in other places" link 2015-01-29 12:21:20 +01:00
Robin Appelman
41382ef7fc Merge pull request #13667 from owncloud/rename-always-update-cache 
Update the cache when renaming even if we dont emit hooks
 2015-01-28 17:15:11 +01:00
Robin Appelman
8c9f1a982c Update the cache when renaming even if we dont emit hooks 2015-01-28 13:44:39 +01:00
Lukas Reschke
20199dd168 Reference module with .c 
Fixes https://github.com/owncloud/core/issues/13657
 2015-01-28 13:15:32 +01:00
Morris Jobke
1efb1fee11 Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection 
let init() take a ICollection or an INode - fixes PHP message
 2015-01-28 01:14:47 +01:00
Morris Jobke
752b94d363 Merge pull request #13717 from owncloud/storage-donotwrapnullstorage 
Prevent wrapping null storage
 2015-01-28 01:00:20 +01:00
Morris Jobke
87b39e8f03 Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage 
Catch storage exception in scanner for remote shares
 2015-01-28 00:31:37 +01:00
Vincent Petry
6d8985b671 Prevent wrapping null storage 
Can happen when trying to instantiate external storages that have
incomplete config, where the constructor throws an exception (the
exception is caught in createStorage())
 2015-01-27 17:40:08 +01:00
Bernhard Posselt
3fa6e0f4dc Merge pull request #13718 from owncloud/use-proper-namespace 
Use proper namespace
 2015-01-27 17:39:35 +01:00
Lukas Reschke
bedf358b40 Use proper namespace 
IAppManager lives in OCP\App and not in OCP.

Fixes https://github.com/owncloud/core/issues/13710
 2015-01-27 17:34:25 +01:00
Vincent Petry
acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix 
Call final unlink in trash wrapper's storage
 2015-01-27 17:05:38 +01:00