wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
47817 commits 157 branches 562 tags 714 MiB
Commit graph

47817 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
2767139ca9
Merge pull request #13764 from nextcloud/design/text-preview-size 
Reduce text size of text file preview, fix #13720
 2019-01-23 17:01:46 +01:00
Jan-Christoph Borchardt
9147a12ee1
Reduce text size of text file preview, fix #13720 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-23 15:37:08 +01:00
Roeland Jago Douma
68c0fd3863
Merge pull request #13757 from nextcloud/enh/also_cache_logout_route 
Allow caching of the logout route
 2019-01-23 15:32:36 +01:00
Roeland Jago Douma
ebd9f30d85
Request plain logout url 
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>
 2019-01-23 14:06:03 +01:00
Morris Jobke
d59de22525
Merge pull request #13730 from nextcloud/fix/naturalsort-locale 
Respect user locale in natural sort comparator
 2019-01-23 12:19:01 +01:00
Roeland Jago Douma
f2b118a256
Merge pull request #13747 from nextcloud/fix/honor_session_lifetime_if_remember_cookie_is_disabled 
Honor remember_login_cookie_lifetime
 2019-01-23 10:12:01 +01:00
Roeland Jago Douma
308d5d54de
Merge pull request #13738 from nextcloud/bugfix/noid/socialsharing 
Fix social sharing apps integration
 2019-01-23 09:54:35 +01:00
Roeland Jago Douma
e6333c8fe3
Honor remember_login_cookie_lifetime 
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>
 2019-01-23 08:46:24 +01:00
Nextcloud bot
2ba75ac9b0
[tx-robot] updated from transifex 2019-01-23 01:12:05 +00:00
Jan-Christoph Borchardt
ccc35d5566
Merge pull request #13648 from nextcloud/darktheme-fix 
🕶 Dark theme fixes
 2019-01-22 16:30:14 +01:00
Morris Jobke
90e985fe4f
Merge pull request #13739 from nextcloud/cache-cleanup-change 
cleanup shared lock if changing to exclusive lock failed
 2019-01-22 16:11:46 +01:00
Robin Appelman
f69c2d1e84
cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:32:48 +01:00
Julius Härtl
6fdc5092e5
Bump share-backend.js bundle 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-22 15:32:08 +01:00
Julius Härtl
d36f2af161
Fix integration of social sharing into the link popover menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-22 15:30:44 +01:00
Roeland Jago Douma
0d33302350
Merge pull request #13714 from nextcloud/feature/noid/ocs-resources 
Allow OCS resources as well
 2019-01-22 15:13:48 +01:00
Joas Schilling
92edd40e51
Make RouteConfig strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Joas Schilling
f8b74cf0a5
Allow resources via OCS as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Roeland Jago Douma
f8275a7c98
Merge pull request #13722 from nextcloud/design/noid/personal-security-settings 
Move 2FA settings above devices & sessions
 2019-01-22 13:26:10 +01:00
John Molakvoæ
b1d4c3f50b
Merge pull request #13642 from nextcloud/contacts-menu-url-fix 
Allow access to addressbook unique uri
 2019-01-22 13:00:07 +01:00
Christoph Wurst
f0265cccf2
Respect user locale in natural sort comparator 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-22 10:16:40 +01:00
Roeland Jago Douma
5f61fafaaa
Merge pull request #13683 from nextcloud/dependabot/npm_and_yarn/handlebars-4.0.12 
Bump handlebars from 4.0.5 to 4.0.12
 2019-01-22 10:10:45 +01:00
John Molakvoæ (skjnldsv)
22112bf71d
Allow access to addressbook unique uri 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Co-Authored-By: Joas Schilling <coding@schilljs.com>
 2019-01-22 10:03:56 +01:00
Roeland Jago Douma
03290df8d4
Merge pull request #13723 from kofemann/patch-1 
apps: file-upload: fix typo in comments
 2019-01-22 09:26:40 +01:00
dependabot[bot]
7844ef0e0f
Bump handlebars from 4.0.5 to 4.0.12 
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>
 2019-01-22 09:11:21 +01:00
Roeland Jago Douma
dbc184c859
Merge pull request #13678 from 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
 2019-01-22 09:05:58 +01:00
Roeland Jago Douma
fa4b405633
Merge pull request #13677 from nextcloud/dependabot/npm_and_yarn/@babel/preset-env-7.2.3 
Bump @babel/preset-env from 7.2.0 to 7.2.3
 2019-01-22 09:05:11 +01:00
dependabot[bot]
9032ebbdab
Bump @babel/preset-env from 7.2.0 to 7.2.3 
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>
 2019-01-22 09:04:00 +01:00
Roeland Jago Douma
9fc8e44a54
Merge pull request #13679 from nextcloud/dependabot/npm_and_yarn/settings/dompurify-1.0.9 
Bump dompurify from 1.0.8 to 1.0.9 in /settings
 2019-01-22 08:58:44 +01:00
dependabot[bot]
d1a7c55e85
Bump dompurify from 1.0.8 to 1.0.9 in /settings 
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>
 2019-01-22 08:45:52 +01:00
Nextcloud bot
af36746d7c
[tx-robot] updated from transifex 2019-01-22 01:12:25 +00:00
Tigran Mkrtchyan
0573413134 apps: file-upload: fix typo in comments 
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2019-01-21 19:11:13 +01:00
Jan-Christoph Borchardt
1f47c6976a
Add documentation link and settings-hint to 2FA settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-21 18:41:06 +01:00
Jan-Christoph Borchardt
cb487efa24
Move 2FA section above devices & sessions section 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-21 18:08:20 +01:00
Jan-Christoph Borchardt
b8827ce64a
Add CSS to dark theme so activity icons show in stream, ref nextcloud/activity#335 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-21 17:29:22 +01:00
Jan-Christoph Borchardt
0b201ec771
Remove code fixed by @nickvergessen in #13652 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-21 17:26:17 +01:00
Morris Jobke
6a50df9ea9
Merge pull request #13674 from nextcloud/enh/do_not_fetch_static_template 
Include static search template in JS
 2019-01-21 16:38:11 +01:00
Morris Jobke
990bca8696
Merge pull request #13567 from nextcloud/fix/deuglify-upload-progress 
Improve the upload progress bar layout
 2019-01-21 13:54:04 +01:00
Christoph Wurst
da44c1480e
Merge pull request #13680 from nextcloud/dependabot/npm_and_yarn/dompurify-1.0.9 
Bump dompurify from 1.0.4 to 1.0.9
 2019-01-21 12:49:05 +01:00
dependabot[bot]
34de0e782d
Bump nextcloud-vue from 0.5.0 to 0.6.0 in /apps/updatenotification 
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>
 2019-01-21 11:20:23 +01:00
dependabot[bot]
b3c4529c02
Bump dompurify from 1.0.4 to 1.0.9 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 1.0.4 to 1.0.9.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/1.0.4...1.0.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-21 11:17:19 +01:00
dependabot[bot]
f31b82b8c9
Merge pull request #13676 from nextcloud/dependabot/npm_and_yarn/settings/vuex-3.1.0 2019-01-21 10:14:48 +00:00
dependabot[bot]
124b692305
Bump vuex from 3.0.1 to 3.1.0 in /settings 
Bumps [vuex](https://github.com/vuejs/vuex) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/vuejs/vuex/releases)
- [Commits](https://github.com/vuejs/vuex/compare/v3.0.1...v3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-21 10:57:29 +01:00
Nextcloud bot
96567027da
[tx-robot] updated from transifex 2019-01-21 01:11:50 +00:00
Nextcloud bot
a73e19d741
[tx-robot] updated from transifex 2019-01-20 01:12:32 +00:00
Nextcloud bot
f12b589d40
[tx-robot] updated from transifex 2019-01-19 01:12:22 +00:00
Roeland Jago Douma
c1e839961e
Include static search template in JS 
There is no need to fetch this from the server if it is static anyway.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-18 22:06:54 +01:00
Morris Jobke
e28a18ab16
Merge pull request #13660 from nextcloud/fix/template_parameter 
Fix template paramter
 2019-01-18 17:21:51 +01:00
Morris Jobke
743323ee48
Merge pull request #12381 from rummatee/master 
Move/copy file picker: Remeber last destination and start in current folder
 2019-01-18 17:20:54 +01:00
Roeland Jago Douma
66367797df
Fix template paramter 
Else we get shown an error page instead of the correct 403.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-18 15:30:38 +01:00
Morris Jobke
10ab678aa5
Merge pull request #13664 from nextcloud/bugfix/noid/proper-warning-in-settings 
Use warning background color & primary text color for setting warnings
 2019-01-18 13:56:48 +01:00