Skip to content
This repository has been archived by the owner on Feb 10, 2024. It is now read-only.

Commit

Permalink
Merge pull request #149 from skttl/develop
Browse files Browse the repository at this point in the history
Preparing v.1.0.0-beta
  • Loading branch information
skttl authored Aug 20, 2019
2 parents 117b3f7 + 19ca25e commit b0fb460
Show file tree
Hide file tree
Showing 44 changed files with 1,089 additions and 960 deletions.
1 change: 1 addition & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Copyright © 2019 Søren Kottal, Our Umbraco and other contributors
Copyright © 2017 UMCO, Our Umbraco and other contributors
Copyright © 2014 Umbrella Inc

Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor)


A grid editor for Umbraco 7 that allows you to use Doc Types as a blue print for grid-cell data.
A grid editor for Umbraco 8 that allows you to use Doc Types as a blue print for grid-cell data.


## Getting Started

### Installation

> *Note:* Doc Type Grid Editor has been developed against **Umbraco v7.6.0** and will support that version and above.
> *Note:* Doc Type Grid Editor has been developed against **Umbraco v8.1.0** and will support that version and above.
Doc Type Grid Editor can be installed from either Our Umbraco package repository, or build manually from the source-code.

Expand Down Expand Up @@ -83,18 +83,20 @@ Have a question?

## Dev Team

* [Matt Brailsford](https://github.com/mattbrailsford)
* [Lee Kelleher](https://github.com/leekelleher)
* [Søren Kottal](https://github.com/skttl)

### Special thanks

* Thanks to [Matt Brailsford](https://github.com/mattbrailsford) and [Lee Kelleher](https://github.com/leekelleher) for building this great package.
* Thanks to [Jeavon Leopold](https://github.com/Jeavon) for being a rockstar and adding AppVeyor & NuGet support.
* Thanks to [Dave Woestenborghs](https://github.com/dawoe) for helping solve showstopper issues.
* Thanks to [Søren Kottal](https://github.com/skttl) for help with localization.
* Thanks to [Arnold Visser](https://github.com/ArnoldV) and [Bjarne Fyrstenborg](https://github.com/bjarnef) for help with porting the package to Umbraco 8.


## License

Copyright © 2019 Søren Kottal, Our Umbraco and [other contributors](https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors)

Copyright © 2017 UMCO, Our Umbraco and [other contributors](https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors)

Copyright © 2014 Umbrella Inc
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
image: Visual Studio 2017

# version format
version: 0.6.1.{build}
version: 1.0.0.{build}

# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
init:
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=
- set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

cache:
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
Expand All @@ -27,7 +27,7 @@ deploy:
server: https://www.myget.org/F/umbraco-packages/api/v2/package
symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package
api_key:
secure: 36/Ax5O+e6wENlhoTwgvoEBZV3FG4XjF429SNTej2qsGTAL+cdfA1kT/tm1St8vx
secure: MopTO3Wq0dA16UdDqhP2GIzXLzZqS4SxGPCGiwN1i1hEL0AYLscuJVq6Ot7XYD2m
artifact: /.*\.nupkg/
on:
branch: develop
Expand All @@ -48,7 +48,7 @@ deploy:
server:
skip_symbols: true
api_key:
secure: vEophXSqus5F60LRBY4/j1l6K/S5+n3/yYpiID3O7JJW1gyj+0q0enuHhN3tgdhl
secure: RYtJVVEuX1s2cy3Wo1Xly0yvp1n40wDdndhNsXQGgrAUmZDnlwujEycsLxUL8NsN
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 @@ -18,9 +18,9 @@
<PropertyGroup>
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
<PackageName>Doc Type Grid Editor</PackageName>
<MinUmbracoVersion>7.6.0</MinUmbracoVersion>
<Readme>Doc Type Grid Editor is an advanced grid editor for Umbraco 7</Readme>
<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
<MinUmbracoVersion>8.0.0</MinUmbracoVersion>
<Readme>Doc Type Grid Editor is an advanced grid editor for Umbraco 8</Readme>
<AuthorName>Matt Brailsford, Lee Kelleher, Søren Kottal</AuthorName>
<AuthorUrl>https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors</AuthorUrl>
<PackageLicenseName>MIT license</PackageLicenseName>
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
Expand All @@ -31,8 +31,8 @@
<PropertyGroup>
<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
<NuGetPackageName>Doc Type Grid Editor for Umbraco</NuGetPackageName>
<Copyright>Copyright &#169; 2017 UMCO</Copyright>
<Owners>Matt Brailsford, Lee Kelleher</Owners>
<Copyright>Copyright &#169; 2019 UMCO</Copyright>
<Owners>Matt Brailsford, Lee Kelleher, Søren Kottal</Owners>
<IconUrl>https://our.umbraco.org/media/wiki/145708/635623742802070736_dtgepng.png</IconUrl>
<Tags>umbraco grid document type editor</Tags>
<Language>en-GB</Language>
Expand Down
7 changes: 0 additions & 7 deletions build/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
<Languages />
<DataTypes />

<Actions>
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
keyProperty="alias"
sourceFile="~/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js"
targetFile="~/Config/grid.editors.config.js" />
</Actions>

<control />

<files />
Expand Down
53 changes: 30 additions & 23 deletions build/readme.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
____ _____ ____ _ _ _____ _ _ _
| _ \ ___ __|_ _| _ _ __ ___ / ___|_ __(_) __| | ____|__| (_) |_ ___ _ __
| | | |/ _ \ / __|| || | | | '_ \ / _ \ | _| '__| |/ _` | _| / _` | | __/ _ \| '__|
| |_| | (_) | (__ | || |_| | |_) | __/ |_| | | | | (_| | |__| (_| | | || (_) | |
|____/ \___/ \___||_| \__, | .__/ \___|\____|_| |_|\__,_|_____\__,_|_|\__\___/|_|
|___/|_|
 ██████████████
████████████████████████
██████████████████████████████
████████████████████████████████████
██████████████████████████████████████
███████ ███████ _
████████ ████████ _ _ _ __ ___ | |__ _ __ __ _ ___ ___
██████████████████████████████████████████████ | | | | '_ ` _ \| '_ \| '__/ _` |/ __/ _ \
██████████ ████ ████ ██████████ | |_| | | | | | | |_) | | | (_| | (_| (_) |
██████████ ████ ████ ██████████ \__,_|_| |_| |_|_.__/|_| \__,_|\___\___/
███████████ ████ ████ █ ██████ ____ _____
███████████████████████████████████████ █████ | _ \ ___ ___ |_ _| _ _ __ ___
███████████ ████ ███████ | | | |/ _ \ / __| | || | | | '_ \ / _ \
███████████ █ ██████████ | |_| | (_) | (__ | || |_| | |_) | __/
█████████████████████████████████ ████████████ |____/ \___/ \___| |_| \__, | .__/ \___|
██████████ ████ ████ ██ ██████████ ____ _ _ ___|___/|_|_ _
█████████ ████ ███ ██ █████████ / ___|_ __(_) __| | | ____|__| (_) |_ ___ _ __
█████████ ████ ██ █ █████████ | | _| '__| |/ _` | | _| / _` | | __/ _ \| '__|
████████ ████ ██ ███ ████████ | |_| | | | | (_| | | |__| (_| | | || (_) | |
████████████████████ ████████████████ \____|_| |_|\__,_| |_____\__,_|_|\__\___/|_|
██████████████████████████████████████
████████████████████████████████
████████████████████████████
████████████████████
████████████


--------------------------------------------------------------------------------------

To enable DocTypeGridEditor you must add the following JSON snippet to "grid.editors.config.js" found in the Config folder.
Thanks for installing Doc Type Grid Editor.

{
"name": "Doc Type",
"alias": "docType",
"view": "/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html",
"render": "/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml",
"icon": "icon-item-arrangement",
"config": {
"allowedDocTypes": [],
"nameTemplate": "",
"enablePreview": true,
"viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",
"previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",
"previewCssFilePath": "",
"previewJsFilePath": ""
}
}
We have added an universal grid editor allowing all your element types, in a package.manifest file in /App_Plugins/DocTypeGridEditor/package.manifest.
You can add your own and target specific doctypes, for single purpose grid editors if you'd like. Checkout the Developers Guide for more info at:
https://github.com/umco/umbraco-doc-type-grid-editor/blob/master/docs/developers-guide.md
Loading

0 comments on commit b0fb460

Please sign in to comment.