Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Web app manifest | Pierre Rudloff | 2017-03-28 | 3 | -0/+16 |
| | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | Merge pull request #4121 from nextcloud/split-sharing-integration-tests | Morris Jobke | 2017-03-28 | 3 | -710/+728 |
|\ | | | | | Split long running features/sharing-v1.feature into two smaller parts | ||||
| * | Split long running features/sharing-v1.feature into two smaller parts | Morris Jobke | 2017-03-28 | 3 | -710/+728 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #4070 from nextcloud/gzip_scss_js | Morris Jobke | 2017-03-28 | 8 | -35/+327 |
|\ \ | |/ |/| | GZip generated CSS/JS files | ||||
| * | Fix controller tests | Roeland Jago Douma | 2017-03-28 | 2 | -2/+134 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Fix tests | Roeland Jago Douma | 2017-03-28 | 3 | -29/+117 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Allow to gzip CSS/JS files | Roeland Jago Douma | 2017-03-28 | 4 | -5/+77 |
| | | | | | | | | | | | | | | | | | | | | 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 #4054 from nextcloud/inlinejsfirst | Joas Schilling | 2017-03-28 | 3 | -15/+15 |
|\ \ | | | | | | | Moving the inline js before the CSS | ||||
| * | | Moving the inline js before the CSS | Roeland Jago Douma | 2017-03-28 | 3 | -15/+15 |
| |/ | | | | | | | | | | | This allows browsers to do smarted parallel downloads Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #4004 from nextcloud/backport-27172 | Roeland Jago Douma | 2017-03-28 | 6 | -1/+73 |
|\ \ | |/ |/| | Remove SharedCache::getNumericStorageId to let CacheWrapper do it | ||||
| * | fix shared storage numeric id | Robin Appelman | 2017-03-27 | 3 | -0/+11 |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | do not remove the method and only keep the tests | Morris Jobke | 2017-03-23 | 1 | -0/+8 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | Remove SharedCache::getNumericStorageId to let CacheWrapper do it | Vincent Petry | 2017-03-23 | 5 | -9/+62 |
| | | | | | | | | | | | | 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-config | Robin Appelman | 2017-03-28 | 1 | -5/+80 |
|\ \ | | | | | | | Better error messages for objectsack swift configuration | ||||
| * | | better error messages for invalid regions, urltypes and service names | Robin Appelman | 2017-03-28 | 1 | -4/+63 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | better error messages when swift authentication fails | Robin Appelman | 2017-03-28 | 1 | -1/+17 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | Merge pull request #4101 from nextcloud/header-detail | Morris Jobke | 2017-03-28 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | show active indicator on current app even when hovering other icons | ||||
| * | | | show active indicator on current app even when hovering other icons | Jan-Christoph Borchardt | 2017-03-27 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | Merge pull request #4082 from nextcloud/fix-menu | John Molakvoæ | 2017-03-28 | 2 | -19/+26 |
|\ \ \ \ | | | | | | | | | | | Fix pop over menu opacity | ||||
| * | | | | highlight active entry in personal info menu again | Jan-Christoph Borchardt | 2017-03-27 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | | Fix pop over menu opacity | Morris Jobke | 2017-03-26 | 2 | -18/+25 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-28 | 88 | -52/+254 |
| | | | | |||||
* | | | | Merge pull request #4107 from nextcloud/users-settings-label | Morris Jobke | 2017-03-27 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | add Settings label to users settings for consistency | ||||
| * | | | | add Settings label to users settings for consistency | Jan-Christoph Borchardt | 2017-03-28 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | Merge pull request #4084 from ↵ | Morris Jobke | 2017-03-27 | 1 | -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 Schilling | 2017-03-27 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | Merge pull request #4083 from nextcloud/update-strengthify | Morris Jobke | 2017-03-27 | 5 | -10/+15 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Update strengthify and fix password strength | ||||
| * | | | | Update strengthify and fix password strength | Morris Jobke | 2017-03-27 | 5 | -10/+15 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | Merge pull request #4094 from nextcloud/ldap-description | Morris Jobke | 2017-03-27 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix LDAP description | ||||
| * \ \ \ | Merge branch 'master' of https://github.com/nextcloud/server | Marius Blüm | 2017-03-27 | 2 | -17/+49 |
| |\ \ \ \ | |||||
| * | | | | | Fix LDAP description | Marius Blüm | 2017-03-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io> | ||||
* | | | | | | Merge pull request #4092 from nextcloud/theme-favicon-mask-color | Morris Jobke | 2017-03-27 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | use theming colors for favicon on macOS | ||||
| * | | | | | | use theming colors for favicon on macOS | Jan-Christoph Borchardt | 2017-03-27 | 3 | -3/+3 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | | | Merge pull request #4096 from nextcloud/touch-floor | Morris Jobke | 2017-03-27 | 2 | -1/+18 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | round the mtime in touch | ||||
| * | | | | | round the mtime in touch | Robin Appelman | 2017-03-27 | 2 | -1/+18 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | Merge pull request #4027 from nextcloud/better-spreed-call-urls | Robin Appelman | 2017-03-27 | 2 | -17/+49 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Better spreed call urls | ||||
| * | | | | Throw a nice HintException when the apps are missing | Joas Schilling | 2017-03-24 | 1 | -10/+30 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Allow to use short URLs for calls | Joas Schilling | 2017-03-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Allow to push a non-query URL to the browser history | Joas Schilling | 2017-03-24 | 1 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | Merge pull request #4072 from nextcloud/move-x-frame-options-into-php | Georg Ehrke | 2017-03-27 | 2 | -2/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Move X-Frame-Options into PHP | ||||
| * | | | | | Move X-Frame-Options into PHP | Lukas Reschke | 2017-03-26 | 2 | -2/+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> | ||||
* | | | | | | Merge pull request #4073 from nextcloud/secure-drop | Roeland Jago Douma | 2017-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Rename File drop to Secure drop | ||||
| * | | | | | | Rename File drop to Secure drop | Olivier Paroz | 2017-03-26 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | Merge pull request #4064 from nextcloud/update-moment | Roeland Jago Douma | 2017-03-27 | 7 | -24507/+1017 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Update momentjs | ||||
| * | | | | | use moments.js min in core.js | Roeland Jago Douma | 2017-03-26 | 5 | -25950/+1009 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | [js] Bump momentjs | Roeland Jago Douma | 2017-03-26 | 3 | -11263/+12714 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-27 | 700 | -15258/+1184 |
| | | | | | | |||||
* | | | | | | Merge pull request #4077 from nextcloud/better-navigation-management | Morris Jobke | 2017-03-26 | 12 | -250/+279 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Register the app management in the normal way | ||||
| * | | | | | | Allow to specify the id | Joas Schilling | 2017-03-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | | Make sure help is always after users | Joas Schilling | 2017-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> |