aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #17850 from ↵Joas Schilling2019-11-201-0/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/bugfix/noid/mark-spreed-as-active-on-call-urls Mark "Talk" active on /call/token URLs
| * | | Make phan happy ;)Daniel Kesselberg2019-11-191-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Mark "Talk" active on /call/token URLsJoas Schilling2019-11-121-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #18011 from nextcloud/fix/share_testsRoeland Jago Douma2019-11-2014-29/+140
|\ \ \ \ | | | | | | | | | | Fix/share tests
| * | | | Fix share testsRoeland Jago Douma2019-11-2013-28/+138
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Do pagination on the dummy group backendRoeland Jago Douma2019-11-201-1/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | / [tx-robot] updated from transifexNextcloud bot2019-11-20124-180/+358
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2019-11-19144-364/+770
| | |
* | | Merge pull request #17985 from nextcloud/enh/use_displayname_federated_shareRoeland Jago Douma2019-11-182-12/+24
|\ \ \ | | | | | | | | Use the displayname for federated notifications
| * | | Use the displayname for federated notificationsRoeland Jago Douma2019-11-182-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we have the showing this is a lot nicer. Especially on alrge isntances where the uid can be totally random. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16828 from nextcloud/feature/noid/accept-incoming-sharesRoeland Jago Douma2019-11-1819-38/+663
|\ \ \ \ | | | | | | | | | | 🔗☑️ Accept all incoming shares
| * | | | FixesRoeland Jago Douma2019-11-182-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Make sure the super share also has a valid typeJoas Schilling2019-11-121-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix "Invalid parameter number: mixed named and positional parameters"Joas Schilling2019-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Correctly use the displayname of the sharer in the notificationJoas Schilling2019-11-121-6/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | The share manager knows which provider can accept sharesJoas Schilling2019-11-122-6/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Use constants for the magic stringsJoas Schilling2019-11-122-8/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Accept existing shares on updateJoas Schilling2019-11-124-1/+83
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Only restrict loading of group and user shares for nowJoas Schilling2019-11-122-1/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add notifications for users that are added to the groupJoas Schilling2019-11-122-3/+51
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Allow to accept group sharesJoas Schilling2019-11-127-56/+230
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Notifications for group sharesJoas Schilling2019-11-121-1/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add the notifier and the API endpoint for user sharesJoas Schilling2019-11-1210-6/+232
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Respect the accepted flag for group and user sharesJoas Schilling2019-11-125-2/+67
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #17765 from nextcloud/filecache-extensionRoeland Jago Douma2019-11-1823-454/+869
|\ \ \ \ \ | | | | | | | | | | | | Upload time and Creation time
| * | | | | Fix cache movesRoeland Jago Douma2019-11-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Use dummy backend in testRoeland Jago Douma2019-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Merge remote-tracking branch 'origin/master' into filecache-extensionRoeland Jago Douma2019-11-18109-380/+699
| |\ \ \ \ \
| * | | | | | cast ctime and utimeRobin Appelman2019-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | filter out empty filecache extension valuesRobin Appelman2019-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Update autoloadersRoeland Jago Douma2019-11-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | fix folder deleteRobin Appelman2019-11-132-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | dont create empty filecache extended rowsRobin Appelman2019-11-132-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | hookup creation and upload time into davRobin Appelman2019-11-133-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | dont expose metadata etag for nowRobin Appelman2019-11-135-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | expose filecache extension data in FileInfoRobin Appelman2019-11-136-213/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | store filecache extension fieldsRobin Appelman2019-11-136-28/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | move more cache logic to querybuilderRobin Appelman2019-11-132-169/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | add count() as shortcut for count('*') in FunctionBuilderRobin Appelman2019-11-132-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | return from QueryBuilder instead of IQueryBuilderRobin Appelman2019-11-132-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this make the type hints work properly with querybuilder subclasses Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #17958 from nextcloud/docs/remove-security-mailRoeland Jago Douma2019-11-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | security@nextcloud.com is not being monitored and mails are being dro…
| * | | | | | | security@nextcloud.com is not being monitored and mails are being dropped.Daniel Kesselberg2019-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | Merge pull request #17972 from nextcloud/dependabot/npm_and_yarn/p-queue-6.2.1Roeland Jago Douma2019-11-184-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Bump p-queue from 6.2.0 to 6.2.1
| * | | | | | | Bump p-queue from 6.2.0 to 6.2.1dependabot-preview[bot]2019-11-184-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [p-queue](https://github.com/sindresorhus/p-queue) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/sindresorhus/p-queue/releases) - [Commits](https://github.com/sindresorhus/p-queue/compare/v6.2.0...v6.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | Merge pull request #17965 from nextcloud/fix/noid/strict-controller-useridblizzz2019-11-182-6/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixes a 500 without userid
| * | | | | | | Fixes a 500 without useridArthur Schiwon2019-11-162-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus cleanup of unused use statements Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #17973 from nextcloud/dependabot/npm_and_yarn/vuex-3.1.2Roeland Jago Douma2019-11-1810-44/+44
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Bump vuex from 3.1.1 to 3.1.2
| * | | | | | | Bump vuex from 3.1.1 to 3.1.2dependabot-preview[bot]2019-11-1810-44/+44
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vuex](https://github.com/vuejs/vuex) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/vuejs/vuex/releases) - [Commits](https://github.com/vuejs/vuex/compare/v3.1.1...v3.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | Merge pull request #17974 from ↵Roeland Jago Douma2019-11-1810-15/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/handlebars-4.5.2 Bump handlebars from 4.5.1 to 4.5.2
| * | | | | | | Bump handlebars from 4.5.1 to 4.5.2dependabot-preview[bot]2019-11-1710-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.1 to 4.5.2. - [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.5.1...v4.5.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>