Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	_config.yml
#	src/activities/Elsa.Activities.Http/ActivityDescriptors.cs
#	src/activities/Elsa.Activities.Timers/Elsa.Activities.Timers.csproj
#	src/samples/SampleDashboard.Web/SampleDashboard.Web.csproj
#	src/web/modules/Elsa.Web.Activities.Console/Elsa.Web.Activities.Console.csproj
#	src/web/modules/Elsa.Web.Activities.Http/Elsa.Web.Activities.Http.csproj
#	src/web/modules/Elsa.Web.Activities.Primitives/Elsa.Web.Activities.Primitives.csproj
#	src/web/modules/Elsa.Web.Components/Elsa.Web.Components.csproj
#	src/web/modules/Elsa.Web.Management/Elsa.Web.Management.csproj
#	src/web/modules/Elsa.Web.Management/Theming/SettingsThemeSelector.cs
#	src/web/modules/Elsa.Web.Persistence.FileSystem/Elsa.Web.Persistence.FileSystem.csproj
#	src/web/themes/Elsa.Web.BootstrapTheme/Elsa.Web.BootstrapTheme.csproj
  • Loading branch information
sfmskywalker committed Oct 23, 2019
2 parents e3e61f5 + c7c41d1 commit 1b22bac
Show file tree
Hide file tree
Showing 957 changed files with 54,811 additions and 18,839 deletions.
340 changes: 155 additions & 185 deletions Elsa.sln

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2019, Sipke Schoorstra
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10 changes: 6 additions & 4 deletions Nuget.Config
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="OrchardCore Preview" value="https://www.myget.org/F/orchardcore-preview/api/v3/index.json" />
</packageSources>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="Elsa Preview" value="https://www.myget.org/F/elsa/api/v3/index.json" />
<add key="OrchardCore Preview" value="https://www.myget.org/F/orchardcore-preview/api/v3/index.json" />
</packageSources>
</configuration>
392 changes: 274 additions & 118 deletions README.md

Large diffs are not rendered by default.

270 changes: 270 additions & 0 deletions Samples.sln

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion _config.yml

This file was deleted.

Binary file added doc/dashboard-sample-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/dashboard-sample-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/workflow-sample-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/workflow-sample-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
277 changes: 0 additions & 277 deletions gulpfile.js

This file was deleted.

56 changes: 0 additions & 56 deletions npm-install.js

This file was deleted.

Loading

0 comments on commit 1b22bac

Please sign in to comment.