Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Downstream 2016-06-09 #31

Merged
merged 82 commits into from
Jun 9, 2016
Merged

Downstream 2016-06-09 #31

merged 82 commits into from
Jun 9, 2016

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jun 9, 2016

Today's downstream from ownCloud master

SergioBertolinSG and others added 30 commits May 31, 2016 10:41
@SergioBertolinSG @rullzer
Added tests about overwriting files and folders as recipient
c6a5a43
@SergioBertolinSG @rullzer
add overwriting using chunking but failing
a626aa2
@SergioBertolinSG @rullzer
userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded
f2bf75d
@SergioBertolinSG @rullzer
Added same test using old chunking
dc05f97
@SergioBertolinSG @rullzer
Added another case about overwriting folder using old chunking
a716740
@SergioBertolinSG @rullzer
Get a range from several chunks
118050d
@blizzz @icewind1991
implement specific rename handling for SMB
c913226
@icewind1991
allow deleting "ghost files" trough the View and Node api
63408fa
@icewind1991
return success when deleting ghost files
14f96f8
@icewind1991
Fix warnings when trying to get mtime of non existing files
6bc8305
@icewind1991
add test for deleting ghost files over dav
3bd5073
@mmattel
.htaccess update making two rules non-capturing
1059315
@nickvergessen
Do not allow to store boolean configs, they behave unexpected on post…
911fd3e 
…gres
@davitol
Fix Decrypt message via occ
eaeb5d6
@davitol
Comments fixed
f9b3865
@DeepDiver1975
Fix checkMove() implementation for dav v2 - fixes #24776 (#24971)
371a07e
@icewind1991 @DeepDiver1975
handle path not being set in shared cache (#24993)
7a0254b
@DeepDiver1975
Remove background from curved logo (#24980)
6256bbd
[tx-robot] updated from transifex
f28f6ad
@ChristophWurst
do not generate device token if 2FA is enable for user
8f7a4aa
@nickvergessen
Allow to decrypt user '0' files only
d4ba982
Merge pull request #24813 from owncloud/delete-ghost-files
bf917d7 
allow deleting "ghost files" trough the View and Node api
@SergioBertolinSG
Fixed reviews
67c9e59
@butonic
decrease initial users to load to 50
2989584 
Prevents timeouts on the initial loading of users. proper fix will be in owncloud/core#10994
Workaround for owncloud/core#24734
Merge pull request #23845 from owncloud/smb-rename
46fe2dd 
implement specific rename handling for SMB
@nickvergessen
Improve the UX for "not found" perma links
77db6d3
@icewind1991
dissalow symlinks in local storages that point outside the datadir
7b1b723
@icewind1991
Ignore forbidden files while scanning
73547f2
@icewind1991
Better handling of forbidden files in dav
f119769
@icewind1991
don't update storage mtime if we can't get the modified date
6822689
@blizzz blizzz added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 9, 2016
@blizzz
Downstream 2016-06-09
a636e4f 
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
@blizzz blizzz force-pushed the downstream-160609 branch from 9d3183d to a636e4f Compare June 9, 2016 16:45
@blizzz blizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 9, 2016
@blizzz
Copy link
Member Author

blizzz commented Jun 9, 2016

Done. Locally, you can test with following the merge steps as described under command line instructions and afterwards run a git pull upstream master (prerequisite: have the "upstream" remote configure, see comment above). It's either clean like

From https://github.com/owncloud/core
 * branch            master     -> FETCH_HEAD
Already up-to-date.

or if new stuff was merged over there only that will show up. → Proof that this approach works now.

@LukasReschke
Copy link
Member

👍

@blizzz
Copy link
Member Author

blizzz commented Jun 9, 2016

@MorrisJobke gave verbal 👍

@blizzz blizzz merged commit 5a0dc1b into master Jun 9, 2016
@blizzz blizzz deleted the downstream-160609 branch June 9, 2016 18:39
@Florz Florz mentioned this pull request Dec 23, 2016
Closed
@AntoineVe AntoineVe mentioned this pull request Jan 25, 2017
Closed
@OrpheeGT OrpheeGT mentioned this pull request Aug 16, 2017
Closed
@DarkAxi0m DarkAxi0m mentioned this pull request Dec 15, 2017
Closed
@Villard Villard mentioned this pull request Aug 16, 2018
Closed
@dnsinformatic dnsinformatic mentioned this pull request Aug 23, 2018
Closed
@Gooberpatrol66 Gooberpatrol66 mentioned this pull request Sep 6, 2018
Closed
@despens despens mentioned this pull request Apr 20, 2019
Closed
@andrewborell andrewborell mentioned this pull request Sep 4, 2019
Closed
@stoamandl stoamandl mentioned this pull request Mar 6, 2020
Closed
@jasysadmin jasysadmin mentioned this pull request Apr 11, 2021
Closed
@skjnldsv skjnldsv mentioned this pull request Jul 23, 2021
Merged
@cyberpower678 cyberpower678 mentioned this pull request Sep 28, 2021
Closed
@kinimodmeyer kinimodmeyer mentioned this pull request Oct 1, 2021
Closed
@doc75 doc75 mentioned this pull request Feb 5, 2022
Closed
8 tasks
@Bevito Bevito mentioned this pull request Oct 12, 2022
Closed
9 tasks
@soccerdmon11 soccerdmon11 mentioned this pull request Feb 8, 2023
Open
9 tasks
@OneTwoBarbecue OneTwoBarbecue mentioned this pull request Apr 8, 2023
Closed
9 tasks
@adrhc adrhc mentioned this pull request Sep 17, 2024
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Milestone
Nextcloud 10.0
Development

Successfully merging this pull request may close these issues.