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

Commit

Permalink
Migration to UMCO
Browse files Browse the repository at this point in the history
- Updated the GitHub repo URL (in various files)
- Updated API keys in appveyor config
- Updated copyright and credits
- Removed the Ditto-specific private MyGet feed (we should be promoting the Umbraco Community feed)
  • Loading branch information
leekelleher committed Jan 24, 2018
1 parent 391cd1c commit e0ab92a
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 29 deletions.
3 changes: 2 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright © 2014 Umbrella Inc, Our Umbraco and other contributors
Copyright © 2018 UMCO, Our Umbraco and other contributors
Copyright © 2014 Umbrella Inc

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<img height="100" src="docs/assets/img/ditto.png" style="margin-bottom: 20px" alt="Ditto logo" title="Ditto">

[![Build status](https://img.shields.io/appveyor/ci/leekelleher/umbraco-ditto.svg)](https://ci.appveyor.com/project/leekelleher/umbraco-ditto)
[![Build status](https://img.shields.io/appveyor/ci/UMCO/umbraco-ditto.svg)](https://ci.appveyor.com/project/UMCO/umbraco-ditto)
[![Documentation Status](https://readthedocs.org/projects/umbraco-ditto/badge/?version=latest)](https://readthedocs.org/projects/umbraco-ditto/?badge=latest)
[![NuGet release](https://img.shields.io/nuget/v/Our.Umbraco.Ditto.svg)](https://www.nuget.org/packages/Our.Umbraco.Ditto)
[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/developer-tools/ditto)
Expand Down Expand Up @@ -40,25 +40,26 @@ Anyone and everyone is welcome to contribute. Please take a moment to review the
Have a question?

* [Ditto Forum](http://our.umbraco.org/projects/developer-tools/ditto/ditto-feedback/) on Our Umbraco
* [Raise an issue](https://github.com/leekelleher/umbraco-ditto/issues) on GitHub
* [Raise an issue](https://github.com/umco/umbraco-ditto/issues) on GitHub


## Ditto Team

* [Lee Kelleher](https://github.com/leekelleher)
* [Matt Brailsford](https://github.com/mattbrailsford)
* [James Jackson-South](https://github.com/JimBobSquarePants)

### Special thanks

* Thanks to [Darren Ferguson](https://github.com/darrenferguson) for inspiration in his article "[Mapping Umbraco content to POCOs for strongly typed views](http://24days.in/umbraco/2013/mapping-content-to-pocos/)" on the [24 days in Umbraco](http://24days.in/umbraco/) advent calender.
* Thanks to [Jeavon Leopold](https://github.com/Jeavon) for being a rockstar and adding AppVeyor support.
* Thanks to [Hendy Racher](https://github.com/Hendy) for testing and contributions.
* Thanks to [Jamie Pollock](https://github.com/jamiepollock) for continued support, feedback and encouragement.
* Special thanks to [James Jackson-South](https://github.com/JimBobSquarePants) for all the stellar contributions.


## License

Copyright &copy; 2014 Umbrella Inc, Our Umbraco and [other contributors](https://github.com/leekelleher/umbraco-ditto/graphs/contributors)
Copyright &copy; 2018 UMCO, Our Umbraco and [other contributors](https://github.com/umco/umbraco-ditto/graphs/contributors)
Copyright &copy; 2014 Umbrella Inc

Licensed under the [MIT License](LICENSE.md)
18 changes: 4 additions & 14 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,20 @@ artifacts:
- path: artifacts\*.zip

deploy:
# MyGet (Ditto feed) Deployment for builds & releases
- provider: NuGet
server: https://www.myget.org/F/umbraco-ditto/
symbol_server: https://www.myget.org/F/umbraco-ditto/symbols/api/v2/package
api_key:
secure: Q1/4K8VSwr7BjwmKDTef8y5lOc7S+jK9ELuWy67y6OVRpjxmnF9M3Gfs1kT+ir8x
artifact: /.*\.nupkg/
on:
branch: develop

# MyGet (Umbraco Community feed) Deployment for builds & releases
- provider: NuGet
server: https://www.myget.org/F/umbraco-packages/
symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package
symbol_server: https://nuget.symbolsource.org/MyGet/umbraco-packages
api_key:
secure: Q1/4K8VSwr7BjwmKDTef8y5lOc7S+jK9ELuWy67y6OVRpjxmnF9M3Gfs1kT+ir8x
secure: 36/Ax5O+e6wENlhoTwgvoEBZV3FG4XjF429SNTej2qsGTAL+cdfA1kT/tm1St8vx
artifact: /.*\.nupkg/
on:
branch: develop

# GitHub Deployment for releases
- provider: GitHub
auth_token:
secure: pEozEGTqJutQwOidJU6BTB+Ix0NV4vrUnomhfeqheVz4RNwfxjEYLoqR4XabhlPz
secure: yDxrRTveSScJA35MQTOaLYVjoPKFKl2bHBkG+JMZjiN0r7AfuUCxVU3CgW8Imu4h
artifact: /.*\.zip/ # upload all Zip packages to release assets
draft: false
prerelease: false
Expand All @@ -58,7 +48,7 @@ deploy:
- provider: NuGet
server:
api_key:
secure: CGzDKxw4QI/z2VSe9ceiYlIabqGXHolgBgVNWWZjVAJ2V5WLF11IFdlp9r5Qp+Sw
secure: 0+oAleUTnr9UuJrhLW5rphRR+QGz00XX1Ui3k5kwyr2kUdEamiQ3F+gW0q8MJbDT
artifact: /.*\.nupkg/
on:
branch: master
Expand Down
10 changes: 5 additions & 5 deletions build/package.proj
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
<MinUmbracoVersion>7.3.2</MinUmbracoVersion>
<Readme>Ditto - the friendly POCO mapper for Umbraco</Readme>
<AuthorName>Lee Kelleher, Matt Brailsford, James Jackson-South</AuthorName>
<AuthorUrl>https://github.com/leekelleher/umbraco-ditto/graphs/contributors</AuthorUrl>
<AuthorUrl>https://github.com/umco/umbraco-ditto/graphs/contributors</AuthorUrl>
<PackageLicenseName>MIT license</PackageLicenseName>
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
<ProjectUrl>https://github.com/leekelleher/umbraco-ditto</ProjectUrl>
<ProjectUrl>https://github.com/umco/umbraco-ditto</ProjectUrl>
</PropertyGroup>

<!-- NUGET ONLY PROPERTIES -->
<PropertyGroup>
<PackageId>Our.Umbraco.Ditto</PackageId>
<NuGetPackageName>Ditto for Umbraco</NuGetPackageName>
<Copyright>Copyright &#169; 2014 Umbrella Inc Ltd, Our Umbraco and other contributors</Copyright>
<Owners>Umbrella Inc Ltd</Owners>
<IconUrl>https://raw.githubusercontent.com/leekelleher/umbraco-ditto/master/docs/assets/img/logo.png</IconUrl>
<Copyright>Copyright &#169; 2014 UMCO, Umbrella Inc Ltd, Our Umbraco and other contributors</Copyright>
<Owners>UMCO</Owners>
<IconUrl>https://raw.githubusercontent.com/umco/umbraco-ditto/master/docs/assets/img/logo.png</IconUrl>
<Tags>umbraco poco mapping strongly-typed</Tags>
<Language>en-GB</Language>
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Ditto is a lightweight view-model mapper for Umbraco. It offers a simple solutio

## Where can I get it?

Ditto can be installed from either [Our Umbraco](https://our.umbraco.org/projects/developer-tools/ditto/) or [NuGet package](https://www.nuget.org/packages/Our.Umbraco.Ditto) repositories, or build manually from the [source-code](https://github.com/leekelleher/umbraco-ditto).
Ditto can be installed from either [Our Umbraco](https://our.umbraco.org/projects/developer-tools/ditto/) or [NuGet package](https://www.nuget.org/packages/Our.Umbraco.Ditto) repositories, or build manually from the [source-code](https://github.com/umco/umbraco-ditto).

For further details, please see our [installation](install) guide, then read the [getting started](getting-started) section.

## How can I get help?

For quick questions, give [Gitter](https://gitter.im/leekelleher/umbraco-ditto) a try. For more detailed questions, head over to [Our Umbraco forum](https://our.umbraco.org/projects/developer-tools/ditto/ditto-feedback/). Finally, for bugs, issues or feature requests, create a [GitHub Issue](https://github.com/leekelleher/umbraco-ditto/issues).
For quick questions, give [Gitter](https://gitter.im/leekelleher/umbraco-ditto) a try. For more detailed questions, head over to [Our Umbraco forum](https://our.umbraco.org/projects/developer-tools/ditto/ditto-feedback/). Finally, for bugs, issues or feature requests, create a [GitHub Issue](https://github.com/umco/umbraco-ditto/issues).

2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ If you prefer, you can compile Ditto yourself, you'll need:
To clone it locally run the following git commands:

```bash
git clone https://github.com/leekelleher/umbraco-ditto.git umbraco-ditto
git clone https://github.com/umco/umbraco-ditto.git umbraco-ditto
cd umbraco-ditto
.\build.cmd
```
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
site_name: Ditto

repo_url: https://github.com/leekelleher/umbraco-ditto/tree/develop/docs
repo_url: https://github.com/umco/umbraco-ditto/tree/develop/docs

pages:
- 'Introduction': 'index.md'
Expand Down
2 changes: 1 addition & 1 deletion tests/Our.Umbraco.Ditto.Tests/Issue177Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Our.Umbraco.Ditto.Tests
{
/// <remarks>
/// Unit-test to verify an issue - as outlined in #177
/// https://github.com/leekelleher/umbraco-ditto/issues/177
/// https://github.com/umco/umbraco-ditto/issues/177
/// When a property is marked as `virtual`, it becomes lazy-loaded,
/// and not accessible by other properties on the model.
/// </remarks>
Expand Down

0 comments on commit e0ab92a

Please sign in to comment.