summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18009 from nextcloud/bugfix/noid/install-with-mysql-8.0.4+Roeland Jago Douma2019-11-201-2/+2
|\ | | | | Fix installing with MySQL 8.0.4+
| * Fix installing with MySQL 8.0.4+Joas Schilling2019-11-201-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #18004 from nextcloud/enh/more_bigint_columnsRoeland Jago Douma2019-11-202-0/+8
|\ \ | | | | | | Convert more columns to bigint
| * | Convert more columns to bigintRoeland Jago Douma2019-11-202-0/+8
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #18003 from nextcloud/fix/updatecheck/nointernetRoeland Jago Douma2019-11-202-25/+70
|\ \ | |/ |/| Do not check for updates if we have no internet
| * Do not check for updates if we have no internetRoeland Jago Douma2019-11-202-25/+70
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #18031 from ↵Roeland Jago Douma2019-11-2012-42/+209
|\ | | | | | | | | nextcloud/accept-incoming-shares-in-integration-tests Accept incoming shares in integration tests
| * Accept incoming shares in integration testsDaniel Calviño Sánchez2019-11-2012-0/+167
| | | | | | | | | | | | | | | | | | Now all incoming shares need to be explicitly accepted before being able to use the shared file or get information about a reshare (although getting the information of the incoming share is possible before accepting it). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Replace direct calls to share API with specific share stepsDaniel Calviño Sánchez2019-11-205-35/+35
| | | | | | | | | | | | | | This makes possible to use steps that reference the last share, which will be needed to accept pending shares. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Remove extra spaces at the end of linesDaniel Calviño Sánchez2019-11-202-7/+7
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #17999 from nextcloud/Improves-doc-of-mail_smtpsecureRoeland Jago Douma2019-11-201-2/+2
|\ \ | | | | | | Improves doc of mail_smtpsecure
| * | Improves doc of mail_smtpsecurePierre Ozoux2019-11-191-2/+2
| | | | | | | | | | | | | | | | | | To reflect what is in the UI. Signed-off-by: pierreozoux <pierre@ozoux.net>
* | | Merge pull request #17824 from nextcloud/fix/dav/catch_forbiddenRoeland Jago Douma2019-11-201-0/+5
|\ \ \ | | | | | | | | Catch forbidden http status code
| * | | Catch forbidden http status codeRoeland Jago Douma2019-11-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you try to do something on a DAV mount (external or federated share) that is not allowed. We should not mark the storage as not available but just fail somewhat gracefully. Now by catching this and just properly returning the operation will just fail (and notify the user) which is already a lot better then marking the storage as unavailable and doing boom. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | 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>