Skip to content

#6410 Moved Notifier extention change to dev branch#6634

Merged
sebastienros merged 3 commits intoOrchardCMS:devfrom
SzymonSel:dev
Mar 24, 2016
Merged

#6410 Moved Notifier extention change to dev branch#6634
sebastienros merged 3 commits intoOrchardCMS:devfrom
SzymonSel:dev

Conversation

@SzymonSel
Copy link
Copy Markdown
Contributor

No description provided.

…NotifyType.Information with it. Added appropriate styles in css files.

Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
…ages of NotifyType.Information with it. Added appropriate styles in css files."

This reverts commit dd37d86.
…NotifyType.Information with it. Added appropriate styles in css files.

Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs

Contained in branches: dev#gitext://gotobranch/dev
Contained in no tag
@sebastienros sebastienros merged commit b1f0c4b into OrchardCMS:dev Mar 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants