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

47014 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
c32cc4a194
cache users as existing after mapping 
during login they might be cached as non-existing and cause an Exception
in the long run

reduces some duplication, too

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-11-27 17:07:59 +01:00
Roeland Jago Douma
c8cab74404
Merge pull request #12659 from nextcloud/dependabot/npm_and_yarn/settings/vue-router-3.0.2 
Bump vue-router from 3.0.1 to 3.0.2 in /settings
 2018-11-27 14:27:27 +01:00
Morris Jobke
95857a81cf
Merge pull request #12650 from nextcloud/bugfix/12614/count-on-string 
Fix count on string
 2018-11-27 14:14:24 +01:00
Roeland Jago Douma
2f5990e6bd
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-27 12:18:07 +01:00
dependabot[bot]
00be5229bf
Bump vue-router from 3.0.1 to 3.0.2 in /settings 
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-27 12:16:54 +01:00
Roeland Jago Douma
ebd6231559
Merge pull request #12660 from nextcloud/dependabot/npm_and_yarn/settings/vue-infinite-loading-2.4.3 
Bump vue-infinite-loading from 2.4.1 to 2.4.3 in /settings
 2018-11-27 12:13:38 +01:00
Nextcloud bot
e8886fb63a
[tx-robot] updated from transifex 2018-11-27 01:11:34 +00:00
Roeland Jago Douma
6a2570d118
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-26 14:16:42 +01:00
dependabot[bot]
11db113d06
Bump vue-infinite-loading from 2.4.1 to 2.4.3 in /settings 
Bumps [vue-infinite-loading](https://github.com/PeachScript/vue-infinite-loading) from 2.4.1 to 2.4.3.
- [Release notes](https://github.com/PeachScript/vue-infinite-loading/releases)
- [Commits](https://github.com/PeachScript/vue-infinite-loading/compare/v2.4.1...v2.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-26 14:15:41 +01:00
Roeland Jago Douma
324efc00d6
Merge pull request #12658 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.26.1 
Bump webpack from 4.26.0 to 4.26.1 in /apps/accessibility
 2018-11-26 14:13:01 +01:00
Roeland Jago Douma
b3f5cf09de
Merge pull request #12663 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.26.1 
Bump webpack from 4.26.0 to 4.26.1 in /apps/updatenotification
 2018-11-26 14:10:33 +01:00
Roeland Jago Douma
833717b5a9
Merge pull request #12662 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.26.1 
Bump webpack from 4.26.0 to 4.26.1 in /apps/oauth2
 2018-11-26 14:08:50 +01:00
Roeland Jago Douma
75aaaea032
Merge pull request #12661 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.26.1 
Bump webpack from 4.26.0 to 4.26.1 in /settings
 2018-11-26 14:08:09 +01:00
Morris Jobke
217002701e
Merge pull request #12649 from nextcloud/make-acceptance-tests-for-comments-more-robust 
Make acceptance tests for comments more robust
 2018-11-26 11:23:01 +01:00
Morris Jobke
db4a6e947b
Merge pull request #12632 from nextcloud/add-acceptance-tests-for-sharing-files-and-folders-with-another-user 
Add acceptance tests for sharing files and folders with another user
 2018-11-26 11:22:04 +01:00
Roeland Jago Douma
2fd198bd85
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-26 11:16:44 +01:00
Roeland Jago Douma
47db9a789f
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-26 11:14:09 +01:00
Roeland Jago Douma
15b367f7e8
Commpile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-26 11:13:17 +01:00
Roeland Jago Douma
db537c131d
Compile assets 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-26 11:12:07 +01:00
Morris Jobke
b2b92e902c
Merge pull request #12647 from nextcloud/cloud-federation-version 
Fix spelling mistake cloud_federation_api
 2018-11-26 11:03:50 +01:00
dependabot[bot]
cdc9c387f4
Bump webpack from 4.26.0 to 4.26.1 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-26 02:20:13 +00:00
dependabot[bot]
253f7d04d0
Bump webpack from 4.26.0 to 4.26.1 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-26 02:20:07 +00:00
dependabot[bot]
27f65f4085
Bump webpack from 4.26.0 to 4.26.1 in /settings 
Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-26 02:19:39 +00:00
dependabot[bot]
baff8823f8
Bump webpack from 4.26.0 to 4.26.1 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-26 02:15:23 +00:00
Nextcloud bot
e673c7dc49
[tx-robot] updated from transifex 2018-11-26 01:11:21 +00:00
Daniel Kesselberg
6ce849f7b8
Add return type 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-25 12:30:54 +01:00
Nextcloud bot
5b42972648
[tx-robot] updated from transifex 2018-11-25 01:12:16 +00:00
Daniel Kesselberg
d17b32afd7
Fix count on string 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-24 22:06:45 +01:00
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
Robin Appelman
622e2dc6e9
update compatible versions for cloud federation api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-24 17:19:45 +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
Daniel Calviño Sánchez
4d4032bca3 Rename "FilesSharingAppContext" to "PublicShareContext" 
Having both "FilesAppSharingContext" and "FilesSharingAppContext" was
confusing, so "FilesSharingAppContext" was renamed to a more descriptive
name.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:16 +01:00
Daniel Calviño Sánchez
87d4fb777a Extract locators and steps for sharing in Files app to their own context 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:16 +01:00
Daniel Calviño Sánchez
d6c053f6a3 Extract sharing related acceptance tests to their own feature files 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:15 +01:00
Daniel Calviño Sánchez
75b734ec98 Add acceptance tests for folders that can not be reshared 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:15 +01:00
Daniel Calviño Sánchez
d9ad31bd7f Add acceptance tests for resharing a folder with another user 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:15 +01:00
Daniel Calviño Sánchez
563454b741 Add acceptance test for checking that the owner can see reshares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:15 +01:00
Daniel Calviño Sánchez
7aaf5e6a4c Add acceptance test for resharing a file with another user 
To reshare a file there must be at least three enabled users in the
system; although it would be possible to run the steps to create a third
user in the scenarios that need it for convenience a third enabled user
besides "admin" and "user0" was added to the default setup.

In a similar way, a new step was added too to login as a given user
name, similar to the steps to log in as "user0" and as "admin".

Finally, another actor, "Jim", was introduced for those scenarios which
should be played by three standard actors (that is, without a special
configuration like "Rubeus").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:15 +01:00
Daniel Calviño Sánchez
f2f073a304 Add acceptance tests for sharing a folder with another user 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:15 +01:00
Daniel Calviño Sánchez
aa695dca0d Add acceptance tests for sharing a file with another user 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-23 15:13:08 +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