lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,720 Commits 83 Branches 32 Tags
6d8460ad9ca6db75a6b9ff4a08671efc6c7b469f
Commit Graph

9720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros
6d8460ad9c Removing Core dependency from jQuery 
The auto-enable feature code would load it and replace
the SafeModeSiteService by its implementation.
 2015-08-27 10:41:43 -07:00
Sipke Schoorstra
8f2bd16fed Fixed broken setup due to auto-enabling features. 
This change will only auto-enable features for already running shells.
 2015-08-27 14:32:43 +01:00
Sébastien Ros
914423a345 Merge pull request #5634 from OrchardCMS/feature/auto-enable-dependencies 
Auto enable dependencies

Fixes #3132
 2015-08-26 15:47:02 -07:00
Sébastien Ros
247009d07a Merge pull request #5685 from planetClaire/5684 
Add missing activity, fixes #5684
 2015-08-26 15:28:30 -07:00
Daniel Stolt
a8db54d994 Added missing PDF file. 2015-08-25 16:24:29 +02:00
Daniel Stolt
d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02:00
marshy
bccdc0337e Add missing activity, fixes #5684 2015-08-24 10:21:32 +08:00
Sipke Schoorstra
7fae246341 Added convenience overload taking a default value factory method. 
This overload is useful in scenarios where you want to provide a default value but is relatively expensive to execute.
Using the overload, the factory method is only executed if the infoset does not contain an entry for the requested key.
 2015-08-23 22:40:34 +01:00
Sipke Schoorstra
b560a4c3d0 Corrected labels on import screen. 2015-08-22 23:35:45 +01:00
Daniel Stolt
ff6cb5688d Removed incorrect unique constraints and added missing ones. 2015-08-21 23:43:33 +01:00
Sipke Schoorstra
2555302ed7 Removed unintentionally added file. 2015-08-21 23:21:13 +01:00
Sipke Schoorstra
811001143e Corrected interface name. 
Potentially breaking, but I highly doubt anyone implemented this interface.
 2015-08-21 23:14:37 +01:00
Sipke Schoorstra
412c531027 Merge branch 'dev' into feature/auto-enable-dependencies 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-08-21 19:45:53 +01:00
Sébastien Ros
73683ec057 Merge pull request #5640 from jtkech/patch-4 
#5552: ContentPicker Search Route issue

Fixes #5552
 2015-08-20 12:26:09 -07:00
Daniel Stolt
2a9d931e39 Shortened unique constraint names for compatibility with MySQL. 
MySQL has a maximum identifier length of 64 chars for constraints and indexes.
 2015-08-20 12:38:58 +01:00
Daniel Stolt
aa7f9dd1cd Added unique constraints to core settings tables. 2015-08-20 12:38:57 +01:00
Daniel Stolt
aae53c3909 Added unique constraints to data migration records. 2015-08-20 12:38:57 +01:00
Daniel Stolt
90b3c1e7f6 Added unique constraints to ContentItemVersionRecord table. 2015-08-20 12:38:56 +01:00
Daniel Stolt
1c7ed9cb94 Added support for unique constraints to SchemaBuilder. 2015-08-20 12:38:55 +01:00
Daniel Stolt
6b4a497e2d Merge pull request #5659 from planetClaire/5658 
Show Default layer by default in Widgets admin
 2015-08-19 14:03:38 +01:00
marshy
8cbb1d6960 Show Default layer by default in Widgets admin 2015-08-19 13:41:49 +08:00
Daniel Stolt
1b55f42754 Merge branch '1.9.x' into dev 2015-08-17 00:26:33 +01:00
Daniel Stolt
f19b57c1e6 Fixed one remaining unit datetime localization unit test on Windows 10. 2015-08-17 00:25:34 +01:00
Daniel Stolt
9429ad6e63 Merge branch '1.9.x' into dev 2015-08-17 00:03:59 +01:00
Daniel Stolt
7533cd8879 Improved DateTime localization and unit tests on Windows 10. 
Added support for era names to date formatting/parsing framework. Added handling of cultures with missing AM/PM designators. Fixes failing unit tests on Windows 10. Fixes #5595.
 2015-08-17 00:01:32 +01:00
Daniel Stolt
75609bf2ce Excluded private locator URLs from JSON serialization in Azure Media Services. Fixes #4686. 2015-08-16 20:13:33 +01:00
Daniel Stolt
6228f4e8fb Merge branch '1.9.x' into dev 2015-08-16 18:02:29 +01:00
Daniel Stolt
4b44827f2a Added skeleton Assets.json to codegen theme template. 2015-08-16 17:50:47 +01:00
Daniel Stolt
a04195ee0e Added a simple skeleton Assets.json to codegen module template. Fixes #5606. 2015-08-16 17:38:16 +01:00
Daniel Stolt
3183df5b4a Recreated folder to resolve git case inconsistency. 2015-08-16 16:27:09 +01:00
Daniel Stolt
dfa1ada978 Deleted folder to resolve git case inconsistency. 2015-08-16 16:25:58 +01:00
Daniel Stolt
a6a6cb2d90 Merge branch '1.9.x' into dev 2015-08-16 16:19:59 +01:00
Daniel Stolt
b2c131f516 Refactored watch task in Gulpfile.js. 2015-08-16 16:15:46 +01:00
Daniel Stolt
359d25c1f2 Merge branch 'patch-5' of https://github.com/dcinzona/Orchard into 1.9.x 2015-08-16 14:43:36 +01:00
Lombiq
6552735df3 Media Library now correctly handles files with a # character in their name, fixes #5421. 2015-08-16 02:23:11 +02:00
Lombiq
59b3d50e03 Fixing that the empty username validation message wasn't shown on the Lost Password page, fixes #5353 2015-08-16 02:08:12 +02:00
Daniel Stolt
c508584e63 Merge branch '1.9.x' into dev 2015-08-14 11:57:38 +01:00
Daniel Stolt
f2bf75328e Merge pull request #5642 from paynecrl97/5520/tenantAwareConfig 
#5520 AppConfigurationAccessor is now tenant aware.

Fixes #5520.
 2015-08-14 11:43:09 +01:00
Chris Payne
0213524317 AppConfigurationAccessor is now tenant aware 2015-08-14 11:34:28 +01:00
jtkech
1ed973ab88 Update MediaController.cs 2015-08-14 00:29:02 +02:00
jtkech
c4d20e3b73 Update ContentPickerController.cs 2015-08-14 00:14:57 +02:00
jtkech
07efdb267a Update Routes.cs 2015-08-13 23:27:40 +02:00
Lombiq
64585223ee Fixing that Layouts couldn't be export/imported properly because they lacked an identity 2015-08-13 17:02:50 +02:00
Sipke Schoorstra
641236f358 Re-implemented HomeAlias custom export step as recipe builder steps. 2015-08-13 14:43:05 +01:00
Sipke Schoorstra
564fdc27be #5636: Fixed a bug with AliasStorage.Remove method. 
Fixes #5636
 2015-08-13 13:48:37 +01:00
Sipke Schoorstra
25fa422a5e Added RemoveContent execution step. 2015-08-13 13:44:26 +01:00
Sipke Schoorstra
7d7340fbab Resolved merge conflicts. 
The dev branch had the ExtensionManagerExtensions class as a separate file while the 1.9.x branch had this class in the same file as IExtensionManager.cs.
 2015-08-12 15:33:10 +01:00
Sipke Schoorstra
591a06e944 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into feature/auto-enable-dependencies 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard/Environment/Extensions/IExtensionManager.cs
	src/Orchard/Orchard.Framework.csproj
 2015-08-12 15:24:36 +01:00
Sipke Schoorstra
08a3285e4f #3132: Auto-enabling dependency features. 
This makes sure that any dependency of a feature that is currently not enabled gets enabled automatically before the shell is activated.
This prevents potential autofac resolution issues if one service depends on another service provided by a feature that is disabled.

Fixes #3132
 2015-08-12 15:13:03 +01:00
Sipke Schoorstra
4cd88cb9c9 Minor cleanup and formatting. 2015-08-12 15:07:15 +01:00