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

50788 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
2959e15c7a
Fix "Cannot add a NOT NULL column with default value NULL" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-26 15:51:55 +02:00
Roeland Jago Douma
cc6874df19
Merge pull request #17264 from nextcloud/move-from-storage-wrappers 
handle moveFromStorage within the same storage even when storage wrap…
 2019-09-26 15:48:59 +02:00
Roeland Jago Douma
e387189d4a
Merge pull request #14913 from nextcloud/bugfix/6954/scan-external-s3 
Fix directory detection for s3
 2019-09-26 11:39:17 +02:00
Roeland Jago Douma
1cb1b132ca
Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-comment 
Fix user with id 0 to be able to comment
 2019-09-26 11:30:56 +02:00
Roeland Jago Douma
6ac67011f4
Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-delete 
dont delete cache entries if deleting an object from object store failed
 2019-09-26 11:24:02 +02:00
Joas Schilling
472ce5cbce
Merge pull request #17181 from nextcloud/feature/noid/talk-attachment 
Add talk-attachment as a rich object type
 2019-09-26 09:27:03 +02:00
Nextcloud bot
6217b45e26
[tx-robot] updated from transifex 2019-09-26 02:14:57 +00:00
Robin Appelman
35f317df7b
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage 
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 19:17:06 +02:00
Robin Appelman
733d4b6cca
dont delete cache entries if deleting an object from object store failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 18:09:45 +02:00
Robin Appelman
bc160992d3
Update apps/files_external/lib/Lib/Backend/SMB.php 
Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-25 14:59:44 +02:00
Robin Appelman
194edfc64e
add (hidden) option to configure smb timeout 
hidden from ui to prevent clutter

```occ files_external:config <mount> timeout 30```

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-25 13:30:40 +02:00
Roeland Jago Douma
49f1ed62a2
Merge pull request #17254 from nextcloud/fix/double_escape 
Properly import DOMPurify in l10n.js
 2019-09-25 11:59:31 +02:00
John Molakvoæ
7351889ef6
Fix spaces being collapsed in move dialog (#17240) 
Fix spaces being collapsed in move dialog
 2019-09-25 11:23:34 +02:00
Roeland Jago Douma
d19ed224c1
Properly import DOMPurify in l10n.js 
Fixes a bunch of warning in the console.
And fixed the doube escaping.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-25 10:57:00 +02:00
Roeland Jago Douma
e26284df9b
Merge pull request #17253 from nextcloud/fix/apptoken_creation 
Fix apptoken creation
 2019-09-25 10:53:58 +02:00
Roeland Jago Douma
17a6bb95c2
Fix apptoken creation 
Seems there was a small bug in #15936
This inverts the check and add the property

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-25 10:12:23 +02:00
Joas Schilling
e4b36f4f47
Fix user with id 0 to be able to comment 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-25 09:07:07 +02:00
Nextcloud bot
c99fcd63f8
[tx-robot] updated from transifex 2019-09-25 02:14:47 +00:00
Roeland Jago Douma
88b2d8f220
Merge pull request #16641 from nextcloud/enh/files_additionalscripts 
Files additionalscripts to real event
 2019-09-24 21:56:50 +02:00
Nextcloud bot
61d22ff6cf
[tx-robot] updated from transifex 2019-09-24 02:14:41 +00:00
Gary Kim
4211c50dba
Fix spaces being collapsed in move dialog 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-09-24 01:54:42 +08:00
Daniel Kesselberg
72d22a4828
Use local variable for directory name 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-23 14:03:41 +02:00
Daniel Kesselberg
75b8944061
Don't strip path from directory prefix 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-23 14:03:41 +02:00
Daniel Kesselberg
80340a8d46
Fill directory cache from opendir 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-23 14:03:41 +02:00
Daniel Kesselberg
12863e0d24
Change visibility to private (from protected) 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-23 14:03:40 +02:00
Daniel Kesselberg
963d35c78c
Rename $location to $path 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-23 14:03:40 +02:00
Daniel Kesselberg
010473ca1f
Add method to check if directory exists 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-23 14:03:40 +02:00
Roeland Jago Douma
5694a04b70
Move over comments to the new event 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-23 10:09:58 +02:00
Roeland Jago Douma
606b4d5bf3
Add new LoadAdditionalScriptsEvent 
This adds a new event that is in the new style of event dispatching.
This should allow more lazy loading and better sepeartion of concerns

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-23 10:09:57 +02:00
Roeland Jago Douma
48a00b88e1
Merge pull request #17163 from nextcloud/bugfix/noid/print-error-on-data-dir-error 
Print error on data dir error
 2019-09-23 10:08:58 +02:00
Roeland Jago Douma
a26c5b218c
Merge pull request #17232 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.2.1 
Bump handlebars from 4.2.0 to 4.2.1 in /build
 2019-09-23 10:04:13 +02:00
Roeland Jago Douma
ecc71e86ae
Merge pull request #17234 from nextcloud/dependabot/npm_and_yarn/dompurify-2.0.1 
Bump dompurify from 2.0.0 to 2.0.1
 2019-09-23 10:03:19 +02:00
dependabot-preview[bot]
55ca259617 Bump dompurify from 2.0.0 to 2.0.1 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.0.0...2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-23 05:44:50 +00:00
dependabot-preview[bot]
086e59a0df
Bump handlebars from 4.2.0 to 4.2.1 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.2.1/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-22 17:59:05 +00:00
Roeland Jago Douma
2025cfe7d1
Merge pull request #17233 from nextcloud/dependabot/npm_and_yarn/handlebars-4.2.1 
Bump handlebars from 4.2.0 to 4.2.1
 2019-09-22 19:57:21 +02:00
dependabot-preview[bot]
0a24da76eb Bump handlebars from 4.2.0 to 4.2.1 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.2.1/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-09-22 10:57:27 +00:00
Roeland Jago Douma
af575fdeae
Merge pull request #17235 from nextcloud/dependabot/npm_and_yarn/webpack-cli-3.3.9 
Bump webpack-cli from 3.3.8 to 3.3.9
 2019-09-22 12:55:10 +02:00
Nextcloud bot
dddf509806
[tx-robot] updated from transifex 2019-09-22 02:15:36 +00:00
dependabot-preview[bot]
2f59fde746
Bump webpack-cli from 3.3.8 to 3.3.9 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.8 to 3.3.9.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.9/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.8...v3.3.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-22 01:14:22 +00:00
Marco Ambrosini
cde1c8b9a3 Bring the default font size up to 15px 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
 2019-09-21 20:47:46 +02:00
Nextcloud bot
a76e1a9596
[tx-robot] updated from transifex 2019-09-21 02:14:49 +00:00
Nextcloud bot
9313783a43
[tx-robot] updated from transifex 2019-09-20 02:15:04 +00:00
Roeland Jago Douma
505fc0e1c2
Merge pull request #17017 from ritsute/fix/css-actions.creatable 
fix "create folder" icon overlaying home icon
 2019-09-19 21:36:37 +02:00
Roeland Jago Douma
b2aec1d816
Merge pull request #17206 from nextcloud/logger-catch-exceptions 
catch exceptions that occur during logging
 2019-09-19 18:33:45 +02:00
Joas Schilling
f750193920
Merge pull request #17207 from nextcloud/fix/federated-file-sharing-l10n 
Fix l10n in federated file sharing
 2019-09-19 15:27:19 +02:00
Robin Appelman
2943c18548
catch exceptions that occur during logging 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-19 13:39:40 +02:00
Christoph Wurst
a5869be60f Fix l10n in federated file sharing 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-09-19 12:57:45 +02:00
Nextcloud bot
ce10683944
[tx-robot] updated from transifex 2019-09-19 02:15:38 +00:00
Roeland Jago Douma
3a9a4f648f
Merge pull request #17201 from nextcloud/fix/tiny_authentication_bug_mostly_affecting_french_people 
Use the actual password to update the tokens
 2019-09-18 22:52:53 +02:00
Roeland Jago Douma
210a0554a2
Use the actual password to update the tokens 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-09-18 19:50:58 +02:00