summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Don't add the Encryption Storage Wrapper if there are no encryption modulesRoeland Jago Douma2017-03-291-2/+5
| | | | | | | | | | | | | fixes #4125 If there is no encryption module enabled it makes no sense to setup the encryption wrapper (because we can't do anything anyway). This saves reading the header of files. Especialy on external storage/objectstore this should improve performance Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-291-10/+62
|\ | | | | Cache swift authentication token in memcache
| * serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \ | | | | | | Remove verbose error message
| * | Remove verbose error messageLukas Reschke2017-03-291-2/+3
| | | | | | | | | | | | | | | | | | There's no need to have this included in the error message. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-281-0/+1
|\ \ \ | | | | | | | | Web app manifest for adding to Android home screen
| * | | Web app manifestPierre Rudloff2017-03-281-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-296-0/+20
| | | |
* | | | Merge pull request #4120 from nextcloud/newest-item-first-in-activityMorris Jobke2017-03-281-4/+4
|\ \ \ \ | | | | | | | | | | Change the order on merging activities so the newest item is first
| * | | | Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policyMorris Jobke2017-03-281-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Update legacy CSP policy
| * | | | Update legacy CSP policyLukas Reschke2017-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns it with the one enforced by the AppFramework Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4070 from nextcloud/gzip_scss_jsMorris Jobke2017-03-282-1/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | GZip generated CSS/JS files
| * | | | Fix testsRoeland Jago Douma2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-282-1/+17
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since in production the SCSS files are compiled once and the javascript files are combined once we can just as well gzip them aggresively. This means that once they are requested and the browser supports gzip we can just serve the gzipped file saving precious bandwidth. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4004 from nextcloud/backport-27172Roeland Jago Douma2017-03-281-0/+8
|\ \ \ \ | |/ / / |/| | | Remove SharedCache::getNumericStorageId to let CacheWrapper do it
| * | | Remove SharedCache::getNumericStorageId to let CacheWrapper do itVincent Petry2017-03-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The CacheWrapper will properly forward the call to the wrapped cache. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4112 from nextcloud/swift-configRobin Appelman2017-03-281-5/+80
|\ \ \ \ | |_|_|/ |/| | | Better error messages for objectsack swift configuration
| * | | better error messages for invalid regions, urltypes and service namesRobin Appelman2017-03-281-4/+63
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | better error messages when swift authentication failsRobin Appelman2017-03-281-1/+17
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2816-0/+16
| | |
* | | Merge pull request #4084 from ↵Morris Jobke2017-03-271-5/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-log-spam-with-too-few-navigation-items Don't spam the log with "Undefined index showInHeader"
| * | | Don't spam the log with "Undefined index showInHeader"Joas Schilling2017-03-271-5/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4096 from nextcloud/touch-floorMorris Jobke2017-03-271-1/+1
|\ \ \ \ | | | | | | | | | | round the mtime in touch
| * | | | round the mtime in touchRobin Appelman2017-03-271-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4072 from nextcloud/move-x-frame-options-into-phpGeorg Ehrke2017-03-271-1/+1
|\ \ \ \ | |_|/ / |/| | | Move X-Frame-Options into PHP
| * | | Move X-Frame-Options into PHPLukas Reschke2017-03-261-1/+1
| |/ / | | | | | | | | | | | | | | | The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2752-1314/+312
| | |
* | | Allow to specify the idJoas Schilling2017-03-261-1/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Make sure help is always after usersJoas Schilling2017-03-261-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Fix order as @jancborchardt requestedMorris Jobke2017-03-261-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Don't use the dropdown for one item onlyJoas Schilling2017-03-261-2/+12
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow multiple navigation links from info.xmlJoas Schilling2017-03-261-48/+38
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Allow apps to register a setting via info.xmlJoas Schilling2017-03-261-0/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Move app management to the settings menuJoas Schilling2017-03-261-4/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-263-103/+136
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Register the app management in the normal wayJoas Schilling2017-03-263-12/+11
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Create a notification when the update server couldn't be reached for some daysJoas Schilling2017-03-261-9/+11
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-03-262-2/+2
| |
* | Don't run JSCombiner when not installedLukas Reschke2017-03-251-3/+6
| | | | | | | | | | | | When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4043 from nextcloud/merge-js-for-template-prependMorris Jobke2017-03-241-23/+4
|\ \ | | | | | | Merge JS for template prepend
| * | Merge JS for template prependLukas Reschke2017-03-241-23/+4
| | | | | | | | | | | | | | | | | | Shaves off 14 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge sharing backend JSLukas Reschke2017-03-241-9/+2
|/ / | | | | | | | | | | Removes 8 requests. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Update autoloaderRoeland Jago Douma2017-03-242-0/+4
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Add returnRoeland Jago Douma2017-03-241-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Add debug modeRoeland Jago Douma2017-03-243-2/+41
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Add cachingRoeland Jago Douma2017-03-242-7/+44
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [PoC] JS CombinerRoeland Jago Douma2017-03-243-2/+166
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-241-12/+15
|\ \ | | | | | | Bundle vendor js