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

25181 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
c8e3599cad disallow cookie auth for cors requests 
testing ...

fixes

fix test

add php doc

fix small mistake

add another phpdoc

remove not working cors annotations from files app
 2015-05-22 14:06:26 +02:00
Bjoern Schiessle
fef75e5417 remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break 2015-05-22 12:12:31 +02:00
Lukas Reschke
8ce3d6ea57 End processing when file is not found 
We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods.

Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well.
 2015-05-22 11:53:02 +02:00
Vincent Petry
b82d902e18 Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype 
Get correct mimetype when moving and changing extension
 2015-05-22 11:37:11 +02:00
Joas Schilling
d7b2bc9e2f Merge pull request #16516 from owncloud/fix-phpdoc-trait 
Fix PHPDoc
 2015-05-22 09:47:59 +02:00
Jenkins for ownCloud
156881efce [tx-robot] updated from transifex 2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt
79c5790a72 use normal font weight instead of bold for image placeholders 2015-05-22 03:26:30 +02:00
Jan-Christoph Borchardt
6bba345f34 fix float spinner position 2015-05-22 02:30:55 +02:00
Jan-Christoph Borchardt
cd0fa062eb add example theme 2015-05-22 02:17:46 +02:00
Jan-Christoph Borchardt
94e4f448ee use arrow icon for external link to Apps dev docs, like in Help section 2015-05-22 01:17:22 +02:00
Jan-Christoph Borchardt
2fccfbe278 also replace logo-mail with new look 2015-05-22 00:35:12 +02:00
Lukas Reschke
3d8ea96e55 Fix PHPDoc 
Use correct parameters
 2015-05-22 00:17:38 +02:00
Jan-Christoph Borchardt
78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Lukas Reschke
c1f8829590 Deprecate useless helper class 
The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
 2015-05-21 23:35:37 +02:00
Jan-Christoph Borchardt
4e93d9e3a2 remove logo-wide from tests 2015-05-21 22:40:26 +02:00
jknockaert
bf6151e799 fix calculation of $count, $count is always 8129 so we need to check this 
against the unencrypted file size
 2015-05-21 14:15:26 +02:00
Bjoern Schiessle
5a20edac82 test to simulate a non-seekable stream wrapper 2015-05-21 14:15:26 +02:00
jknockaert
fb51880a4a encrypted filesize calculation in flush() 2015-05-21 14:15:26 +02:00
Bjoern Schiessle
38bceb0d74 distinguish between source and target mount point to allow copy/rename between system wide mount points and user specific mountpoints 2015-05-21 14:06:45 +02:00
Lukas Reschke
94077caea9 Merge pull request #16499 from owncloud/fix-phpdoc-annotations 
Fix PHPDoc 🙈
 2015-05-21 13:54:01 +02:00
Lukas Reschke
694d639f94 Fix PHPDoc 🙈 
*sigh*
 2015-05-21 13:07:54 +02:00
Vincent Petry
22968e806c Get correct mimetype when moving and changing extension 
Fixes issue when restoring folders from trash cross-storage, as such
folders have an extension ".d12345678".

Fixes issue when moving folders between storages and at the same time
changing their extension.
 2015-05-21 10:57:58 +02:00
Joas Schilling
896130b68d Merge pull request #16473 from owncloud/occ_16221 
occ option to update all third party apps without disable
 2015-05-21 09:47:54 +02:00
Jenkins for ownCloud
42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Steffen Lindner
48040c46cb Skip disable3rdParty Apps 2015-05-20 17:06:00 +02:00
Vincent Petry
d560d1ef2a Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews 
Restore min-height for single previews
 2015-05-20 16:48:27 +02:00
Morris Jobke
39d1e99228 Merge pull request #16322 from owncloud/trash-view 
dont go trough the view when moving to trash
 2015-05-20 14:44:01 +02:00
Morris Jobke
1a67e5cdc3 Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled 
Return 401 when accessing public webdav and s2s is disabled
 2015-05-20 14:28:45 +02:00
Olivier Paroz
13ab251c6d Restore min-height for single previews 2015-05-20 14:09:31 +02:00
Vincent Petry
7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay 
wait with copying the skeleton untill login and setupfs are done
 2015-05-20 13:52:08 +02:00
Vincent Petry
66e426c990 Sort apps by level, then by name 
Also properly initialize the level to 0 when no level was returned
 2015-05-20 13:43:20 +02:00
Jan-Christoph Borchardt
f978474577 Merge pull request #16463 from owncloud/add-support-to-disallow-domains 
Add support for disallowing domains to the ContentSecurityPolicy
 2015-05-20 13:08:11 +02:00
Vincent Petry
f2a900e04c Return 401 when accessing public webdav and s2s is disabled 2015-05-20 12:19:03 +02:00
Morris Jobke
3a4568313f Merge pull request #16326 from owncloud/fix-16192 
include base dn test in functionality test
 2015-05-20 12:12:52 +02:00
Lukas Reschke
a62190a72d Add support for disallowing domains to the ContentSecurityPolicy 
For enhanced security it is important that there is also a way to disallow domains, including the default ones.

With this commit every method gets added a new "disallow" function.
 2015-05-20 11:44:37 +02:00
Jan-Christoph Borchardt
0d78ebf6cd Merge pull request #16444 from owncloud/close-new-dropdown 
Closes "New" dropdown when switching category
 2015-05-20 11:15:21 +02:00
Morris Jobke
1e59be2d2d Merge pull request #16453 from cmeh/patch-6 
Clean-up of orthography, grammar
 2015-05-20 10:26:42 +02:00
Lukas Reschke
9be6d8cd39 Merge pull request #16446 from owncloud/fix-url-generation 
Fix URL generation
 2015-05-20 08:20:38 +02:00
Jenkins for ownCloud
c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Thomas Müller
f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-05-19 22:12:35 +02:00
Christian Hoffmann
35207ae363 Clean-up of orthography, grammar 
* Changed "instead to" to "instead of".
* Changed "setup" to "set up" (past participle).
 2015-05-19 21:15:22 +02:00
Vincent Petry
f7a2b5e7a9 Added unit tests for download URL in public sharing page 2015-05-19 17:41:06 +02:00
Robin Appelman
2213d6597c add tests for copyFromStorage with same storage 2015-05-19 17:30:32 +02:00
Thomas Müller
f59576c3ca Merge pull request #16447 from owncloud/fix-minor-code-problems 
Fix unexisting class and broken doc
 2015-05-19 16:23:36 +02:00
Morris Jobke
d3d70e5d90 Re-add use statement 2015-05-19 16:15:00 +02:00
Joas Schilling
d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Lukas Reschke
07483033c1 Fix URL generation 
`params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does.

This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters.

Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with 58a87d0bab of https://github.com/owncloud/core/pull/15652.

Without this fix downloading single files from a public shared folder is not possible.
 2015-05-19 15:12:08 +02:00
Thomas Müller
10d1fd1306 Merge pull request #16419 from owncloud/user-group-backend-performance 
Reduce the complexity of the search queries in the user/group backends to a minimum
 2015-05-19 14:51:13 +02:00
Morris Jobke
581227324a Closes "New" dropdown when switching category 
* fixes #16394
* return false - stops all following event callbacks
 2015-05-19 14:47:13 +02:00
Robin Appelman
733784ae41 cleanup move/copy logic in trash 2015-05-19 14:22:09 +02:00