lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,091 Commits 84 Branches 32 Tags
eee341696d7491b796328419e531056dd13c5239
Commit Graph

8149 Commits

Author SHA1 Message Date
Matthew Harris
5dfda7c0a8 convert modules admin page to use css flexbox 2016-02-19 01:36:28 +00:00
Matthew Harris
89a5953ea3 fix wrong permission check and incorrect use of taxonomies phrase 2016-02-19 00:45:54 +00:00
Matthew Harris
c61666bfdc fix typo in Orchard.Widgets.RuleEngine.cs 2016-02-19 00:32:40 +00:00
Matthew Harris
fe5c8ba233 fixes #6423 - wrong permission checked for delete 2016-02-19 00:27:53 +00:00
Matthew Harris
5811598dff fixes 6400 - improve notifier messages for terms admin 2016-02-18 22:01:52 +00:00
Matthew Harris
2a01771a37 fixes #6272 update wording for comparisons 2016-02-18 21:44:57 +00:00
Sipke Schoorstra
d7b2d35270 Merge branch 'dev' into feature/dynamicforms-defaultfieldvalues 
# Conflicts:
#	lib/mono/Mono.CSharp.dll
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
 2016-02-18 22:07:03 +01:00
Sébastien Ros
a1531da11b Merge pull request #6301 from Codinlab/fixes/5593 
Fixes #5593 : Allow disabling HtmlEncode on DynamicForms
 2016-02-18 12:55:31 -08:00
Sébastien Ros
2f6f020d5d Merge pull request #6340 from jtkech/patch-6 
#6304: Prevents client cache from being disabled when public caching
 2016-02-18 12:51:43 -08:00
Sébastien Ros
c39a1ec8a5 Merge pull request #6346 from rtpHarry/patch-6 
[Fixes #6344] Remove unused place tag
 2016-02-18 12:45:30 -08:00
Lombiq
836975f424 Removing unused code from Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml 2016-02-18 17:42:23 +01:00
Lombiq
49022cd1b5 To the previous: also caring about the case when ShapePart was dynamically added to the content type/item, see #6360 2016-02-18 16:32:16 +01:00
Lombiq
4cc48a380d You can't create two Template content items with the same name (title) any more, fixes #6360 2016-02-17 21:05:14 +01:00
Daniel Stolt
873e0c8d67 Merge branch '1.10' 2016-02-14 19:41:50 +01:00
Daniel Stolt
46571cc289 Fixed all build build warnings. 
"Found conflicts between different versions of the same dependent assembly that could not be resolved."
 2016-02-14 19:38:35 +01:00
Daniel Stolt
b84a248654 Refreshed and improved the Gulp pipeline (details below). 
- Updated to newest version of all modules, and tested/verified.
- No longer generate source maps if asset group is neither concatenating nor transforming (LESS or TypeScript).
- Replaced "autoprefixer" and "css-minify" with the newer "css-nano".
- Added "gulp-eol" for normalization of line endings in all outputs.
- Added separate streams for minified and non-minified CSS outputs to work around bugs in source mapping that prevented asset paths containing "../" from being used.
- Added "es6-promise" polyfill for compat with older versions of Node.js.
- Increased global _maxListeners to suppress memory leak warning from gulp.watch().
 2016-02-13 15:41:03 +01:00
Daniel Stolt
56dad4da2a Merge branch '1.10' into 'dev'. 2016-02-13 13:23:33 +01:00
Sebastien Ros
ac6439644c Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj
 2016-02-11 11:56:20 -08:00
Sebastien Ros
fc0e06408a Adding permission check when updloading media from the admin 2016-02-11 11:32:51 -08:00
andy zheng
d89a3330fb add the lack of file of Parts.MediaProcessing.ImageProfile.cshtml 2016-02-10 21:30:18 -05:00
andy zheng
2a2e3d7920 fix jq widgets for 1.10 2016-02-10 19:56:27 -05:00
Lombiq
d925fd31dc Adding orphaned files to their respective csprojs. Fixes #6366 2016-02-10 23:43:47 +01:00
Lombiq
f3afc4110a Removing empty folders in several project files 2016-02-10 22:45:25 +01:00
Lombiq
5e17db3afd Removing unnecessary file copied to the Users module (see UserResolverSelector.cs) 2016-02-10 22:44:27 +01:00
Lombiq
e823738265 Removing residual files accidentally brought back during merge in Orchard.Indexing 2016-02-10 22:42:53 +01:00
Daniel Stolt
202234bf0b Refreshed all Gulp-compiled resource files. 2016-02-09 23:47:56 +01:00
Daniel Stolt
36f701625c Refactored the resource manifest for jQuery UI. 2016-02-09 23:47:22 +01:00
Sébastien Ros
dfaaf61f88 Merge pull request #6349 from infofromca/fix6343 
[Fixes #6343 #6231] Handle null filters in ImageProfileManager
 2016-02-09 09:00:00 -08:00
neTp9c
66f500e2d7 Treatment null value for params argument 2016-02-09 13:50:09 +03:00
Lombiq
47a1dbaaa2 Adding the ability to have placeholders for content fields, fixes #5943 2016-02-08 18:01:03 +01:00
Daniel Stolt
51ad9fc792 Merge pull request #6356 from infofromca/fix6354 
#6354: delete one duplicate definition of script for jQueryUI for orchard 1.10
 2016-02-07 23:26:48 +01:00
andy zheng
4401fb1e7f delete one duplicate definition of script for jQueryUI 2016-02-07 07:42:47 -05:00
Daniel Stolt
a584b27c35 Changed to manual bootstrapping of LayoutEditor Angular app. Fixes #5722. 2016-02-06 23:54:40 +01:00
Daniel Stolt
1b02c5c03c Fixed errors in jQuery resource manifest. 2016-02-06 23:53:15 +01:00
andy zheng
8278901e22 fix #6343 2016-02-05 19:37:48 -05:00
Matthew Harris
c4b83093e8 [Fixes #6344] Remove unused place tag 2016-02-05 19:44:57 +00:00
jtkech
854c4ef73c Update Index.cshtml 2016-02-05 00:08:35 +01:00
jtkech
0e3e7f0c90 Update OutputCacheFilter.cs 2016-02-05 00:04:20 +01:00
Sebastien Ros
c8ab7f187f Fixing jQuery UI resources 
#6329
 2016-02-04 13:43:07 -08:00
Sebastien Ros
0c6bcb52e9 [Fixes #6329] Fixing fonts file location in Orchard.Resources 2016-02-04 13:43:06 -08:00
Sebastien Ros
57fd0f6244 [Fixes #6328] Using FontAwesome from Orchard.Resources 2016-02-04 13:43:05 -08:00
Sebastien Ros
4cabab9c6d [Fixes #6327] Removing TaskLease dependency in JobsQueue 2016-02-04 13:43:04 -08:00
Sipke Schoorstra
96a4af5a68 Removed unneeded HTML file. 2016-02-04 21:28:27 +01:00
Sebastien Ros
3630473e69 Removing roslyn compilation for now 2016-02-01 11:55:04 -08:00
Sebastien Ros
9916037d8e Updating version numbers 2016-02-01 10:13:05 -08:00
Sebastien Ros
b3b4b38229 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
	src/Orchard.Web/Web.config
 2016-02-01 10:12:06 -08:00
Sebastien Ros
c890f5b5c6 Updating version number 2016-02-01 10:07:18 -08:00
Sebastien Ros
52aade5411 Removing unused references 2016-02-01 10:03:13 -08:00
Sebastien Ros
a14b006d70 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard/ContentManagement/DefaultContentManager.cs
 2016-02-01 09:36:47 -08:00
Sebastien Ros
77f4382fe8 Merge branch '1.9.x' into 1.9.3 2016-02-01 09:33:22 -08:00