summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding AvatarHomeTestThomas Müller2017-03-294-9/+147
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Return last modification time to allow proper listing in cadaverThomas Müller2017-03-291-4/+9
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Adding dav resource for avatarsThomas Müller2017-03-295-1/+233
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4004 from nextcloud/backport-27172Roeland Jago Douma2017-03-286-1/+73
|\ | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do it
| * fix shared storage numeric idRobin Appelman2017-03-273-0/+11
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * do not remove the method and only keep the testsMorris Jobke2017-03-231-0/+8
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Remove SharedCache::getNumericStorageId to let CacheWrapper do itVincent Petry2017-03-235-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-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>
* | | Merge pull request #4101 from nextcloud/header-detailMorris Jobke2017-03-281-6/+1
|\ \ \ | | | | | | | | show active indicator on current app even when hovering other icons
| * | | show active indicator on current app even when hovering other iconsJan-Christoph Borchardt2017-03-271-6/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4082 from nextcloud/fix-menuJohn Molakvoæ2017-03-282-19/+26
|\ \ \ \ | | | | | | | | | | Fix pop over menu opacity
| * | | | highlight active entry in personal info menu againJan-Christoph Borchardt2017-03-271-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Fix pop over menu opacityMorris Jobke2017-03-262-18/+25
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-2888-52/+254
| | | |
* | | | Merge pull request #4107 from nextcloud/users-settings-labelMorris Jobke2017-03-271-2/+2
|\ \ \ \ | | | | | | | | | | add Settings label to users settings for consistency
| * | | | add Settings label to users settings for consistencyJan-Christoph Borchardt2017-03-281-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | 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 #4083 from nextcloud/update-strengthifyMorris Jobke2017-03-275-10/+15
|\ \ \ \ \ | |_|_|/ / |/| | | | Update strengthify and fix password strength
| * | | | Update strengthify and fix password strengthMorris Jobke2017-03-275-10/+15
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4094 from nextcloud/ldap-descriptionMorris Jobke2017-03-271-2/+2
|\ \ \ \ | | | | | | | | | | Fix LDAP description
| * \ \ \ Merge branch 'master' of https://github.com/nextcloud/serverMarius Blüm2017-03-272-17/+49
| |\ \ \ \
| * | | | | Fix LDAP descriptionMarius Blüm2017-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | | Merge pull request #4092 from nextcloud/theme-favicon-mask-colorMorris Jobke2017-03-273-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | use theming colors for favicon on macOS
| * | | | | | use theming colors for favicon on macOSJan-Christoph Borchardt2017-03-273-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #4096 from nextcloud/touch-floorMorris Jobke2017-03-272-1/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | round the mtime in touch
| * | | | | round the mtime in touchRobin Appelman2017-03-272-1/+18
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #4027 from nextcloud/better-spreed-call-urlsRobin Appelman2017-03-272-17/+49
|\ \ \ \ \ | |_|_|/ / |/| | | | Better spreed call urls
| * | | | Throw a nice HintException when the apps are missingJoas Schilling2017-03-241-10/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow to use short URLs for callsJoas Schilling2017-03-241-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow to push a non-query URL to the browser historyJoas Schilling2017-03-241-9/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #4072 from nextcloud/move-x-frame-options-into-phpGeorg Ehrke2017-03-272-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Move X-Frame-Options into PHP
| * | | | | Move X-Frame-Options into PHPLukas Reschke2017-03-262-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-dropRoeland Jago Douma2017-03-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename File drop to Secure drop
| * | | | | | Rename File drop to Secure dropOlivier Paroz2017-03-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4064 from nextcloud/update-momentRoeland Jago Douma2017-03-277-24507/+1017
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Update momentjs
| * | | | | use moments.js min in core.jsRoeland Jago Douma2017-03-265-25950/+1009
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | [js] Bump momentjsRoeland Jago Douma2017-03-263-11263/+12714
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-27700-15258/+1184
| | | | | |
* | | | | | Merge pull request #4077 from nextcloud/better-navigation-managementMorris Jobke2017-03-2612-250/+279
|\ \ \ \ \ \ | | | | | | | | | | | | | | Register the app management in the normal way
| * | | | | | 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>
| * | | | | | Fix the testsJoas Schilling2017-03-261-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Don't use the dropdown for one item onlyJoas Schilling2017-03-262-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Allow multiple navigation links from info.xmlJoas Schilling2017-03-264-91/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-264-33/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>