lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,212 Commits 73 Branches 31 Tags 239 MiB
d173816619
Commit Graph

10212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lombiq
d173816619 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
	src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js
	src/Orchard.Web/Core/Navigation/Styles/navigation-admin.css
	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
	src/Orchard/Commands/CommandBackgroundService.cs.rej
 2015-12-03 00:07:28 +01:00
Lombiq
15d27043d7 Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:00:36 +01:00
Sipke Schoorstra
33484ae31a Fixed date and time picker. 2015-12-02 23:27:46 +01:00
Sipke Schoorstra
c4f961105d Updated Orchard.Resources descr. by Daniel Stolt. 2015-12-01 22:54:06 +01:00
Lombiq
4901b156f5 Adding PowerShell script to clean the solution folder, fixes #2810 2015-12-01 00:59:14 +01:00
Lombiq
408534c915 Merge branch '1.9.x' into dev 2015-11-30 22:58:33 +01:00
Lombiq
c2dd09af5e Fixing that NavigationQueryMenuItems and BlogArchives widgets couldn't be export/imported due to the lack of an identity, fixes #3488. 
Since the Projections migrations is already kind of a mess
 2015-11-30 22:50:19 +01:00
Sipke Schoorstra
dd59d7c385 Merge pull request #6104 from Codinlab/fixes/6033 
Fixes #6033 : EmailActivity fails when run via background task
 2015-11-29 19:10:49 +01:00
Thierry Fleury
5b53671a2a Revert "Removing unnecessary resolution" 
This reverts commit 9b91b1b260.
 2015-11-29 18:03:58 +01:00
Benedek Farkas
fa0c93724e Merge pull request #6084 from OrchardCMS/1.9.x 
Adding dynamic Content property to the Content Item class
 2015-11-26 22:15:34 +01:00
Lombiq
af76305088 Adding dynamic Content property to the Content Item class for easily accessing Parts and Fields. Thanks Sébastien! :) 2015-11-26 22:11:40 +01:00
Sipke Schoorstra
7b6f0ec56f Merge pull request #6076 from PaulDevenney/Issues/6075/SetupSlowRecipes 
Added two optimisations to avoid duplicate work
 2015-11-26 17:15:40 +01:00
PaulDevenney
351e558fcd Added two optimisations to avoid duplicate work 
Avoids many retrievals of ShellStateRecord and stops enabling the same
feature multiple times. This can significantly improve recipe execution
time for those recipes with large numbers of features with long
dependency chains.
 2015-11-25 17:41:03 +00:00
Benedek Farkas
c0cc167a87 Merge branch '1.9.x' into dev 2015-11-25 15:44:26 +01:00
Lombiq
ab12ff6a05 Adding notes about Orchard 2 to the README 2015-11-25 15:43:37 +01:00
Sipke Schoorstra
f7ba32a0c2 Merge pull request #6054 from OrchardCMS/feature/configurable-snippets 
Added support for configurable snippet elements.
 2015-11-24 23:20:01 +01:00
Sipke Schoorstra
37550593d4 Added support for reusing the same field in a single snippet file. 2015-11-24 23:19:06 +01:00
Lombiq
b9091a7889 Removing unnecessary if when creating shape alternates 2015-11-24 21:00:34 +01:00
Lombiq
53317d97c5 Revert "Fixing that TinyMCE is encoding special chars" 
This reverts commit 188fabe233.
 2015-11-24 20:54:41 +01:00
Daniel Stolt
cee6539430 Fixed the things that someone always forgets. ;) 
- Fixed build warnings and cleaned up Web.config files of new modules.
- Added missing project dependencies to new modules.
- Added new modules to Azure solution.
 2015-11-24 19:35:27 +01:00
Daniel Stolt
b6dc75d4f9 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Orchard.Web.csproj
 2015-11-24 19:20:05 +01:00
Daniel Stolt
eb81c20f04 Set UseGlobalApplicationHostFile=True in Orchard.Web.csproj. 
This prevents VS2015 from creating a local applicationHost.config file in the solution, which in our case is excluded from source control anyway and therefore isn't used as intended.
 2015-11-24 19:14:31 +01:00
Lombiq
1c4c64b812 Fixing that widgets with name containing dash can't have named alternates #3379 2015-11-24 17:17:12 +01:00
Lombiq
c5fb96ca4f Fixing that Workflows activities are not measured in relative coordinates 2015-11-24 14:23:20 +01:00
Lombiq
188fabe233 Fixing that TinyMCE is encoding special chars 2015-11-24 14:13:41 +01:00
Sipke Schoorstra
7b47356152 Merge pull request #6062 from OrchardCMS/feature/resources 
Orchard.Resources - Consolidate third-party client-side resources into dedicated module
 2015-11-24 01:45:40 +01:00
Sipke Schoorstra
a09c2045c5 Consolidated separate features into a single one. 2015-11-24 01:44:49 +01:00
Sébastien Ros
7d689710cc Merge pull request #6067 from MpDzik/pr/tokens-1.9.x 
Fix handling braces in tokens
 2015-11-23 08:56:36 -08:00
Marek Dzikiewicz
715d557f32 Fix handling braces in tokens 
This brings Tokenizer changes from changeset
423fec90b3
 2015-11-22 18:34:27 +01:00
Sipke Schoorstra
3da3ab8a49 Added Uri. 2015-11-21 15:49:23 +01:00
Sipke Schoorstra
1271539b0a Added BlockUI and Moment. 2015-11-21 15:42:03 +01:00
Sipke Schoorstra
599624c3b0 Added History and Knockout and updated MediaLibrary. 2015-11-21 15:09:56 +01:00
Sipke Schoorstra
ddddb7407f Added Bootstrap and FontAwesome. 2015-11-21 14:21:29 +01:00
Sébastien Ros
162ec9410c Merge pull request #6059 from flew2bits/InvalidateNewMediaProfileCache2 
[Fixes #6051] Invalidate cache when a profile is changed
 2015-11-20 14:18:27 -08:00
Sébastien Ros
db1efab940 Merge pull request #6060 from mkinawy/issue/6052 
[Fixes #6052] Href should be no-op when applied on absolute url
 2015-11-20 14:17:12 -08:00
mkinawy
d0175e6ccd reverting file annotations 2015-11-21 00:12:36 +02:00
mkinawy
23d81181ed fixes #6052 by making Href return the url path as-is if it starts with http or https 2015-11-21 00:07:08 +02:00
flew2bits
cbcffb52d0 Fixed braces 2015-11-20 15:35:52 -05:00
flew2bits
0da9370296 Added signal to invalidate media profile cache when newly published. 2015-11-20 15:20:03 -05:00
Sébastien Ros
def163953c Merge pull request #6057 from mkinawy/issue/5978 
[Fixes #5978] Move Select button at the top in modal Media Library frame
 2015-11-20 12:09:13 -08:00
mkinawy
4db088fb9c fixes #5978 by moving the select button to the top of the media picker window and hides the save button untill some image is selected 2015-11-20 21:08:10 +02:00
Sipke Schoorstra
8258bb3589 Moved AngularJS and Underscore to Resources. 2015-11-20 18:36:25 +01:00
Sipke Schoorstra
febdc19e81 Created initial version of Orchard.Resources module. 
- Migrated all jQuery usages from Orchard.jQuery to Orchard.Resources.
- Deprecated Orchard.jQuery.
 2015-11-20 00:21:39 +01:00
Sébastien Ros
a02e6e8ab7 Merge pull request #6055 from MpDzik/pr/tokens-1.9.x 
Fix TextTokens - Format and TrimEnd
 2015-11-19 14:40:31 -08:00
Marek Dzikiewicz
b3bf80395a Fix TextTokens - Format and TrimEnd 
This fixes the Format and TrimEnd tokens and adds unit tests for
all TextTokens.
 2015-11-19 23:01:50 +01:00
Sébastien Ros
0e627f8810 Renaming css selector for comment id 2015-11-19 12:36:38 -08:00
Sébastien Ros
d64bb02783 Merge pull request #6015 from ryandrewburnett/dev 
Fixed reply button and comment link and added useful CSS class.
 2015-11-19 12:35:21 -08:00
Sébastien Ros
2f9a2c0c38 Merge pull request #6041 from sunz7/issue/6000 
[Fixes 6000] Fixed typo in IndexingCommands.cs
 2015-11-19 12:26:20 -08:00
Sébastien Ros
f701482ff9 Merge pull request #6044 from DanielLackenbyBede/daniellackenbybede/bug/6043/listable_content 
[Fixes #6043] Filter out when no contentTypeNames provided
 2015-11-19 12:25:05 -08:00
Sébastien Ros
bd00caf5be Merge pull request #6050 from Codinlab/fixes/6023 
Fixes #6023 : Ellipsize can spilt an HTML encoded character
 2015-11-19 12:19:11 -08:00