Skip to content
This repository has been archived by the owner on Jan 19, 2021. It is now read-only.

December 2016 master merge #158

Merged
merged 55 commits into from
Dec 4, 2015
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
fcb5a5d
Merge remote-tracking branch 'OfficeDev/master' into dev
kilasuit Sep 10, 2015
c11d201
Merge remote-tracking branch 'refs/remotes/OfficeDev/dev' into dev
kilasuit Oct 27, 2015
aff1af3
Fix for #123: Add-SPOFile with Checkout option does not update existi…
artokai Nov 6, 2015
a5cfc0d
Version update for next master merge
erwinvanhunen Nov 8, 2015
7d68eeb
Merge pull request #128 from erwinvanhunen/dev
erwinvanhunen Nov 8, 2015
b5badc9
Merge https://github.com/OfficeDev/PnP-PowerShell into dev
kilasuit Nov 8, 2015
d07760c
Merge pull request #124 from artokai/dev
erwinvanhunen Nov 13, 2015
75c9d68
Small change to readme.md to include how to easily install the Module…
kilasuit Nov 13, 2015
3bf5b67
Updated to implement propertybag key for provisioning engine support
erwinvanhunen Nov 13, 2015
b832020
Merge pull request #133 from erwinvanhunen/dev
erwinvanhunen Nov 13, 2015
5a87f38
Update readme.md to include about updating the module going forward
kilasuit Nov 13, 2015
1e7f910
styling issues fix with readme.md
kilasuit Nov 13, 2015
37b7a5f
Actually fixed the styling issues with readme.md this time
kilasuit Nov 13, 2015
4ed9fd7
Included the referenced modules
kilasuit Nov 13, 2015
832d41a
Removed unneed if statement
kilasuit Nov 13, 2015
a080fa9
Renamed folder
erwinvanhunen Nov 20, 2015
1b31b0e
Merge pull request #134 from kilasuit/dev
erwinvanhunen Nov 20, 2015
b082c73
Merge branch 'dev' of https://github.com/officedev/pnp-powershell int…
erwinvanhunen Nov 20, 2015
c1d5983
Renamed Folder
erwinvanhunen Nov 20, 2015
85b9a92
Updated README.md
erwinvanhunen Nov 20, 2015
f84ee42
Updated urls
erwinvanhunen Nov 20, 2015
c3c75bf
Updated script
erwinvanhunen Nov 20, 2015
c6cb945
Merge pull request #137 from erwinvanhunen/dev
erwinvanhunen Nov 20, 2015
714b9fe
Updated documentation
erwinvanhunen Nov 21, 2015
0c9bd9d
Updated document generation
erwinvanhunen Nov 21, 2015
8683afb
Added SiteRelative optional parameters
erwinvanhunen Nov 21, 2015
310411d
Merge pull request #138 from erwinvanhunen/dev
erwinvanhunen Nov 21, 2015
3b27026
Updated documentation
erwinvanhunen Nov 21, 2015
2f23448
Updated documentation
erwinvanhunen Nov 21, 2015
0c2b71c
Fixed issue in duplicate documentation creation
erwinvanhunen Nov 21, 2015
68f367f
Merge pull request #139 from erwinvanhunen/dev
erwinvanhunen Nov 21, 2015
c16e2ab
Removed Chocolatey references as we are using the PowerShell Gallery now
erwinvanhunen Nov 21, 2015
3d4dfbe
Merge pull request #140 from erwinvanhunen/dev
erwinvanhunen Nov 21, 2015
9df8d5e
small cleanup
erwinvanhunen Nov 21, 2015
c4b1e1a
Merge pull request #141 from erwinvanhunen/dev
erwinvanhunen Nov 21, 2015
35da5dd
Cleaned up non-used references
erwinvanhunen Nov 21, 2015
b34b1f7
Removed unused reference assemblies folder
erwinvanhunen Nov 21, 2015
d0a1cce
Merge pull request #142 from erwinvanhunen/dev
erwinvanhunen Nov 21, 2015
4107aba
Implemented PnP Monitored Scope
erwinvanhunen Nov 21, 2015
323739e
Updated changelog
erwinvanhunen Nov 21, 2015
883f1dc
Added Get-SPOTheme Documentation
erwinvanhunen Nov 21, 2015
33bb584
Merge pull request #143 from erwinvanhunen/dev
erwinvanhunen Nov 21, 2015
3fb115f
Small update
erwinvanhunen Nov 22, 2015
dca6e98
Merge pull request #144 from erwinvanhunen/dev
erwinvanhunen Nov 22, 2015
061f0a4
Fix typo
Nov 25, 2015
8fbe53f
Improve formatting
Nov 25, 2015
0597b83
Merge pull request #147 from pascalberger/ReadmeTypo
VesaJuvonen Nov 27, 2015
6c198ac
Fix for issue #148
Laskewitz Nov 30, 2015
d1b19a3
Merge pull request #150 from Laskewitz/dev
erwinvanhunen Nov 30, 2015
05c6d54
Reverted use of PnPMonitoredScope
erwinvanhunen Dec 1, 2015
456b0fc
Merge pull request #151 from erwinvanhunen/dev
erwinvanhunen Dec 1, 2015
9a9698d
Added MIT license based on the MS policy
VesaJuvonen Dec 2, 2015
6e0c47a
Merge pull request #153 from VesaJuvonen/dev
VesaJuvonen Dec 2, 2015
6ecaf27
Changed to MIT License
erwinvanhunen Dec 2, 2015
dbd0488
Merge pull request #154 from erwinvanhunen/dev
erwinvanhunen Dec 2, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix for #123: Add-SPOFile with Checkout option does not update existi…
…ng files in a library which has the Require Checkout -option set
  • Loading branch information
artokai committed Nov 6, 2015
commit aff1af3a72a5c9e4bb509484072f3b33a449b2bd
1 change: 1 addition & 0 deletions Commands/Web/AddFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ protected override void ExecuteCmdlet()
try
{
var existingFile = SelectedWeb.GetFileByServerRelativeUrl(fileUrl);
existingFile.EnsureProperty(f => f.Exists);
if (existingFile.Exists)
{
SelectedWeb.CheckOutFile(fileUrl);
Expand Down