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

46976 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Calviño Sánchez
65263817d0 Wait for the comment to be added before changing to another file 
If the server is too slow, changing to a different file immediately
after sending a new comment but without waiting for the comment to be
shown for the original file could cause the new comment to be shown for
the current file instead.

This is, indeed, a bug in the comments. However, it is not possible to
test it reliably in the acceptance tests, as it depends on how fast the
server adds the message and how fast the client changes to a different
file; sometimes the test would fail and sometimes it would not.

Therefore, now it is waited for the comment to be added before changing
to another file, as in this case it can be reliably tested that changing
to a different file does not cause the comments from the previous file
to be shown in the current file (this was a different bug already fixed
and due to which this test was added in the first place).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-24 18:16:09 +01:00
Daniel Calviño Sánchez
d5725cb3d9 Wait for the empty content element to be shown 
When the "Comments" tab is open the empty content element is always in
the DOM, although it is only shown once the message collection was
fetched and there were no messages. Due to this it is necessary to
explicitly wait for it to be shown instead of relying on the implicit
wait made to find the element; otherwise it would be found immediately
and if the collection was not fetched yet it would not be visible,
causing the test to fail.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-24 18:06:20 +01:00
Nextcloud bot
ea17e962bf
[tx-robot] updated from transifex 2018-11-24 01:11:17 +00:00
Robin Appelman
eadfa9069d
Merge pull request #12556 from nextcloud/anonymous-options-all 
extend anonymous options to work on every dav url
 2018-11-23 18:14:17 +01:00
Roeland Jago Douma
54f4c0c5ce
Merge pull request #12625 from nextcloud/bump_cfa 
Bump cloud federation api
 2018-11-23 16:34:47 +01:00
Robin Appelman
ffd7778040
extend anonymous options to work on every dav url 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-23 15:36:40 +01:00
Roeland Jago Douma
36424f8e9d
Bump cloud federation api 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-23 13:03:20 +01:00
Joas Schilling
75c3737054
Merge pull request #12619 from nextcloud/bump-versions 
Bump versions of server and the requirements of apps
 2018-11-23 11:15:01 +01:00
Joas Schilling
1751c28c28
Bump versions of server and the requirements of apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 10:28:40 +01:00
Roeland Jago Douma
8d2be47e35
Merge pull request #12606 from nextcloud/dependabot/npm_and_yarn/settings/vue-infinite-loading-2.4.1 
Bump vue-infinite-loading from 2.4.0 to 2.4.1 in /settings
 2018-11-23 09:28:05 +01:00
Roeland Jago Douma
beb1c7d8db
Merge pull request #12607 from nextcloud/dependabot/npm_and_yarn/settings/@babel/core-7.1.6 
Bump @babel/core from 7.1.2 to 7.1.6 in /settings
 2018-11-23 09:27:22 +01:00
Roeland Jago Douma
8bccb9f5b2
Merge pull request #12605 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.26.0 
Bump webpack from 4.24.0 to 4.26.0 in /apps/oauth2
 2018-11-23 09:26:44 +01:00
dependabot[bot]
83a3422015
Bump @babel/core from 7.1.2 to 7.1.6 in /settings 
Bumps [@babel/core](https://github.com/babel/babel) from 7.1.2 to 7.1.6.
- [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.1.2...v7.1.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-23 07:08:57 +00:00
Roeland Jago Douma
5291102d8d
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-23 08:08:42 +01:00
Roeland Jago Douma
7cdb914052
Merge pull request #12611 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/preset-env-7.1.6 
Bump @babel/preset-env from 7.1.0 to 7.1.6 in /apps/accessibility
 2018-11-23 08:06:54 +01:00
Roeland Jago Douma
17753b79b8
Merge pull request #12610 from nextcloud/dependabot/npm_and_yarn/settings/@babel/preset-env-7.1.6 
Bump @babel/preset-env from 7.1.0 to 7.1.6 in /settings
 2018-11-23 08:05:16 +01:00
dependabot[bot]
60a1d346d5
Bump webpack from 4.24.0 to 4.26.0 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-23 06:53:03 +00:00
Roeland Jago Douma
92d6068e90
Merge pull request #12604 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.26.0 
Bump webpack from 4.24.0 to 4.26.0 in /settings
 2018-11-23 07:50:30 +01:00
Roeland Jago Douma
db09a5b830
Merge pull request #12608 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.26.0 
Bump webpack from 4.24.0 to 4.26.0 in /apps/accessibility
 2018-11-23 07:50:00 +01:00
Roeland Jago Douma
7365464c7a
Merge pull request #12603 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.26.0 
Bump webpack from 4.24.0 to 4.26.0 in /apps/updatenotification
 2018-11-23 07:49:38 +01:00
Nextcloud bot
d664a9b37b
[tx-robot] updated from transifex 2018-11-23 01:12:51 +00:00
dependabot[bot]
61d7f11294
Bump @babel/preset-env from 7.1.0 to 7.1.6 in /apps/accessibility 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.1.0 to 7.1.6.
- [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.1.0...v7.1.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 22:10:24 +00:00
dependabot[bot]
5b55faba10
Bump @babel/preset-env from 7.1.0 to 7.1.6 in /settings 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.1.0 to 7.1.6.
- [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.1.0...v7.1.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 22:08:25 +00:00
dependabot[bot]
f3870fbdc1
Merge pull request #12612 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/core-7.1.6 2018-11-22 22:06:05 +00:00
Roeland Jago Douma
7d98e695ff
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-22 22:06:16 +01:00
Roeland Jago Douma
4d64135872
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-22 22:05:24 +01:00
Roeland Jago Douma
539e8b99c8
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-22 22:02:19 +01:00
dependabot[bot]
c9d483a50c
Bump @babel/core from 7.1.2 to 7.1.6 in /apps/accessibility 
Bumps [@babel/core](https://github.com/babel/babel) from 7.1.2 to 7.1.6.
- [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.1.2...v7.1.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 19:52:58 +00:00
dependabot[bot]
ad0c6c6449
Bump webpack from 4.24.0 to 4.26.0 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 19:50:57 +00:00
dependabot[bot]
57808e3b24
Bump vue-infinite-loading from 2.4.0 to 2.4.1 in /settings 
Bumps [vue-infinite-loading](https://github.com/PeachScript/vue-infinite-loading) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/PeachScript/vue-infinite-loading/releases)
- [Commits](https://github.com/PeachScript/vue-infinite-loading/compare/v2.4.0...v2.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 19:49:54 +00:00
dependabot[bot]
24549669cb
Bump webpack from 4.24.0 to 4.26.0 in /settings 
Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 19:49:27 +00:00
dependabot[bot]
76fdb273b1
Bump webpack from 4.24.0 to 4.26.0 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.24.0 to 4.26.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.24.0...v4.26.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 19:49:04 +00:00
Roeland Jago Douma
490f46482e
Merge pull request #12592 from patrickbaber/master 
Fix Typo in Original English String and All Translations
 2018-11-22 19:22:10 +01:00
Morris Jobke
68ad2ae118
Merge pull request #10825 from greenido/fixing-issue-9931 
Copy a file to the same directory
 2018-11-22 17:37:04 +01:00
Patrick Baber
5e3de1c326 fix typo in original english string and all translations 
Signed-off-by: Patrick Baber <patrick@p-squared.de>
 2018-11-22 17:13:04 +01:00
Morris Jobke
510f720778
Merge pull request #12581 from nextcloud/version/noid/15.0.0rc1 
15.0.0 RC 1
 2018-11-22 16:59:14 +01:00
Morris Jobke
c3c626a75e
15.0.0 RC 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-22 16:23:24 +01:00
Morris Jobke
2e52ea5ad4
Merge pull request #12554 from nextcloud/bugfix/12493/root-folder-switch 
Do not switch to root folder if filelist is already shown
 2018-11-22 16:09:56 +01:00
Morris Jobke
e0967ffd3a
Merge pull request #12587 from nextcloud/new-user-clear-fix 
Do not clear new user form on failure
 2018-11-22 14:39:27 +01:00
Julius Härtl
a90b4bcc32
Do not switch to root folder if filelist is already shown 
Navigating to the root folder is already handled by
OCA.Files.Navigation.setActiveItem in case the view doesn't change.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-22 14:03:23 +01:00
John Molakvoæ (skjnldsv)
b28c42506f
Do not clear new user form on failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-22 13:58:15 +01:00
Morris Jobke
ad1a026e54
Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanation 
Add explanatory text to admin twofactor settings
 2018-11-22 13:50:11 +01:00
Morris Jobke
db6fad3eee
Merge pull request #12571 from TheLastProject/feature/make_connectivity_check_domains_changeable 
Make connectivity check domains configurable
 2018-11-22 13:42:54 +01:00
Christoph Wurst
c95ef8534e
Add explanatory text to admin twofactor settings 
Ref #12249
Ref https://github.com/nextcloud/documentation/pull/937

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-11-22 12:01:45 +01:00
Morris Jobke
e8df902083
Merge pull request #12580 from nextcloud/app-navigation-menu-dark-fix 
Fix navigation more menu background for dark theme
 2018-11-22 11:21:58 +01:00
Morris Jobke
0534bcfb6a
Merge pull request #12485 from nextcloud/nextcloud-talk-sessions-format 
Format Nextcloud Talk clients sessions.
 2018-11-22 11:15:49 +01:00
Sylvia van Os
935bb25639 Make connectivity check domains configurable 
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
 2018-11-22 10:57:16 +01:00
Morris Jobke
ede53e06c1
Merge pull request #12553 from nextcloud/bugfix/noid/allow-empty-string-in-getAbsoluteURL 
Allow empty string in get absolute url
 2018-11-22 10:26:23 +01:00
Morris Jobke
2e68b73e5e
Merge pull request #12558 from nextcloud/blurry-button 
Apply border to primary button if on log in page (and not in a dark container) or if in header
 2018-11-22 10:18:52 +01:00
Morris Jobke
bebdb19ac2
Merge pull request #12559 from nextcloud/heading-menu-spacing 
Better header navigation display
 2018-11-22 10:13:59 +01:00