summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14267 from owncloud/encode-eventsourceThomas Müller2015-02-191-1/+1
|\ | | | | Encode requesttoken
| * Encode requesttokenLukas Reschke2015-02-161-1/+1
| | | | | | | | One cannot make any assumptions about the requesttoken content. Thus we need to encode it.
* | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ | | | | | | Encode Requesttoken for avatars
| * | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
| | | | | | | | | | | | | | | | | | Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged. Shocking to see how much places in our code do it wrong :gun:
* | | Merge pull request #14311 from raimund-schluessler/Fix#14310Thomas Müller2015-02-191-1/+1
|\ \ \ | | | | | | | | Fix #14310
| * | | Fix #14310Raimund Schlüßler2015-02-171-1/+1
| | | |
* | | | Merge pull request #14377 from owncloud/port-14041Thomas Müller2015-02-191-3/+37
|\ \ \ \ | | | | | | | | | | Port of #14041 to master
| * | | | Port of #14041 to masterArthur Schiwon2015-02-191-3/+37
|/ / / / | | | | | | | | | | | | | | | | | | | | on ownCloud upgrade: upgrade all apps in order, load important ones Fix "other" app update stack
* | | | Merge pull request #14338 from owncloud/fix-nav-heigtMorris Jobke2015-02-191-0/+1
|\ \ \ \ | | | | | | | | | | If no link text has been set for the navigation show the link nonetheless
| * | | | if no link text has been set for the navigation show the link nonethelessBernhard Posselt2015-02-181-0/+1
| | | | |
* | | | | Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-viewThomas Müller2015-02-192-6/+149
|\ \ \ \ \ | | | | | | | | | | | | Disallow path traversals in file view
| * | | | | Add some basic PHPDoc to functionsLukas Reschke2015-02-181-6/+124
| | | | | |
| * | | | | Prevent directory traversals in ctr of \OC\Files\ViewLukas Reschke2015-02-182-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1944-170/+236
| | | | | |
* | | | | | Merge pull request #13836 from owncloud/part-no-cache-updateThomas Müller2015-02-192-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont update the cache when working with part files
| * | | | | | Dont bother updating the cache when working with part filesRobin Appelman2015-02-051-0/+12
| | | | | | |
| * | | | | | Dont update the cache after fopenRobin Appelman2015-02-051-1/+1
| | | | | | |
* | | | | | | Merge pull request #14349 from owncloud/contributetrackerupdateThomas Müller2015-02-181-6/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add documentation issue trackers and use https everywhere
| * | | | | | | add documentation issue trackers and use https everywhereVolkan Gezer2015-02-181-6/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #12213 from sebomoto/add-loadfeedbackJan-Christoph Borchardt2015-02-183-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add loadfeedback
| * | | | | | changed image to classed div for spinner animationSebastian Bolt2015-02-043-1/+9
| | | | | | |
* | | | | | | Merge pull request #13989 from owncloud/enhancment/security/11857Clark Tomlinson2015-02-188-22/+529
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow AppFramework applications to specify a custom CSP header
| * | | | | | | Rename to allowEvalLukas Reschke2015-02-162-3/+3
| | | | | | | |
| * | | | | | | Allow AppFramework applications to specify a custom CSP headerLukas Reschke2015-02-168-22/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows AppFramework applications to specify a custom CSP header for example when the default policy is too strict. Furthermore this allows us to partially migrate away from CSS and allowed eval() in our JavaScript components. Legacy ownCloud components will still use the previous policy. Application developers can use this as following in their controllers: ```php $response = new TemplateResponse('activity', 'list', []); $cspHelper = new ContentSecurityPolicyHelper(); $cspHelper->addAllowedScriptDomain('www.owncloud.org'); $response->addHeader('Content-Security-Policy', $cspHelper->getPolicy()); return $response; ``` Fixes https://github.com/owncloud/core/issues/11857 which is a pre-requisite for https://github.com/owncloud/core/issues/13458 and https://github.com/owncloud/core/issues/11925
* | | | | | | | Merge pull request #14335 from owncloud/enable-strict-mode-per-deafultClark Tomlinson2015-02-181-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix invalid `ini_set` directives
| * | | | | | | | Fix invalid `ini_set` directivesLukas Reschke2015-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge pull request #14330 from ↵Lukas Reschke2015-02-183-21/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/revert-13879-add_debug_log_for_memcache_instantiation Revert "add debug log for memcache instantiation"
| * | | | | | | | | Revert "add debug log for memcache instantiation"Lukas Reschke2015-02-183-21/+7
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #14324 from owncloud/fix/14320Clark Tomlinson2015-02-182-2/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Check if instance is not yet installed
| * | | | | | | | Use the untrusted domain in the installerLukas Reschke2015-02-181-2/+2
| | | | | | | | |
| * | | | | | | | Check if instance is not yet installedLukas Reschke2015-02-181-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge pull request #14211 from owncloud/activity/225-files-extension-jenkinsVincent Petry2015-02-182-0/+285
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Activity/225 Move displaying of files related activities to files app
| * | | | | | | | Move displaying of files related activities to files appJoas Schilling2015-02-132-0/+285
| | | | | | | | |
* | | | | | | | | Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkinsVincent Petry2015-02-183-75/+156
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Activity/225 sharing extension
| * | | | | | | | Use filterNotificationTypes to filter the types and group the methodsJoas Schilling2015-02-131-43/+37
| | | | | | | | |
| * | | | | | | | Copy sharing related activity code to Files_Sharing activity extensionJoas Schilling2015-02-133-49/+136
| | | | | | | | |
* | | | | | | | | Merge pull request #13857 from owncloud/phpseclib-0.3.9Thomas Müller2015-02-181-10/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update phpseclib to version 0.3.9.
| * | | | | | | | | Update phpseclib to version 0.3.9.Andreas Fischer2015-02-181-10/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14308 from owncloud/fix-14247Thomas Müller2015-02-181-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add mapping for a broken varchar type.
| * | | | | | | | | | Add mapping for a broken varchar type. Fixes #14247Victor Dubiniuk2015-02-171-0/+1
| | | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-18134-222/+76
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6Lukas Reschke2015-02-183-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use APCu only if available in version 4.0.6 and higher
| * | | | | | | | | | | Use APCu only if available in version 4.0.6 and higherLukas Reschke2015-02-173-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge pull request #14207 from owncloud/propfind-optimizeMorris Jobke2015-02-182-18/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Optimize quota calculation for propfind
| * | | | | | | | | | | add unit test for webdav quotaRobin Appelman2015-02-131-0/+30
| | | | | | | | | | | |
| * | | | | | | | | | | pass fileinfo to getStorageInfoRobin Appelman2015-02-131-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Cache quota info for directoriesRobin Appelman2015-02-131-16/+26
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #14293 from ↵Daniel Hansson2015-02-171-13/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/14270-fix-public-share-download-activities Correctly create activities for public downloads
| * | | | | | | | | | | Correctly create activities for public downloadsJoas Schilling2015-02-171-13/+35
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #14266 from owncloud/encodeUriComponentPerDefaultClark Tomlinson2015-02-172-6/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Encode parameters in `OC.generateUrl` by itself