Sipke Schoorstra
f4a707a281
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
2015-08-04 16:28:07 +01:00
Sipke Schoorstra
2ad324d4e2
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
2015-08-04 16:25:35 +01:00
Sipke Schoorstra
0c6326bafd
Improved recipe import/reset execution by pausing sweep generator.
...
This prevents active background tasks from accessing tables that may no longer be there (in the case of a full site reset) by pausing the sweep generator.
To ensure that the sweep generator is resumed after the recipe has been executed, a new ActivateSweepGeneratorStep is enqueued at the end of the recipe execution.
2015-08-04 15:03:47 +01:00
mahsaro
3657cfecab
Ordered layers alphabetically in Widget admin UI.
2015-08-04 15:02:08 +01:00
mahsaro
492631da85
Added RecipeExecutionLogger to AliasStep constructor.
2015-08-04 14:03:27 +01:00
mahsaro
cc9a7d03f8
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-04 13:38:09 +01:00
mahsaro
5bfd175482
Fixed action names.
2015-08-04 11:58:57 +01:00
mahsaro
2d70794c8b
Remove comments...
2015-08-04 11:04:51 +01:00
mahsaro
6c7c84acee
Adding tabs to Alias admin UI for Managed/Unmanaged aliases.
2015-08-04 10:20:00 +01:00
mahsaro
e09cd37de2
Fix export description text for Aliases and Roles.
2015-08-03 23:09:09 +01:00
Sebastien Ros
8a08680a74
Localizing RedisTagCache keys
2015-08-03 14:37:25 -07:00
Sipke Schoorstra
d746548f56
Fixed reset.
...
The database tables need to be dropped after reading settings from the Site item.
2015-08-03 18:51:15 +01:00
Sipke Schoorstra
7ba2751de1
Fixed an issue with site reset.
...
This fixes an issue where currently enabled features are enabled too soon.
Instead only core features should be enabled and then whatever is enabled via the recipe.
2015-08-03 18:00:15 +01:00
Sipke Schoorstra
0c729e6e7f
Fixed DI registration of IDatabaseManager.
2015-08-03 17:23:47 +01:00
Sipke Schoorstra
7f55f27580
Renamed weirdly named argument.
2015-08-03 17:21:14 +01:00
Sipke Schoorstra
3cd39bcc73
Fixed dropping of database tables during site reset.
...
This fixes an issue where only a subset of the actual tables were being deleted due to a minimal shell context.
2015-08-03 17:20:55 +01:00
Sipke Schoorstra
09f3e2ad2f
Removed unused namespaces and some whitespace.
2015-08-03 17:19:08 +01:00
Daniel Stolt
df25fbad8f
Reverted my own stupidity.
...
(i.e. injecting the actual dependency instead of a WorkContextAccessor to resolve it.)
2015-08-03 16:44:58 +01:00
Daniel Stolt
43922eaf20
Extended recipe execution logging.
2015-08-03 15:01:33 +01:00
mahsaro
7944a1510e
Renamed "Custom" to "Unmanaged" in UI. Hidden BulkAction checkbox for Managed aliases.
2015-08-03 14:05:52 +01:00
mahsaro
60ad30c9ef
Fixed typo in AliasStep.
2015-08-03 12:30:49 +01:00
mahsaro
bb143d7236
Fixed format settings. Made IsManaged optional with default value false in IAliasService.
2015-08-03 12:28:16 +01:00
Sebastien Ros
4740283ab2
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
2015-07-31 17:50:22 -07:00
Sebastien Ros
25670b9620
Fixing pager text encoding
...
Fixes #5359
2015-07-31 17:00:31 -07:00
Sebastien Ros
fa09e2e83a
Using master content item to create translations
...
Fixes #5535
2015-07-31 16:19:34 -07:00
Sebastien Ros
a9a1413331
Fixing unit tests
2015-07-31 16:12:36 -07:00
Sebastien Ros
637cea6a02
Fixing Redis connection creation
...
With the previous code, when multiple threads tried to create
a Redis connection, the ConcurrentDictionary would have
called the factory delegate multiple times and added only one
of the resulting connections. This is by design, and a solution
is to use a Lazy object to defer the creation of the connection.
Multiple Lazy objects will be created but it doesn't have any impact.
2015-07-31 15:10:08 -07:00
mahsaro
057a2a32ad
Cleanup
2015-07-31 17:42:44 +01:00
mahsaro
8d1d48f2ee
Merge pull request #1 from OrchardCMS/dev
...
Update with latest from Orchard
2015-07-31 16:28:34 +01:00
Sebastien Ros
5fd02aacd9
Merge branch '1.9.x' into dev
...
Conflicts:
README.md
2015-07-30 15:51:28 -07:00
Sebastien Ros
cc82bfcca0
Fixing duplicate session creation
2015-07-30 15:49:13 -07:00
Sipke Schoorstra
64077ae09a
Changed labels of content recipe builder step.
...
This should make for a more consistent terminology.
2015-07-30 23:13:19 +01:00
Sipke Schoorstra
2a2aba9548
Fixed that xmldecl was not part of the export.xml.
2015-07-30 22:57:26 +01:00
Sébastien Ros
f3f0352063
Merge pull request #5573 from emeraldarcher/issue/5572
...
Fixes #5572 - Bug fixes for Google ReCaptcha 2.0 update
2015-07-30 12:41:06 -07:00
Daniel Stolt
eec888ff71
Made order of field and part elements in export XML predictable.
2015-07-30 20:32:37 +01:00
Sipke Schoorstra
c746fe926b
Fixed removal of database tables when using data table prefix.
2015-07-30 16:39:17 +01:00
Sipke Schoorstra
73170a0d63
Added support for multiple recipe steps of the same type and added unit tests.
...
Enables execution of multiple child recipes in a particular sequence. This is useful for the RecipesStep for example, where you want to execute a child recipe first, then execute some commands and import some content, then execute a second child recipe.
2015-07-30 14:26:01 +01:00
Sipke Schoorstra
a7d2777478
Made DatabaseEnabledTestsBase.Cleanup virtual.
...
This enables child classes to provide additional cleanup.
2015-07-30 14:21:32 +01:00
Daniel Stolt
faa216147d
Merge pull request #5575 from Codinlab/issue/5519
...
Fixes #5519 : DynamicForms client validation issue
2015-07-29 16:59:40 +01:00
Sipke Schoorstra
d13d3e7ff3
Fixed a null reference exception by initializing the lists.
2015-07-29 13:06:50 +01:00
mahsaro
8ef3ca1eac
Sort,Filter and showing IsManaged Admin UI
2015-07-28 18:37:22 +01:00
Sipke Schoorstra
57692e073d
Added RecipesStep.
...
This recipe steps enables the execution of other recipes within the same ExecutionId.
2015-07-28 18:15:43 +01:00
Daniel Stolt
dedded7422
Changed distributed shell restart to only apply to the correct tenant.
2015-07-28 16:35:51 +01:00
Sipke Schoorstra
cbf10216b0
Merge pull request #5581 from dcinzona/patch-4
...
Updated README.md Orchard version to 1.9.1
2015-07-28 15:14:00 +01:00
Gustavo Tandeciarz
bb560f9cdf
Updated README.md Orchard version to 1.9.1
...
Was listing 1.8.1 as latest version in the readme. Minor update.
2015-07-28 08:57:49 -04:00
mahsaro
6718f1902b
Export and import works
2015-07-28 13:52:55 +01:00
Daniel Stolt
f708362313
Made execution ID an ambient context property in recipe logging.
2015-07-28 13:33:07 +01:00
Daniel Stolt
0dd8686a6f
Added "recipes result" command to print result of a recipe execution.
...
This helps in automation scenarios where you need to programmatically find out whether setup succeeded or not. Also clarified "setup" command output and added execution ID to the message and cleaned up code in RecipeCommands.
2015-07-27 21:03:04 +01:00
Thierry Fleury
bc2e0607ef
DynamicForms : Mark css & js assets as content
...
MsBuild raise errors when ccs or js files have "None" BuildAction
2015-07-27 13:30:29 +02:00
Thierry Fleury
cd5ca49b32
Fixes #5519 : DynamicForms client validation issue
...
jQuery validate script order is important
2015-07-27 11:31:47 +02:00
