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

Commit b0fb460

Browse files
authored
Merge pull request #149 from skttl/develop
Preparing v.1.0.0-beta
2 parents 117b3f7 + 19ca25e commit b0fb460

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1089
-960
lines changed

LICENSE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Copyright © 2019 Søren Kottal, Our Umbraco and other contributors
12
Copyright © 2017 UMCO, Our Umbraco and other contributors
23
Copyright © 2014 Umbrella Inc
34

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor)
66

77

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

1010

1111
## Getting Started
1212

1313
### Installation
1414

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

@@ -83,18 +83,20 @@ Have a question?
8383

8484
## Dev Team
8585

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

8988
### Special thanks
9089

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

9595

9696
## License
9797

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

100102
Copyright © 2014 Umbrella Inc

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
image: Visual Studio 2017
22

33
# version format
4-
version: 0.6.1.{build}
4+
version: 1.0.0.{build}
55

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

1111
cache:
1212
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
@@ -27,7 +27,7 @@ deploy:
2727
server: https://www.myget.org/F/umbraco-packages/api/v2/package
2828
symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package
2929
api_key:
30-
secure: 36/Ax5O+e6wENlhoTwgvoEBZV3FG4XjF429SNTej2qsGTAL+cdfA1kT/tm1St8vx
30+
secure: MopTO3Wq0dA16UdDqhP2GIzXLzZqS4SxGPCGiwN1i1hEL0AYLscuJVq6Ot7XYD2m
3131
artifact: /.*\.nupkg/
3232
on:
3333
branch: develop
@@ -48,7 +48,7 @@ deploy:
4848
server:
4949
skip_symbols: true
5050
api_key:
51-
secure: vEophXSqus5F60LRBY4/j1l6K/S5+n3/yYpiID3O7JJW1gyj+0q0enuHhN3tgdhl
51+
secure: RYtJVVEuX1s2cy3Wo1Xly0yvp1n40wDdndhNsXQGgrAUmZDnlwujEycsLxUL8NsN
5252
artifact: /.*\.nupkg/
5353
on:
5454
branch: master

build/package.proj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<PropertyGroup>
1919
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
2020
<PackageName>Doc Type Grid Editor</PackageName>
21-
<MinUmbracoVersion>7.6.0</MinUmbracoVersion>
22-
<Readme>Doc Type Grid Editor is an advanced grid editor for Umbraco 7</Readme>
23-
<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
21+
<MinUmbracoVersion>8.0.0</MinUmbracoVersion>
22+
<Readme>Doc Type Grid Editor is an advanced grid editor for Umbraco 8</Readme>
23+
<AuthorName>Matt Brailsford, Lee Kelleher, Søren Kottal</AuthorName>
2424
<AuthorUrl>https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors</AuthorUrl>
2525
<PackageLicenseName>MIT license</PackageLicenseName>
2626
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
@@ -31,8 +31,8 @@
3131
<PropertyGroup>
3232
<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
3333
<NuGetPackageName>Doc Type Grid Editor for Umbraco</NuGetPackageName>
34-
<Copyright>Copyright &#169; 2017 UMCO</Copyright>
35-
<Owners>Matt Brailsford, Lee Kelleher</Owners>
34+
<Copyright>Copyright &#169; 2019 UMCO</Copyright>
35+
<Owners>Matt Brailsford, Lee Kelleher, Søren Kottal</Owners>
3636
<IconUrl>https://our.umbraco.org/media/wiki/145708/635623742802070736_dtgepng.png</IconUrl>
3737
<Tags>umbraco grid document type editor</Tags>
3838
<Language>en-GB</Language>

build/package.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@
2727
<Languages />
2828
<DataTypes />
2929

30-
<Actions>
31-
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
32-
keyProperty="alias"
33-
sourceFile="~/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js"
34-
targetFile="~/Config/grid.editors.config.js" />
35-
</Actions>
36-
3730
<control />
3831

3932
<files />

build/readme.txt

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
1-
____ _____ ____ _ _ _____ _ _ _
2-
| _ \ ___ __|_ _| _ _ __ ___ / ___|_ __(_) __| | ____|__| (_) |_ ___ _ __
3-
| | | |/ _ \ / __|| || | | | '_ \ / _ \ | _| '__| |/ _` | _| / _` | | __/ _ \| '__|
4-
| |_| | (_) | (__ | || |_| | |_) | __/ |_| | | | | (_| | |__| (_| | | || (_) | |
5-
|____/ \___/ \___||_| \__, | .__/ \___|\____|_| |_|\__,_|_____\__,_|_|\__\___/|_|
6-
|___/|_|
1+
 ██████████████
2+
████████████████████████
3+
██████████████████████████████
4+
████████████████████████████████████
5+
██████████████████████████████████████
6+
███████ ███████ _
7+
████████ ████████ _ _ _ __ ___ | |__ _ __ __ _ ___ ___
8+
██████████████████████████████████████████████ | | | | '_ ` _ \| '_ \| '__/ _` |/ __/ _ \
9+
██████████ ████ ████ ██████████ | |_| | | | | | | |_) | | | (_| | (_| (_) |
10+
██████████ ████ ████ ██████████ \__,_|_| |_| |_|_.__/|_| \__,_|\___\___/
11+
███████████ ████ ████ █ ██████ ____ _____
12+
███████████████████████████████████████ █████ | _ \ ___ ___ |_ _| _ _ __ ___
13+
███████████ ████ ███████ | | | |/ _ \ / __| | || | | | '_ \ / _ \
14+
███████████ █ ██████████ | |_| | (_) | (__ | || |_| | |_) | __/
15+
█████████████████████████████████ ████████████ |____/ \___/ \___| |_| \__, | .__/ \___|
16+
██████████ ████ ████ ██ ██████████ ____ _ _ ___|___/|_|_ _
17+
█████████ ████ ███ ██ █████████ / ___|_ __(_) __| | | ____|__| (_) |_ ___ _ __
18+
█████████ ████ ██ █ █████████ | | _| '__| |/ _` | | _| / _` | | __/ _ \| '__|
19+
████████ ████ ██ ███ ████████ | |_| | | | | (_| | | |__| (_| | | || (_) | |
20+
████████████████████ ████████████████ \____|_| |_|\__,_| |_____\__,_|_|\__\___/|_|
21+
██████████████████████████████████████
22+
████████████████████████████████
23+
████████████████████████████
24+
████████████████████
25+
████████████
26+
727

828
--------------------------------------------------------------------------------------
929

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

12-
{
13-
"name": "Doc Type",
14-
"alias": "docType",
15-
"view": "/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html",
16-
"render": "/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml",
17-
"icon": "icon-item-arrangement",
18-
"config": {
19-
"allowedDocTypes": [],
20-
"nameTemplate": "",
21-
"enablePreview": true,
22-
"viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",
23-
"previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",
24-
"previewCssFilePath": "",
25-
"previewJsFilePath": ""
26-
}
27-
}
32+
We have added an universal grid editor allowing all your element types, in a package.manifest file in /App_Plugins/DocTypeGridEditor/package.manifest.
33+
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:
34+
https://github.com/umco/umbraco-doc-type-grid-editor/blob/master/docs/developers-guide.md

0 commit comments

Comments
 (0)