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

47505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Calviño Sánchez
4566670fa3 Add acceptance tests for opening search results for comments 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-21 20:14:38 +01:00
Daniel Calviño Sánchez
1a887aaad0 Add acceptance tests for searching comments 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-21 20:14:16 +01:00
Jonas Sulzer
139f5d3b0c
remove user_external from shipped.json 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-12-21 17:32:42 +01:00
Roeland Jago Douma
58d4b8ee85
Merge pull request #13122 from nextcloud/td/min_php_bump 
NC16 is php >= 7.1
 2018-12-21 16:53:14 +01:00
Roeland Jago Douma
70936dcfb3
Fix drone images 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 16:04:12 +01:00
Roeland Jago Douma
3a6e739d8d
NC16 is php >= 7.1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 16:04:11 +01:00
Roeland Jago Douma
dd9514bfb3
Merge pull request #13198 from nextcloud/dependabot/npm_and_yarn/settings/file-loader-3.0.1 
Bump file-loader from 1.1.11 to 3.0.1 in /settings
 2018-12-21 14:25:15 +01:00
Roeland Jago Douma
2f395c5516
Merge pull request #13195 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/file-loader-3.0.1 
Bump file-loader from 1.1.11 to 3.0.1 in /apps/accessibility
 2018-12-21 14:24:53 +01:00
Roeland Jago Douma
50a7f79dd7
Merge pull request #13190 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/file-loader-3.0.1 
Bump file-loader from 1.1.11 to 3.0.1 in /apps/updatenotification
 2018-12-21 14:24:45 +01:00
Roeland Jago Douma
ea8120b1e4
Merge pull request #13210 from nextcloud/followup/12883/handle_slash 
Followup 12883, gracefully handle the getting of /
 2018-12-21 14:23:13 +01:00
Roeland Jago Douma
bcea6c3697
Merge pull request #13212 from nextcloud/bugfix/noid/ie11-files-loading 
Files list not rendering if user has favorites navigation unfolded
 2018-12-21 14:20:41 +01:00
Roeland Jago Douma
16cc68a2fe
Add twofactor_providers_uid index 
Fixes #12943

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 13:03:02 +01:00
John Molakvoæ
c2d75ddc4f
Merge pull request #13187 from nextcloud/fix/noid/ldap-misses-store-2n-displayname-portion 
do not forgot to store the second displayname portion
 2018-12-21 12:39:03 +01:00
Julius Härtl
6bcc77a7c6
Replace ChildNode.before with custom before helper 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-12-21 12:03:34 +01:00
Roeland Jago Douma
d0956c9a42
Followup 12833, gracefully handle the getting of / 
Else this breaks the app page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 11:08:19 +01:00
John Molakvoæ
7717fc0378
Merge pull request #13196 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.28.1 
Bump webpack from 4.28.0 to 4.28.1 in /settings
 2018-12-21 11:04:52 +01:00
John Molakvoæ
a8f611093a
Merge pull request #13185 from nextcloud/fix/proper_version_theming_scss 
SCSS cache buster is a combination of apps/theming/scc_vars
 2018-12-21 10:32:43 +01:00
John Molakvoæ
bb90e3d2d0
Merge pull request #13154 from nextcloud/ie11-checkboxes-fix 
Fix ie11 checkboxes
 2018-12-21 10:17:43 +01:00
dependabot[bot]
31c34bda30
Bump file-loader from 1.1.11 to 3.0.1 in /settings 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 08:36:44 +00:00
dependabot[bot]
674ef82516
Bump file-loader from 1.1.11 to 3.0.1 in /apps/updatenotification 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 08:36:42 +00:00
dependabot[bot]
7b0dbb6e54
Bump file-loader from 1.1.11 to 3.0.1 in /apps/accessibility 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 08:36:33 +00:00
John Molakvoæ
5dfdae3187
Merge pull request #13197 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/preset-env-7.2.3 
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /apps/accessibility
 2018-12-21 09:35:21 +01:00
John Molakvoæ
7fe851f64e
Merge pull request #13194 from nextcloud/dependabot/npm_and_yarn/settings/@babel/preset-env-7.2.3 
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /settings
 2018-12-21 09:34:50 +01:00
John Molakvoæ
4856079d2f
Merge pull request #13193 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/@babel/preset-env-7.2.3 
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /apps/updatenotification
 2018-12-21 09:34:38 +01:00
Roeland Jago Douma
8f16768a8b
Merge pull request #13183 from nextcloud/enhancement/whats_new_one_per_hour 
Only check whatsnew once per hour
 2018-12-21 09:21:16 +01:00
dependabot[bot]
d47bb9e753
Bump webpack from 4.28.0 to 4.28.1 in /settings 
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.0 to 4.28.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.0...v4.28.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 07:42:11 +00:00
Roeland Jago Douma
51064bd707
Merge pull request #13192 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.28.1 
Bump webpack from 4.28.0 to 4.28.1 in /apps/updatenotification
 2018-12-21 08:41:18 +01:00
Roeland Jago Douma
a4cad107be
Merge pull request #13191 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.28.1 
Bump webpack from 4.28.0 to 4.28.1 in /apps/oauth2
 2018-12-21 08:40:58 +01:00
Roeland Jago Douma
9514332fa0
Merge pull request #13189 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.28.1 
Bump webpack from 4.28.0 to 4.28.1 in /apps/accessibility
 2018-12-21 08:40:32 +01:00
Roeland Jago Douma
54d826f4a6
Merge pull request #13188 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/file-loader-3.0.1 
Bump file-loader from 1.1.11 to 3.0.1 in /apps/oauth2
 2018-12-21 08:39:44 +01:00
dependabot[bot]
adb19c0995
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /apps/accessibility 
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>
 2018-12-21 02:22:19 +00:00
dependabot[bot]
b9b15ff165
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /settings 
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>
 2018-12-21 02:21:26 +00:00
dependabot[bot]
1498b216d4
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /apps/updatenotification 
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>
 2018-12-21 02:21:23 +00:00
dependabot[bot]
1e54106f9d
Bump webpack from 4.28.0 to 4.28.1 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.0 to 4.28.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.0...v4.28.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 02:20:56 +00:00
dependabot[bot]
11f69a70a3
Bump webpack from 4.28.0 to 4.28.1 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.0 to 4.28.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.0...v4.28.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 02:20:44 +00:00
dependabot[bot]
3fbdc28233
Bump webpack from 4.28.0 to 4.28.1 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.0 to 4.28.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.0...v4.28.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 02:20:19 +00:00
dependabot[bot]
24897ce8e7
Bump file-loader from 1.1.11 to 3.0.1 in /apps/oauth2 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-21 02:20:17 +00:00
Nextcloud bot
c0a6ad0a72
[tx-robot] updated from transifex 2018-12-21 01:11:48 +00:00
Arthur Schiwon
8bacbffe28
do not forgot to store the second displayname portion 
otherwise it causes a chain reaction of system addressbook updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-12-20 23:11:00 +01:00
Roeland Jago Douma
2679d85782
Merge pull request #13132 from nextcloud/dependabot/npm_and_yarn/build/karma-3.1.4 
Bump karma from 3.1.3 to 3.1.4 in /build
 2018-12-20 20:50:09 +01:00
Roeland Jago Douma
f394bf356e
Rewrite getNumberOfUnreadCommentsForFolder query 
Before the joining and filtering removed unkown files. Resulting in
manual queries for all the files with no (unread) comments (the 99%).

Long story short. This will return a list of all the files in the parent
folder with their unread comment count (can be 0). But this makes sure
that the result is properly cached. In the dav handling.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:43:10 +01:00
Roeland Jago Douma
216ad29f05
SCSS cache buster is a combination of apps/theming/scc_vars 
Else on scss files we'd get <file>?v=<hash>?v=<hash2>
This is of course not valid. Now it becomes <file>?v=<hash>-<hash2>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:33:21 +01:00
Roeland Jago Douma
00446ffb9e
Only check whatsnew once per hour 
Store the last check in the session storage. (Which gets cleared on
logout). And only check once an hour.
Saves a request to the server on most requests when browsing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:09:05 +01:00
John Molakvoæ
4b0cb0df7f
Merge pull request #13171 from nextcloud/fix/7084/case_insensitive_email_search 
Use a case insensitive search for email
 2018-12-20 16:12:51 +01:00
Roeland Jago Douma
03fe2b3b81
Use a case insensitive search for email 
Fixes #7084
Now entering wrongly cased email (roeland@ instead of Roeland@) for
password reset etc. Will also work.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 14:19:35 +01:00
Bjoern Schiessle
4b3308bf3f
fix can change password check in case of encryption is enabled 
Admin should _not_ be able to change password when:
- if an encryption module is loaded and it uses per-user keys
- if encryption is enabled but no encryption modules are loaded

Admin should be able to change the password when:
- no encryption module is loaded and encryption is disabled
- encryption module is loaded but it doesn't require per user keys

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-12-20 12:28:40 +01:00
Roeland Jago Douma
6146c47485
Merge pull request #13170 from nextcloud/backport/13155/master 
[master] allow content provider to generate new Index
 2018-12-20 11:37:18 +01:00
John Molakvoæ
6dccd4e5e2
Merge pull request #13167 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.28.0 
Bump webpack from 4.27.1 to 4.28.0 in /apps/updatenotification
 2018-12-20 11:36:55 +01:00
John Molakvoæ
beb84ec2a6
Merge pull request #13166 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.28.0 
Bump webpack from 4.27.1 to 4.28.0 in /apps/accessibility
 2018-12-20 11:36:24 +01:00
John Molakvoæ
8cc697429b
Merge pull request #13165 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.28.0 
Bump webpack from 4.27.1 to 4.28.0 in /apps/oauth2
 2018-12-20 11:35:35 +01:00