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

26820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin McCorkell
5ca690e2f8 Use integer for availability instead of bool 2015-09-15 10:18:32 +02:00
Jenkins for ownCloud
24d2cbf3de [tx-robot] updated from transifex 2015-09-15 01:54:50 -04:00
Thomas Müller
fb9e75edb6 Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracle 
Do not compare the value on Oracle
 2015-09-14 17:59:52 +02:00
Joas Schilling
2d0f0e898d Only check the "was updated/inserted" when not on Oracle... 2015-09-14 15:27:06 +02:00
Lukas Reschke
4a777d686b Merge pull request #18966 from owncloud/ext-remove-numeric-id 
Remove storing storage_id in mount.json
 2015-09-14 15:04:23 +02:00
Lukas Reschke
1369525e7f Merge pull request #18982 from owncloud/fix_18878 
enforce loading icon in sidebar to be 32x32
 2015-09-14 12:47:53 +02:00
Björn Schießle
f9b05578a6 Merge pull request #19012 from owncloud/occ_encrypt_all_fix_name 
use the same pattern for the command name like every other command
 2015-09-14 12:37:06 +02:00
Thomas Müller
341b733dec Merge pull request #19010 from owncloud/use-proper-web-root 
Use / instead of an empty string as cookie path
 2015-09-14 12:14:46 +02:00
Joas Schilling
0e805d5310 Do not compare the value on Oracle 
As per docs: http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
> Large objects (LOBs) are not supported in comparison conditions.
 2015-09-14 12:14:25 +02:00
Individual IT Services
04db96adaf Merge pull request #19006 from owncloud/individual-it-patch-1 
allow ".." in folder names
 2015-09-14 15:56:53 +05:45
Bjoern Schiessle
69b64b5b10 use the same pattern for the command name like every other command 2015-09-14 12:00:39 +02:00
Lukas Reschke
3adbfbfd69 Use / instead of an empty string as cookie path 
When an empty string is used as cookie path PHP will assign the current directory as cookie path.

This means when an user had installed an ownCloud under "/", which is mapped to an empty string in \OC::$WEBROOT, and accessed it the cookie was set to values such as "/index.php/apps/files" since the web browser assumed this to be a directory. This means that multiple encryption cookies were set for the same domain resulting in potential havoc.

With this patch the path will be set to "/" in case an empty web root is installed which makes the cookie accessible to the whole domain.

To test this setup multiple ownCloud instances on the same domain under different ports and have both installed under "/", then try to login in both of it and previously this can in some cases lead to a lockout of the user.

Note that this affects the cookies that the browsers do sent and thus to test this you need to clear all cookies from your browser previously. I consider this an acceptable behaviour for now since this code is only in master.

Fixes https://github.com/owncloud/core/issues/18919
 2015-09-14 11:22:34 +02:00
Jenkins for ownCloud
211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Individual IT Services
f7e66d49fc allow ".." in folder names 
".." are valid in folder names, only ".." by itself is invalid
fix for #18987
 2015-09-14 10:42:00 +05:45
Robin McCorkell
c15ba0d658 Merge pull request #18996 from owncloud/ext-swift-dependencycheck 
Fix dependency check for Swift and SMB_OC
 2015-09-13 22:41:07 +01:00
Robin McCorkell
522619f90e Fix dependency check for Swift and SMB_OC 
Mistake caused during merging, where the API had changed
 2015-09-13 21:41:02 +01:00
Robin McCorkell
0dc7181335 Merge pull request #18441 from owncloud/ext-backends.advanced 
Migrate advanced external storage backends to new registration API [part 3]
 2015-09-13 19:38:22 +01:00
Bernhard Posselt
2e7d50b723 Merge pull request #18991 from owncloud/public-resolve 
Make resolve public to avoid boiler plate code
 2015-09-13 18:20:35 +02:00
Bernhard Posselt
fd74522804 make resolve public to avoid boiler plate code 
add resolve to public interface
 2015-09-13 17:44:24 +02:00
Jenkins for ownCloud
ca921fa1e7 [tx-robot] updated from transifex 2015-09-13 01:55:24 -04:00
Frank Karlitschek
7562e4959b Merge pull request #18658 from owncloud/configurable-temp 
Configurable temporary directory
 2015-09-12 22:04:41 +02:00
Jenkins for ownCloud
9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Georg Ehrke
4660fefd01 enforce loading icon in sidebar to be 32x32 2015-09-11 18:15:36 +02:00
Lukas Reschke
1924dd348a Merge pull request #18653 from owncloud/dav-stream-guzzle 
stream webdav downloads using http client
 2015-09-11 17:10:10 +02:00
Lukas Reschke
0468a7dfd4 Merge pull request #18977 from owncloud/fix-mimetype-reset 
Add reset method to mimetype loader
 2015-09-11 16:50:35 +02:00
Lukas Reschke
437882c284 Merge pull request #18963 from owncloud/ext-fix-fallbacks 
Update isCertificateImportAllowed() check to new API
 2015-09-11 14:02:16 +02:00
Robin McCorkell
188d0e09b8 Add reset method to mimetype loader 
Used to solve concurrency issues
 2015-09-11 12:44:53 +01:00
Lukas Reschke
b8f7d85570 Merge pull request #18778 from owncloud/locking-setup-warnings 
Replace server status message about transitional file locking with se…
 2015-09-11 11:09:49 +02:00
Robin McCorkell
57e49d2005 Merge pull request #18733 from owncloud/ext-dependencycheck 
Make checkDependencies a real method
 2015-09-11 09:46:40 +01:00
Robin McCorkell
732987b99f Make doc links inline 2015-09-11 09:44:00 +01:00
Robin McCorkell
e99988b9c7 Merge pull request #18676 from owncloud/ext-eventdispatcher 
files_external event dispatcher
 2015-09-11 09:34:05 +01:00
Jenkins for ownCloud
ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Robin McCorkell
d67251fe4c Remove storing storage_id in mount.json 
One mount configuration does not necessarily map to a single storage,
due to `$user` substitution or special auth mechanisms.
 2015-09-10 22:09:42 +01:00
Robin McCorkell
27bc781cba Update isCertificateImportAllowed() check to new API 2015-09-10 21:44:56 +01:00
Robin McCorkell
620173c792 Merge pull request #18851 from owncloud/memcached-getallkeys-fallback 
Fallback to complete Memcached flush if getAllKeys fails
 2015-09-10 20:33:18 +01:00
Lukas Reschke
fb717f254f Merge pull request #18699 from owncloud/notification-manager 
Notification manager
 2015-09-10 15:26:36 +02:00
Robin Appelman
d032d2f0f4 Add documentation links for transactional locking 2015-09-10 15:11:14 +02:00
Lukas Reschke
89cd929560 Merge pull request #17791 from owncloud/make-eventsource-compatible-with-win10 
Add custom CSP for Win 10 compatibility
 2015-09-10 15:00:35 +02:00
Lukas Reschke
5e0ad758cf Merge pull request #18948 from owncloud/easier-example-theme-defaults.php 
[example theme] make it easier for non PHP people to understand what …
 2015-09-10 13:56:49 +02:00
Morris Jobke
e6b798eea3 Merge pull request #18936 from owncloud/do-not-include-referer 
Prevent referer from being sent
 2015-09-10 11:25:15 +02:00
Morris Jobke
64203331bc [example theme] make it easier for non PHP people to understand what to change 2015-09-10 11:03:00 +02:00
Jenkins for ownCloud
0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Morris Jobke
f67a691215 Merge pull request #18895 from owncloud/make-code-analyzers-happier 
Add proper PHPDoc
 2015-09-09 23:40:30 +02:00
Lukas Reschke
436c149fbb Prevent referer from being sent 
Nice hardening for enhanced privacy. Especially useful when using embedded viewers such as files_pdfviewer.
 2015-09-09 18:07:43 +02:00
Lukas Reschke
46a328a75a Merge pull request #18873 from owncloud/enc_use_master_password 
Allow admin to use a master key for all files
 2015-09-09 17:05:53 +02:00
Lukas Reschke
6b22006f52 Merge pull request #18931 from owncloud/fix-files_sharing-breakage 
Check if files_sharing is actually enabled before using it
 2015-09-09 16:11:36 +02:00
Morris Jobke
7445afdb6f Merge pull request #18925 from owncloud/change-risky-test 
Rename data provider to avoid risky test warning
 2015-09-09 16:05:01 +02:00
Robin McCorkell
29dd7d83c4 Check if files_sharing is actually enabled before using it 2015-09-09 14:56:49 +01:00
Lukas Reschke
a05ccd969c Merge pull request #18913 from owncloud/put-in-single-field-for-speed 
Put session data in single field for speed
 2015-09-09 14:10:01 +02:00
Lukas Reschke
0943781ccf Rename data provider to avoid risky test warning 
```
06:49:56 There was 1 risky test:
06:49:56
06:49:56 1) OC\AppFramework\Http\JSONResponseTest::testRenderProvider
06:49:56 This test did not perform any assertions
```
 2015-09-09 12:52:54 +02:00