summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12659 from nextcloud/dependabot/npm_and_yarn/settings/vue...Roeland Jago Douma2018-11-274-9/+9
|\
| * Compile assetsRoeland Jago Douma2018-11-272-5/+5
| * Bump vue-router from 3.0.1 to 3.0.2 in /settingsdependabot[bot]2018-11-272-4/+4
* | Merge pull request #12650 from nextcloud/bugfix/12614/count-on-stringMorris Jobke2018-11-271-2/+15
|\ \ | |/ |/|
| * Add return typeDaniel Kesselberg2018-11-251-1/+1
| * Fix count on stringDaniel Kesselberg2018-11-241-2/+15
* | Merge pull request #12660 from nextcloud/dependabot/npm_and_yarn/settings/vue...Roeland Jago Douma2018-11-274-8/+8
|\ \
| * | Compile assetsRoeland Jago Douma2018-11-262-4/+4
| * | Bump vue-infinite-loading from 2.4.1 to 2.4.3 in /settingsdependabot[bot]2018-11-262-4/+4
* | | [tx-robot] updated from transifexNextcloud bot2018-11-2730-34/+188
|/ /
* | Merge pull request #12658 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-11-264-6/+6
|\ \
| * | Compile assetsRoeland Jago Douma2018-11-263-6/+11
| * | Bump webpack from 4.26.0 to 4.26.1 in /apps/accessibilitydependabot[bot]2018-11-262-13/+8
* | | Merge pull request #12663 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-264-6/+6
|\ \ \
| * | | Compile assetsRoeland Jago Douma2018-11-263-6/+11
| * | | Bump webpack from 4.26.0 to 4.26.1 in /apps/updatenotificationdependabot[bot]2018-11-262-13/+8
| |/ /
* | | Merge pull request #12662 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-11-264-6/+6
|\ \ \
| * | | Compile assetsRoeland Jago Douma2018-11-263-6/+11
| * | | Bump webpack from 4.26.0 to 4.26.1 in /apps/oauth2dependabot[bot]2018-11-262-13/+8
| |/ /
* | | Merge pull request #12661 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2018-11-268-11/+11
|\ \ \
| * | | Commpile assetsRoeland Jago Douma2018-11-267-11/+16
| * | | Bump webpack from 4.26.0 to 4.26.1 in /settingsdependabot[bot]2018-11-262-13/+8
| |/ /
* | | Merge pull request #12649 from nextcloud/make-acceptance-tests-for-comments-m...Morris Jobke2018-11-262-2/+7
|\ \ \
| * | | Wait for the comment to be added before changing to another fileDaniel Calviño Sánchez2018-11-241-0/+1
| * | | Wait for the empty content element to be shownDaniel Calviño Sánchez2018-11-241-2/+6
| | |/ | |/|
* | | Merge pull request #12632 from nextcloud/add-acceptance-tests-for-sharing-fil...Morris Jobke2018-11-2610-480/+991
|\ \ \
| * | | Rename "FilesSharingAppContext" to "PublicShareContext"Daniel Calviño Sánchez2018-11-232-3/+3
| * | | Extract locators and steps for sharing in Files app to their own contextDaniel Calviño Sánchez2018-11-233-489/+519
| * | | Extract sharing related acceptance tests to their own feature filesDaniel Calviño Sánchez2018-11-234-416/+436
| * | | Add acceptance tests for folders that can not be resharedDaniel Calviño Sánchez2018-11-232-0/+142
| * | | Add acceptance tests for resharing a folder with another userDaniel Calviño Sánchez2018-11-231-0/+52
| * | | Add acceptance test for checking that the owner can see resharesDaniel Calviño Sánchez2018-11-231-0/+25
| * | | Add acceptance test for resharing a file with another userDaniel Calviño Sánchez2018-11-234-0/+40
| * | | Add acceptance tests for sharing a folder with another userDaniel Calviño Sánchez2018-11-231-0/+59
| * | | Add acceptance tests for sharing a file with another userDaniel Calviño Sánchez2018-11-232-0/+143
* | | | Merge pull request #12647 from nextcloud/cloud-federation-versionMorris Jobke2018-11-261-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | update compatible versions for cloud federation apiRobin Appelman2018-11-241-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2018-11-2624-2/+242
* | | [tx-robot] updated from transifexNextcloud bot2018-11-2518-28/+64
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-11-24114-194/+222
* | Merge pull request #12556 from nextcloud/anonymous-options-allRobin Appelman2018-11-232-2/+2
|\ \
| * | extend anonymous options to work on every dav urlRobin Appelman2018-11-232-2/+2
| |/
* | Merge pull request #12625 from nextcloud/bump_cfaRoeland Jago Douma2018-11-231-2/+2
|\ \ | |/ |/|
| * Bump cloud federation apiRoeland Jago Douma2018-11-231-2/+2
|/
* Merge pull request #12619 from nextcloud/bump-versionsJoas Schilling2018-11-2324-68/+68
|\
| * Bump versions of server and the requirements of appsJoas Schilling2018-11-2324-68/+68
|/
* Merge pull request #12606 from nextcloud/dependabot/npm_and_yarn/settings/vue...Roeland Jago Douma2018-11-232-4/+4
|\
| * Bump vue-infinite-loading from 2.4.0 to 2.4.1 in /settingsdependabot[bot]2018-11-222-12/+12
* | Merge pull request #12607 from nextcloud/dependabot/npm_and_yarn/settings/@ba...Roeland Jago Douma2018-11-232-37/+135
|\ \
| * | Bump @babel/core from 7.1.2 to 7.1.6 in /settingsdependabot[bot]2018-11-232-37/+135