summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Urlencode the requesttokenRoeland Jago Douma2019-01-232-2/+2
| | | | | | Followup of #13757 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #13757 from nextcloud/enh/also_cache_logout_routeRoeland Jago Douma2019-01-232-16/+7
|\ | | | | Allow caching of the logout route
| * Request plain logout urlRoeland Jago Douma2019-01-232-16/+7
|/ | | | | | | By requesting the plain logout url we allow it to be properly cached by the caching router. We just add the requesttoken manually. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #13730 from nextcloud/fix/naturalsort-localeMorris Jobke2019-01-231-5/+2
|\ | | | | Respect user locale in natural sort comparator
| * Respect user locale in natural sort comparatorChristoph Wurst2019-01-221-5/+2
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13747 from ↵Roeland Jago Douma2019-01-233-3/+34
|\ \ | | | | | | | | | | | | nextcloud/fix/honor_session_lifetime_if_remember_cookie_is_disabled Honor remember_login_cookie_lifetime
| * | Honor remember_login_cookie_lifetimeRoeland Jago Douma2019-01-233-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the remember_login_cookie_lifetime is set to 0 this means we do not want to use remember me at all. In that case we should also not creatae a remember me cookie and should create a proper temp token. Further this specifies that is not 0 the remember me time should always be larger than the session timeout. Because else the behavior is not really defined. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #13738 from nextcloud/bugfix/noid/socialsharingRoeland Jago Douma2019-01-233-17/+15
|\ \ \ | | | | | | | | Fix social sharing apps integration
| * | | Bump share-backend.js bundleJulius Härtl2019-01-222-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Fix integration of social sharing into the link popover menuJulius Härtl2019-01-221-15/+13
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2019-01-238-4/+8
| | | |
* | | | Merge pull request #13648 from nextcloud/darktheme-fixJan-Christoph Borchardt2019-01-2211-44/+74
|\ \ \ \ | | | | | | | | | | 🕶 Dark theme fixes
| * | | | Add CSS to dark theme so activity icons show in stream, ref ↵Jan-Christoph Borchardt2019-01-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/activity#335 Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Remove code fixed by @nickvergessen in #13652Jan-Christoph Borchardt2019-01-211-6/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Prevent slideshow icons from going darkJan-Christoph Borchardt2019-01-171-3/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix move/copy dialog iconsJan-Christoph Borchardt2019-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix search fieldJan-Christoph Borchardt2019-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix 'More apps' iconJan-Christoph Borchardt2019-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix Contacts menu iconsJan-Christoph Borchardt2019-01-172-611/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix icons in 'More apps' menuJan-Christoph Borchardt2019-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix app management icons and other elementsJan-Christoph Borchardt2019-01-175-25/+637
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Fix federated cloud icon sizing and dark theme compatibilityJan-Christoph Borchardt2019-01-163-11/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Fix password change toggle position and visibility in dark themeJan-Christoph Borchardt2019-01-161-9/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix select2 iconsJan-Christoph Borchardt2019-01-161-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Dark theme: Fix select triangle not being visibleJan-Christoph Borchardt2019-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #13739 from nextcloud/cache-cleanup-changeMorris Jobke2019-01-222-1/+38
|\ \ \ \ \ | |_|/ / / |/| | | | cleanup shared lock if changing to exclusive lock failed
| * | | | cleanup shared lock if changing to exclusive lock failedRobin Appelman2019-01-222-1/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #13714 from nextcloud/feature/noid/ocs-resourcesRoeland Jago Douma2019-01-222-54/+179
|\ \ \ \ \ | | | | | | | | | | | | Allow OCS resources as well
| * | | | | Make RouteConfig strictJoas Schilling2019-01-221-63/+49
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Allow resources via OCS as wellJoas Schilling2019-01-222-1/+140
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #13722 from nextcloud/design/noid/personal-security-settingsRoeland Jago Douma2019-01-222-27/+35
|\ \ \ \ \ | | | | | | | | | | | | Move 2FA settings above devices & sessions
| * | | | | Add documentation link and settings-hint to 2FA settingsJan-Christoph Borchardt2019-01-212-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Move 2FA section above devices & sessions sectionJan-Christoph Borchardt2019-01-211-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #13642 from nextcloud/contacts-menu-url-fixJohn Molakvoæ2019-01-224-0/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow access to addressbook unique uri
| * | | | | | Allow access to addressbook unique uriJohn Molakvoæ (skjnldsv)2019-01-224-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Co-Authored-By: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #13683 from ↵Roeland Jago Douma2019-01-224-135/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/handlebars-4.0.12 Bump handlebars from 4.0.5 to 4.0.12
| * | | | | | | Bump handlebars from 4.0.5 to 4.0.12dependabot[bot]2019-01-224-137/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.5 to 4.0.12. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.5...v4.0.12) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #13723 from kofemann/patch-1Roeland Jago Douma2019-01-221-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | apps: file-upload: fix typo in comments
| * | | | | | | | apps: file-upload: fix typo in commentsTigran Mkrtchyan2019-01-211-2/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | | | | | | | Merge pull request #13678 from ↵Roeland Jago Douma2019-01-224-25/+90
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/nextcloud-vue-0.6.0 Bump nextcloud-vue from 0.5.0 to 0.6.0 in /apps/updatenotification
| * | | | | | | | Bump nextcloud-vue from 0.5.0 to 0.6.0 in /apps/updatenotificationdependabot[bot]2019-01-214-25/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [nextcloud-vue](https://github.com/nextcloud/vue-components) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/nextcloud/vue-components/releases) - [Commits](https://github.com/nextcloud/vue-components/compare/v0.5.0...v0.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | Merge pull request #13677 from ↵Roeland Jago Douma2019-01-222-39/+148
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/@babel/preset-env-7.2.3 Bump @babel/preset-env from 7.2.0 to 7.2.3
| * | | | | | | | Bump @babel/preset-env from 7.2.0 to 7.2.3dependabot[bot]2019-01-222-39/+148
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.2.0 to 7.2.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #13679 from ↵Roeland Jago Douma2019-01-224-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/dompurify-1.0.9 Bump dompurify from 1.0.8 to 1.0.9 in /settings
| * | | | | | | Bump dompurify from 1.0.8 to 1.0.9 in /settingsdependabot[bot]2019-01-224-6/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/1.0.8...1.0.9) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | / / / / / [tx-robot] updated from transifexNextcloud bot2019-01-2216-32/+34
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #13674 from nextcloud/enh/do_not_fetch_static_templateMorris Jobke2019-01-212-21/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include static search template in JS
| * | | | | | Include static search template in JSRoeland Jago Douma2019-01-182-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to fetch this from the server if it is static anyway. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #13567 from nextcloud/fix/deuglify-upload-progressMorris Jobke2019-01-211-6/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the upload progress bar layout
| * | | | | | | Deuglify the file upload progress barMichael Weimann2019-01-141-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 07:25:35 +0000