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

22943 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clark Tomlinson
8d09cc3b91 Merge pull request #13989 from owncloud/enhancment/security/11857 
Allow AppFramework applications to specify a custom CSP header
 2015-02-18 10:27:29 -05:00
Clark Tomlinson
84cc90a0ee Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult 
Fix invalid `ini_set` directives
 2015-02-18 10:06:12 -05:00
Lukas Reschke
e4bf3fcb53 Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation 
Revert "add debug log for memcache instantiation"
 2015-02-18 15:45:38 +01:00
Clark Tomlinson
c4fdb9cc24 Merge pull request #14324 from owncloud/fix/14320 
Check if instance is not yet installed
 2015-02-18 09:40:32 -05:00
Lukas Reschke
593681a4a9 Fix invalid ini_set directives 
Somehow they got messed up. Because PHP does automatic type juggling this has worked before as well however it's not guaranteed that this might work in the future as well.
 2015-02-18 15:18:27 +01:00
Vincent Petry
610761d1f7 Merge pull request #14211 from owncloud/activity/225-files-extension-jenkins 
Activity/225 Move displaying of files related activities to files app
 2015-02-18 14:47:15 +01:00
Vincent Petry
837365fff2 Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins 
Activity/225 sharing extension
 2015-02-18 14:46:58 +01:00
Lukas Reschke
cd4c064ebf Revert "add debug log for memcache instantiation" 2015-02-18 14:16:14 +01:00
Lukas Reschke
a666f804c7 Use the untrusted domain in the installer 2015-02-18 13:59:37 +01:00
Lukas Reschke
1a41f8f6f9 Check if instance is not yet installed 
Due to a security hardening in 8.1 a missing value of empty trusted domains in the config would provoke an error as this was misused by a lot of users.

This caused a problem where the initial installation happened from another domain than 127.0.0.1 as in this case the domain was considered untrusted as no value was defined. However, this special case should not get intercepted.

To test:
- [ ] Installing ownCloud on 127.0.0.1 works
- [ ] Installing ownCloud on another domain / IP works
- [ ] When setting up ownCloud from 127.0.0.1 and accessing it from the domain above the trusted domain error should be shown if not specified in the config

Fixes https://github.com/owncloud/core/issues/14320
 2015-02-18 13:06:46 +01:00
Thomas Müller
caa6d3e2db Merge pull request #13857 from owncloud/phpseclib-0.3.9 
Update phpseclib to version 0.3.9.
 2015-02-18 10:17:34 +01:00
Thomas Müller
2b1f39cd6b Merge pull request #14308 from owncloud/fix-14247 
Add mapping for a broken varchar type.
 2015-02-18 10:05:33 +01:00
Jenkins for ownCloud
b9c39b60ec [tx-robot] updated from transifex 2015-02-18 01:55:40 -05:00
Andreas Fischer
c640e2fa66 Update phpseclib to version 0.3.9. 2015-02-18 01:16:23 +01:00
Lukas Reschke
ceaa193df2 Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6 
Use APCu only if available in version 4.0.6 and higher
 2015-02-18 01:07:54 +01:00
Morris Jobke
5d7d2adcbf Merge pull request #14207 from owncloud/propfind-optimize 
Optimize quota calculation for propfind
 2015-02-18 00:18:47 +01:00
Daniel Hansson
c652d3077c Merge pull request #14293 from owncloud/issue/14270-fix-public-share-download-activities 
Correctly create activities for public downloads
 2015-02-17 21:41:40 +01:00
Victor Dubiniuk
090db867d5 Add mapping for a broken varchar type. Fixes #14247 2015-02-17 23:22:57 +03:00
Joas Schilling
0833a6e332 Correctly create activities for public downloads 2015-02-17 17:26:03 +01:00
Clark Tomlinson
ac13cf04ba Merge pull request #14266 from owncloud/encodeUriComponentPerDefault 
Encode parameters in `OC.generateUrl` by itself
 2015-02-17 10:37:06 -05:00
Lukas Reschke
8e6a7350f9 Merge pull request #14289 from owncloud/remove-null-byte-check 
Remove Null Byte Check
 2015-02-17 14:47:27 +01:00
Lukas Reschke
27c1409be5 Encode parameters in OC.generateUrl by itself 
This function is often used in a wrong and potential dangerous way... Thus we should escape the URL per default and offer developers to disable the automatic escaping via an option parameter if they really want that behaviour.

Might break some things, however, those things are then easy to fix and we really have a ton of bugs caused by this...

Fixes https://github.com/owncloud/core/issues/14228
 2015-02-17 14:41:06 +01:00
Lukas Reschke
20d57c8bfe Remove Null Byte Check 
This is not relevant anymore since we require PHP 5.4
 2015-02-17 14:19:20 +01:00
Lukas Reschke
b701bbd8c5 Use APCu only if available in version 4.0.6 and higher 
APCu before 4.0.6 is unbelievable buggy and tend to segfault the PHP process (i.e. the whole webserver)

This potentially fixes https://github.com/owncloud/core/issues/14175

Requires a backport to stable8
 2015-02-17 13:28:02 +01:00
Lukas Reschke
76c511de92 Merge pull request #14056 from owncloud/refactor/13976 
Refactor OC_Request into TrustedDomainHelper and IRequest
 2015-02-17 13:17:04 +01:00
Vincent Petry
e8f16db49d Merge pull request #13866 from rullzer/avatar_share_dialog 
Avatars in share dialog
 2015-02-17 10:17:36 +01:00
Jenkins for ownCloud
30ca14021c [tx-robot] updated from transifex 2015-02-17 01:56:23 -05:00
Lukas Reschke
cebf9f6a5a Incorporate review changes 2015-02-16 22:13:03 +01:00
Lukas Reschke
992164446c Add blackmagic due to cyclic dependency 🙈 2015-02-16 22:13:01 +01:00
Lukas Reschke
9f91d64918 Make scrutinizer happy 2015-02-16 22:13:00 +01:00
Lukas Reschke
886bda5f81 Refactor OC_Request into TrustedDomainHelper and IRequest 
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed.

This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions.

Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though.

Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
 2015-02-16 22:13:00 +01:00
Lukas Reschke
7f624188a7 Merge pull request #14261 from owncloud/fix-last-login-master 
Return milliseconds instead of seconds for lastLogin - refs #14005
 2015-02-16 20:22:47 +01:00
Thomas Müller
1a4b9b0c92 Merge pull request #14263 from owncloud/missing-visibility-activity-iextension 
Add visibility to interface to make scrutinizer 1 step happier
 2015-02-16 19:54:55 +01:00
Thomas Müller
29c8dfe1f8 Merge pull request #13879 from owncloud/add_debug_log_for_memcache_instantiation 
add debug log for memcache instantiation
 2015-02-16 19:51:40 +01:00
Thomas Müller
4910f3e202 fixing unit tests in UsersControllerTest 2015-02-16 19:45:40 +01:00
Jörn Friedrich Dreyer
87db136508 add debug log for memcache instantiation 2015-02-16 18:05:43 +01:00
Joas Schilling
f808acd317 Add visibility to interface to make scrutinizer 1 step happier 2015-02-16 17:46:43 +01:00
Thomas Müller
3c75a440a6 Return milliseconds instead of seconds for lastLogin - refs #14005 2015-02-16 17:41:44 +01:00
Morris Jobke
5a5d6bf4db Merge pull request #14128 from owncloud/drop-unused-methods 
Remove unused function and correct PHPDoc
 2015-02-16 17:37:36 +01:00
Morris Jobke
fadf0a9443 Merge pull request #10673 from owncloud/smb-new 
New SMB storage backend
 2015-02-16 17:37:20 +01:00
Thomas Müller
9271059195 Merge pull request #13750 from owncloud/enhanced-code-checker 
Implement php code checker to detect usage of not allowed private ...
 2015-02-16 16:55:57 +01:00
Joas Schilling
8eb804b1f6 Merge pull request #13269 from owncloud/issue/13211-cache-array-implementation 
Add an array implementation of cache and use it if we are not debugging
 2015-02-16 15:35:20 +01:00
Thomas Müller
9c47ab91f2 Merge pull request #14194 from owncloud/url-encode-logout-attribute 
URLEncode logout attribute
 2015-02-16 15:04:20 +01:00
Joas Schilling
8848b5f067 Add an array implementation of cache and use it if we are not debugging 2015-02-16 14:55:50 +01:00
Thomas Müller
bd994cb294 Update 3rdparty commit to master 2015-02-16 14:53:16 +01:00
Lukas Reschke
c6705ab574 Merge pull request #13890 from owncloud/add-no-referrer 
Add `rel="noreferrer"` where possible and switch to HTTPS
 2015-02-16 14:36:44 +01:00
Morris Jobke
f7bd543a85 Merge pull request #14243 from owncloud/console-execution-time-master 
console commands shall not be limited with respect to execution time
 2015-02-16 14:26:14 +01:00
Robin Appelman
6477e39be9 also make sure we have a leading slash for the test root 2015-02-16 14:01:08 +01:00
Thomas Müller
6cdc7a890a Merge pull request #14076 from owncloud/autotest-external-ftp 
[files_external] ftp tests
 2015-02-16 13:56:40 +01:00
Robin Appelman
6467369cad make sure the root has a trailing slash 2015-02-16 13:52:11 +01:00