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,685 Commits 83 Branches 32 Tags
6228f4e8fb4c8a5a1751482685b06434db364e42
Commit Graph

9685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lombiq
06e4d2f7f8 Fixing typo/language 2015-08-11 02:04:57 +02:00
Gustavo Tandeciarz
7bcb6b83fb Update Package.json 
Removed Gulp Notify as it is not required.
 2015-08-10 08:08:29 -04:00
Gustavo Tandeciarz
e72471f020 Moved watchPaths in gulpfile 
Moved the watchPaths generation to the watch task.
Cleaned up some spacing
 2015-08-10 08:07:49 -04:00
Gustavo Tandeciarz
de74c00378 Updates to gulpfile.js 
Removed comments and notify, as well as console.logs.
 2015-08-10 07:53:19 -04:00
Sipke Schoorstra
d2c622dac6 Merge pull request #5626 from Xeevis/dev 
Added woff2 mimetype
 2015-08-09 10:37:59 +01:00
Xeevis
f708a0f32e Added woff2 mimetype 2015-08-09 11:24:05 +02:00
Sipke Schoorstra
86b232aa52 Reformatted web.config and added some default mimetypes. 2015-08-06 21:04:12 +01:00
Sipke Schoorstra
c724cf0fcf Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Rules/Module.txt
 2015-08-06 20:52:13 +01:00
Sébastien Ros
b206a656e8 Merge pull request #5603 from mahsaro/WidgetLayersOrder_1.9.x 
Ordered layers alphabetically in Widget admin UI.
 2015-08-06 12:41:19 -07:00
Sébastien Ros
32669d347a Merge pull request #5610 from psenechal/1.9.x 
Update Module.txt
 2015-08-06 12:40:44 -07:00
Sébastien Ros
5bdfb6e98a Merge pull request #5476 from dcinzona/patch-1 
Added mimetype declarations to root web.config
 2015-08-06 12:40:01 -07:00
Sébastien Ros
8f9d52307b Merge pull request #5615 from OrchardCMS/issue/4097/fix-duplicate-content 
#4097: Changed Import to accommodate expected behavior as defined as …

Fixes #4097
 2015-08-06 12:32:54 -07:00
Sébastien Ros
5f51c7c31a Merge pull request #5567 from OrchardCMS/issue/homepage-alias 
Issue/homepage alias
 2015-08-06 12:31:40 -07:00
Lombiq
85fd5c8320 Fixing registration settings infoset migration 2015-08-06 21:30:35 +02:00
Sébastien Ros
7e95f78ec9 Merge pull request #5619 from OrchardCMS/issue/5271/module-manifest-metadata 
#5271: Added Lifecycle Status field to module manifest.

Fixes #5271
 2015-08-06 12:20:35 -07:00
Sipke Schoorstra
4a88752ba8 #5271: Added Lifecycle Status field to module manifest. 
- Module manifest extended with LifecycleStatus field.
- Updated Features screen to show lifecycle status if LifecycleStatus != Production.
- Updated the deprecated module manifests with the new lifecycle status (CustomForms, Media, MediaPicker and Rules).
 2015-08-06 17:48:50 +01:00
Sebastien Ros
41bd9ce9bc Adding a file system backed output cache provider 2015-08-05 16:59:34 -07:00
Sebastien Ros
e346170f24 Adding some documentation for IAppDataFolder 2015-08-05 14:21:22 -07:00
Sipke Schoorstra
b1288ae5bc Minor code cleanup. 2015-08-05 17:18:40 +01:00
Sipke Schoorstra
98666530b4 #4097: Changed Import to accommodate expected behavior as defined as part of the issue. 
This formalizes what we decided should happen when importing recipes in combination with various possible statuses a content item can have and how the import affects this.
 2015-08-05 17:11:04 +01:00
Sipke Schoorstra
ac1a279d1b #2540: Fixes an issue with NotifyFilter. 
This fixes the case when a controller for example registers a notification and then returns a View result instead of a Redirect result.
When returning a View, the registered notifications would not be rendered until another page request occurred.

Fixes #2540
 2015-08-05 14:03:44 +01:00
Gustavo Tandeciarz
b399925368 Updated Gulpfile.js 
Switched property check to use `hasOwnProperty` instead of `!== undefined`
 2015-08-05 08:42:08 -04:00
Gustavo Tandeciarz
ecbd485fd8 Updated Gulpfile.js 
Removed variable option for rebuildAlways
Set watch task to always check `watchPaths` and populated that based on `watch` variable option (if the option is present, it will watch files designated in `watch` as well as files designated in `input`.  Otherwise, it will only watch files designated in `input`.
 2015-08-05 08:28:08 -04:00
Gustavo Tandeciarz
0fcf8c7409 Updating gulpfile.js per request 
Including some help text / comments
Set rebuildAlways to default to true when not specified
Set generateSourceMaps to default to true when not specified
Including files specified in 'inputs' into the watch list.
 2015-08-05 06:37:46 -04:00
Sebastien Ros
430c3de460 Compressing output cache content in Redis 2015-08-04 17:28:49 -07:00
bleroy
6e8b4524d0 Delete ghost solution from 2010 from Orchard.ContentTypes module. 2015-08-04 16:50:07 -07:00
Philip Senechal
a6f5e4fb01 Update Module.txt 
Spelling corrections
 2015-08-04 16:25:30 -07:00
Philip Senechal
ff1fe79016 Update Module.txt 
Language correction
 2015-08-04 16:22:56 -07:00
Gustavo Tandeciarz
8e9f6ce8bd Adding gulp-notify package 
required for gulpfile.js updates
 2015-08-04 18:33:37 -04:00
Gustavo Tandeciarz
47e0b96725 Fixes #5607 
Added optional properties to the Assets.json to support separating watch and build lists.
Also added support for excluding sourcemaps as well as forcing rebuild.

Requires gulp-notify (added fancier notification for process completion).
 2015-08-04 18:31:55 -04:00
Sipke Schoorstra
226dc719ab Merge pull request #5599 from mahsaro/dev 
Importing/Exporting of Aliases.
 2015-08-04 22:25:20 +01:00
mahsaro
5e58cf9d70 Removed extra line breaks. 2015-08-04 22:23:17 +01:00
mahsaro
d75af074bb Remove extra line. 2015-08-04 22:20:02 +01:00