Commit Graph

18122 Commits

Author SHA1 Message Date
Roeland Jago Douma f7ecec855b
Rotate token
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 09:24:17 +02:00
Roeland Jago Douma c28b25c4f0
Authenticate the clients on requesting a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 09:24:17 +02:00
Roeland Jago Douma 4e3aef22a1
Fail if the response type is not properly set
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 09:24:17 +02:00
Roeland Jago Douma 49795d2006
Set OAuth token expiration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 09:24:17 +02:00
Roeland Jago Douma d4464cc3ef
Merge pull request #9515 from nextcloud/bugfix/noid/reset_session_when_auth_against_protected_share
Regenerate session id after public share auth
2018-05-22 09:21:39 +02:00
Nextcloud bot 0d90c5ebc4
[tx-robot] updated from transifex 2018-05-22 00:13:31 +00:00
Nextcloud bot ca089b9412
[tx-robot] updated from transifex 2018-05-20 00:13:24 +00:00
Nextcloud bot e2f1f7b8f5
[tx-robot] updated from transifex 2018-05-19 00:13:41 +00:00
Nextcloud bot 514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Roeland Jago Douma d6d0e60136
Regenerate session id after public share auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-17 22:07:20 +02:00
Roeland Jago Douma 9236c20a28
Merge pull request #9437 from nextcloud/feature/noid/imprint
allow to specify a link to a legal notice
2018-05-17 21:16:03 +02:00
Morris Jobke 63d5491a73
Merge pull request #9503 from nextcloud/bugfix/noid/theming-mime-check
Check mime type properly in theming app
2018-05-17 15:48:44 +02:00
Julius Härtl 5b3ca8f7c6
Add Content-Disposition header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-17 12:21:57 +02:00
Julius Härtl 2bf51c7b9e
Properly check mime type of the uploaded file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-17 11:46:01 +02:00
Nextcloud bot ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Arthur Schiwon feff9f5bd1
Use link not address in labels for URLs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-16 00:56:08 +02:00
Roeland Jago Douma 39bb9c06d1
Delete the previews when a version is restored
Fixes #9469

When a version of a file is restored the previews are no longer valid.
Thus we should remove them so they are regenerated.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 19:58:19 +02:00
Morris Jobke 0dcb6b2675
Merge pull request #9420 from nextcloud/feature/5263/cleanup_previes
Cleanup previews in the background
2018-05-14 14:28:55 +02:00
Morris Jobke d2cc48c6dd
Merge pull request #9446 from nextcloud/feature/9416/fileid_trashbin_dav_endpoint
Support fileid propfind on trash endpoint
2018-05-14 14:09:28 +02:00
Roeland Jago Douma 362e6b2903
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-14 13:30:22 +02:00
Morris Jobke 95592ff65c
Merge pull request #9464 from nextcloud/fix/noid/version_expiration_DI
Use more magic DI in files_versions
2018-05-14 09:34:18 +02:00
Nextcloud bot 05df524472
[tx-robot] updated from transifex 2018-05-13 00:12:56 +00:00
Roeland Jago Douma d341a96701
Merge pull request #9288 from GitHubUser4234/ldap_password_renew_nc13fix
Ldap password renewal fixes for NC13
2018-05-12 10:46:57 +02:00
Nextcloud bot 5fcb3dd1dc
[tx-robot] updated from transifex 2018-05-12 00:13:00 +00:00
Roeland Jago Douma cd53498256
Use more magic DI in files_versions
There is no need to register this. The system can figure out by itself
what it needs to do :)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-11 22:25:07 +02:00
Roeland Jago Douma 5eb72a8a57
Support fileid propfind on trash endpoint
Fixes #9416

In order to support previews on mobile clients they will need the fileid
of files in the trashbin.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-11 20:45:03 +02:00
Roeland Jago Douma 8d17d7f6cd
Merge pull request #9447 from nextcloud/feature/noid/trashbin_propfind_oc_size
Trashbin propfind respond to oc:size
2018-05-11 20:24:38 +02:00
Arthur Schiwon 84ab102146
fix undo for url-typed inputs
and minor adjustments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-11 15:57:32 +02:00
Arthur Schiwon 850e2256f3
fix tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-11 15:37:24 +02:00
Nextcloud bot 4b1c315dca
[tx-robot] updated from transifex 2018-05-11 00:13:00 +00:00
Roeland Jago Douma 58219638d7
Trashbin propfind respond to oc:size
In order to display the total size of folders also in the clients (and
web) we should return the oc:size.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-10 16:12:33 +02:00
Roeland Jago Douma 58e4ddd638
Merge pull request #9360 from GitHubUser4234/ldap_password_renew_invarg_fix
Fix "Invalid argument supplied for foreach()"
2018-05-10 09:32:07 +02:00
Roeland Jago Douma 48034bdc4a
Merge pull request #9427 from nextcloud/bugfix/noid/no_listing_if_not_in_debug_trash_version
If not in debug disable principal listing
2018-05-10 09:31:19 +02:00
Nextcloud bot 01c21601e8
[tx-robot] updated from transifex 2018-05-10 00:13:09 +00:00
Arthur Schiwon 62f1156a56
allow to specify a link to a legal notice
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-09 15:52:41 +02:00
Roger Szabo ced15ab756 adjust unit tests for \"Invalid argument supplied for foreach()\" fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-09 20:24:41 +08:00
Morris Jobke 57ea462474
Merge pull request #9415 from nextcloud/feature/noid/trashbin_dav_deletion_time
Propfind for deletion time of trash files
2018-05-09 08:40:53 +02:00
Nextcloud bot 412925e71d
[tx-robot] updated from transifex 2018-05-09 00:11:27 +00:00
Roeland Jago Douma 17f1653ceb
If not in debug disable principal listing
Trashbin and Version should have the same behaviour as the other
collections.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-08 20:52:14 +02:00
Roeland Jago Douma 21d4ce926e
Propfind for deletion time of trash files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-08 09:08:43 +02:00
Nextcloud bot 9fe95e8a7c
[tx-robot] updated from transifex 2018-05-08 00:11:34 +00:00
Morris Jobke b348431bce
Merge pull request #8842 from lanxenet/patch-1
fix(AmazonS3):  fix loop $result['Contents'] error
2018-05-07 18:41:39 +02:00
blizzz ec0623045b
Merge pull request #9393 from nextcloud/bugfix/noid/fix-workflow-rules
Fix workflow rules
2018-05-07 14:57:55 +02:00
Morris Jobke d161d4473e
Merge pull request #9029 from nextcloud/settings-restructure
Restructure server settings
2018-05-07 12:29:53 +02:00
Julius Härtl 951ac518e1
Fix jsunit tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-07 11:19:50 +02:00
Nextcloud bot 94e3bdf703
[tx-robot] updated from transifex 2018-05-07 00:11:36 +00:00
Nextcloud bot cc09226564
[tx-robot] updated from transifex 2018-05-06 00:11:39 +00:00
Nextcloud bot 1ce3a618a8
[tx-robot] updated from transifex 2018-05-05 00:11:47 +00:00
Joas Schilling fc582d6253
Do not error when the tag does not exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 16:11:56 +02:00
Joas Schilling 2dd8e90a9f
Reset the value when changing the check class (because it might be invalid)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 16:11:24 +02:00
Joas Schilling a61fa70bcd
Revert back to tabs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 15:57:06 +02:00
Joas Schilling bd9209b316
Fix "data is undefined" by adjusting the name of the parameter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-04 15:54:54 +02:00
Nextcloud bot bd2aede6a3
[tx-robot] updated from transifex 2018-05-04 00:11:52 +00:00
Morris Jobke dc5c4b2e1f
Merge pull request #9353 from nextcloud/feature/4724/versions_dav
Add versions DAV endpoint
2018-05-03 16:52:32 +02:00
Morris Jobke 7cb467b476
Merge pull request #9355 from nextcloud/dav-upload-lock
only allow a single concurrent dav write to a file
2018-05-03 16:28:39 +02:00
Julius Härtl 94528ad2be
Move quota icon to core
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-03 10:32:16 +02:00
Julius Härtl ea8e80c20b
Adjust updatenotification app settings section/priority
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-03 08:58:25 +02:00
Julius Härtl 35cb529df3
Fix settings tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-03 08:58:25 +02:00
Julius Härtl 2b840250c3
Move documentation link in relation to the heading
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-03 08:58:24 +02:00
Julius Härtl cea4c9d000
Move files settings to main server settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-03 08:58:23 +02:00
Julius Härtl a77efe0a55
Move dav settings to main server settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-03 08:58:22 +02:00
Nextcloud bot 346e46af49
[tx-robot] updated from transifex 2018-05-03 00:11:58 +00:00
Morris Jobke 2aa108000c
Merge pull request #9293 from nextcloud/feature/9166/custom-auditlogfile
option for a seperate audit log file
2018-05-02 16:16:28 +02:00
Morris Jobke a56ec1062a
Merge pull request #9346 from nextcloud/techdep/noid/needsPartFile_to_storage
Use an actual function of the storage to determine needsPartFile
2018-05-02 16:03:31 +02:00
Roger Szabo 856164e578 Fix "Invalid argument supplied for foreach()"
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-02 18:17:21 +08:00
Roeland Jago Douma ea5393e9f8
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:20:20 +02:00
Roeland Jago Douma 953691abb2
External mount does not get DELETE and UPDATE if readonly
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:18:56 +02:00
Roeland Jago Douma db96b0bb0b
Make it possible to make external storages read only
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:18:56 +02:00
Roeland Jago Douma 055a003661
Use an actual function of the storage to determine needsPartFile
We have a function for it so better to override that. Also because other
codes that might check this should get the right value.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:02:36 +02:00
Morris Jobke f212c692ac
Merge pull request #9178 from nextcloud/feature/9142/directdownload
Add directdownload endpoint
2018-05-01 14:54:44 +02:00
Roeland Jago Douma 7f194be3ab
Merge pull request #9202 from nextcloud/feature/1332/trashbin_dav
Trashbin endpoint in DAV
2018-05-01 14:24:38 +02:00
Roeland Jago Douma 5401732cd2
Allow to read get old versions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 08:38:59 +02:00
Roeland Jago Douma dd47ebb062
Add rollback
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 08:38:59 +02:00
Roeland Jago Douma d40afac1b9
Add version collection to DAV
listed as
versions/<username>/versions/<file id>/<timastamp>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 08:38:59 +02:00
Nextcloud bot c8cb42fd26
[tx-robot] updated from transifex 2018-05-01 00:11:52 +00:00
Nextcloud bot b87b0689c5
[tx-robot] updated from transifex 2018-04-30 00:11:48 +00:00
Nextcloud bot a546dcfcb3
[tx-robot] updated from transifex 2018-04-29 00:11:47 +00:00
Nextcloud bot 6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Morris Jobke d8350c69ef
Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logic
Do not add sharePermission logic in JS
2018-04-27 14:01:40 +02:00
Roger Szabo 8637b90e15 unbound cloned connection fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-04-27 17:29:15 +08:00
Morris Jobke 7da1e968f9
Merge pull request #9319 from nextcloud/rakekniven-patch-1
Fixed typo
2018-04-27 09:15:21 +02:00
Nextcloud bot 9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Arthur Schiwon aff5fe68b3
use SystemConfig, less dependencies, and not publicly needed
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 23:54:11 +02:00
rakekniven ace2063f21
Fixed typo 2018-04-26 18:12:21 +02:00
Roeland Jago Douma d379770cf2
Fix sharedfilelistSpec.js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 16:34:24 +02:00
Roeland Jago Douma 0771dad57f
Do not add sharePermission logic in JS
We have a dedicated dav property. We should do all the magic in 1 place.
Not several.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 12:14:37 +02:00
Arthur Schiwon b841a477c6
log to $datadir/audit.log by default and add rotation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 12:10:53 +02:00
Arthur Schiwon ab7a4b8693
fix dav test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 12:10:53 +02:00
Arthur Schiwon cfc3ab0119
offer API to create own File log. admin_audit makes use of it
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 12:10:52 +02:00
Arthur Schiwon 5fbf184134
destaticfy Log classes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 12:00:06 +02:00
Robin Appelman dd1b0799a4
only allow a single concurrent dav write to a file
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-26 11:16:51 +02:00
Arthur Schiwon 38a90130ce
move log constants to ILogger
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +02:00
Roeland Jago Douma 1c75ddac45
Improve the directContoller
* Tests
* No directdownload from storage yet (as it is not tested at all)
* No direct links for folders

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:38 +02:00
Roeland Jago Douma d5222d68f0
Add tests for DirectFile and DirectHome
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 392337fa13
Throttle requests to unknown tokens
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma b6c58e75b7
Add backgroundjob to cleanup expired direct links
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 042340ccf6
Check if a direct link is expired
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 6a385dd20b
Add directDownload support of storage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 164d998856
No listing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma b3e7865d9b
Dav endpoint returns proper data
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 5c6d3b4f41
Request a direct link
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma f984664bee
First step of DAV endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma 9ab5b6a4f1
Add DB mapping
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Roeland Jago Douma b0c801c764
Add directdownload table
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 10:35:37 +02:00
Nextcloud bot 12c5db9032
[tx-robot] updated from transifex 2018-04-26 00:12:10 +00:00
Roeland Jago Douma c625fc5931
Add folder for trashbin
The trashbin home now contains 2 entries restore and trash.

Made all files strict. Added more types.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma dadc740db5
Use getType to determine type of entry
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma d5937e0fd6
Add propfind properties to trashbin
* get original filename (without the weird timestamp)
* get original location

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma cb617c4949
Add special restore folder
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma f7ca6149d6
Emptry trashbin
A delete on a users trashbin will empty it (the trashbin won't be
deleted of course)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma 09940bcde6
List trashbin in DAV
First steps for #1332

* Add a new DAV collection
* List all files in the trashbin for this user
* Deleting files from trashbin
* Get files from trashbin (just read)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Morris Jobke 9c64a203e3
Merge pull request #9256 from nextcloud/fed-sharing-improvements
improve error reporting and move format parameter to the options
2018-04-25 15:49:30 +02:00
Bjoern Schiessle 0e0cfa0fa1
improve error reporting and move format parameter to the options
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-25 13:53:56 +02:00
Morris Jobke 5a4a0add3c
Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-api
Migrate groups fetch to ocs api
2018-04-25 13:45:35 +02:00
Morris Jobke c907b68842
Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_api
Make ShareesAPIController strict
2018-04-25 11:53:52 +02:00
Roger Szabo aa85418c68 Remove unneeded semicolon and parentheses
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-04-25 15:54:33 +08:00
Roger Szabo cc40917e5e css indent alignment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-04-25 14:47:16 +08:00
Morris Jobke b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced
Add option for header logo and favicon in theming app
2018-04-25 08:47:14 +02:00
John Molakvoæ (skjnldsv) 8c845be11c
Workflow engine to ocs api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-25 07:47:16 +02:00
Nextcloud bot 3e14f21ae7
[tx-robot] updated from transifex 2018-04-25 00:11:50 +00:00
Roeland Jago Douma 0dc019370d
Merge pull request #9248 from nextcloud/fix-files-ellipsis
Fix ellipsis in filename column
2018-04-24 20:36:41 +02:00
Joas Schilling 09398397b3
Merge pull request #9282 from nextcloud/bugfix/9279/scrit_type_share_api
Make the ShareAPIController strict
2018-04-24 11:57:52 +02:00
Roger Szabo 571b337a5e adjust css to nc13 core changes
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-04-24 15:53:48 +08:00
Roger Szabo 15fb3bb73a remove reset password link
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-04-24 15:47:31 +08:00
Roeland Jago Douma 4d5a2cce8d
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-24 08:07:25 +02:00
Nextcloud bot 9339c7d20f
[tx-robot] updated from transifex 2018-04-24 00:11:53 +00:00
Roeland Jago Douma 3b3ff39431
Make ShareesAPIController strict
Fixes #9279

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-23 22:05:21 +02:00
Roeland Jago Douma 3b34a77c58
Make the ShareAPIController strict
Fixes #9279

With types we can force php to not cast a full nummeric user to an int.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-23 20:31:57 +02:00
Morris Jobke 83b0ce0955
Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccess
Access needs UserManager, missed to add in #8833
2018-04-23 17:49:07 +02:00
Arthur Schiwon ed5f53bd49
Access needs UserManager, missed to add in #8833
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-23 15:58:50 +02:00
Morris Jobke 093cd01ac2
Fix DI for federated file sharing controller
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 13:49:28 +02:00
Roeland Jago Douma 3ff041f86d
Merge pull request #9245 from nextcloud/fix-race-condition-when-preparing-upload-folder
Fix race condition when preparing upload folder
2018-04-23 08:50:16 +02:00
Roeland Jago Douma a80fcf177b
Merge pull request #9255 from nextcloud/less-deprecated-calls
Less deprecated calls to OCP\Util::writeLog
2018-04-23 08:04:50 +02:00
Nextcloud bot a74fbe78a7
[tx-robot] updated from transifex 2018-04-23 00:11:49 +00:00
Julius Härtl cbdaa8b7ce
Add min-width to trick the table width calculation in safari
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-22 23:09:15 +02:00
Morris Jobke dd34cb7540
Less deprecated calls to OCP\Util::writeLog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-22 20:41:49 +02:00
Daniel Calviño Sánchez 375a55b0ad
Fix race condition when preparing upload folder
Before any upload is submitted the upload is registered in a list of
known uploads; this is needed to retrieve the upload object at several
points of the upload process. When a chunked upload is submitted first a
directory to upload all the chunks is created and, once that is done,
the chunks are sent; in order to send a chunk the upload object needs to
be retrieved from the list of known uploads.

When all the active uploads were finished the list of known uploads was
cleared. However, an upload is not active until it actually starts
sending the data, so while waiting for the upload directory to be
created the upload is already in the list of known uploads yet not
active. Due to all this, if the active uploads finished while another
pending upload was waiting for the upload directory to be created that
pending upload would be removed from the list of known uploads too, and
once the directory was created and thus the chunks were sent a field of
a null upload object would be accessed thus causing a failure.

Instead of removing all the known uploads at once when the active
uploads finish now each upload is explicitly removed when it finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-22 20:38:11 +02:00
Nextcloud bot 74b5ab8d39
[tx-robot] updated from transifex 2018-04-22 00:11:51 +00:00
Nextcloud bot 6b5132502e
[tx-robot] updated from transifex 2018-04-21 00:11:39 +00:00
Nextcloud bot 8748e636f6
[tx-robot] updated from transifex 2018-04-20 00:12:00 +00:00
Julius Härtl d771f65911
Add more tests for ImageManager
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:40 +02:00
Julius Härtl b385f1c7d5
Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:40 +02:00
Julius Härtl 7f9dabd984
Make sure the custom favicon is used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:40 +02:00
Julius Härtl 39f44e1452
Add typehints
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:40 +02:00
Julius Härtl daadc1c892
Fix background color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:39 +02:00
Julius Härtl 5a5c125b23
Return value
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:39 +02:00
Julius Härtl 3ad2768909
Remove unneeded preview image handling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:39 +02:00
Julius Härtl d8045966de
Fix undo preview and remove duplicate code
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:39 +02:00
Julius Härtl d8b57924fb
Add advanced theming options to frontend
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:39 +02:00
Julius Härtl ee44dec0ac
Use generic image upload in theming JS
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:38 +02:00