lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:16:18 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,168 Commits 83 Branches 32 Tags
7b47356152cb1b0da678a32aaf629afb149fda7a
Commit Graph

10168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros
12a51ea7af [Fixes #5751, #5794] Removing Edit inline 2015-09-21 12:08:19 -07:00
Sebastien Ros
f0b1639143 [Fixes #5616] Revert "Using master content item to create translations" 
This reverts commit fa09e2e83a.
 2015-09-21 11:27:46 -07:00
myates
9bb95efaaa #5836 Fix null ref exception in CommentPartDriver 2015-09-21 10:26:14 +10:00
Daniel Stolt
7278c0286f Fixed a potential exception in Gulpfile when asset group output doesn't exist. 2015-09-19 22:20:29 +02:00
myates
e6c042d1a0 Fix build error 2015-09-19 22:03:12 +10:00
myates
df583ea571 Merge branch 'Orchard-1.9.x' into issue/5829 2015-09-19 21:20:21 +10:00
mvarblow
c7fde5bc72 Update TermCountProcessor.cs 
Don't process the same term multiple times if it happens to be the parent of multiple terms on the list.
 2015-09-18 10:59:32 -04:00
mvarblow
d080037af9 Update TaxonomyService.cs 2015-09-18 10:45:16 -04:00
mvarblow
5a6ba5ddd6 Update ITermCountProcessor.cs 2015-09-18 10:43:53 -04:00
mvarblow
658a5601a5 Update TermsPartHandler.cs 
Queue a single task to process all terms updated within this work context.
 2015-09-18 10:42:54 -04:00
myates
adbab55ffc Comment service now fetches latest (instead of published) when deleting a comment. 2015-09-18 16:45:10 +10:00
Daniel Stolt
52e7fd12b1 Fixed incorrect export condition in LinkFieldDriver. 2015-09-18 02:50:11 +02:00
Daniel Stolt
1edf94756c Changed field drivers to not export empty elements. 
This results in much cleaner recipes.
 2015-09-18 02:42:40 +02:00
Matthew Harris
20fbd99658 updated all instances of RemoveUrl checks 2015-09-17 22:58:58 +01:00
Matthew Harris
d9a0e040c1 don't overwrite confirmRemoveMessage 2015-09-17 22:54:47 +01:00
Matthew Harris
4aaf4d34d0 amends based on PR feedback 2015-09-17 21:58:12 +01:00
Sipke Schoorstra
d310a56c38 Merge pull request #5814 from OrchardCMS/task/machinenameprovider 
Refactor renamed IMachineNameProvider.
 2015-09-17 21:52:15 +01:00
Sipke Schoorstra
8d0205ebfb Changed namespace. 2015-09-17 21:51:58 +01:00
Sébastien Ros
ee59a61733 Merge pull request #5815 from OrchardCMS/issue/recipeexecutiontimeout 
Added configurable RecipeExecutionTimeout properties.
 2015-09-17 12:06:04 -07:00
Matthew Harris
7143792c0e fix #5826 2015-09-17 19:44:25 +01:00
Sebastien Ros
4214329a1f Prevent unnecessary db calls for containers 2015-09-16 17:52:33 -07:00
Sebastien Ros
921b2472f1 Adding filter for own content 2015-09-16 17:52:27 -07:00
Sebastien Ros
9e9e19c439 Add setting to hide Container editor 2015-09-16 17:52:13 -07:00
Sebastien Ros
f3595881fe Hide taxonomy link if permission is not granted 2015-09-16 17:52:04 -07:00
Sebastien Ros
ba36eae848 Prevent MediaLibrary popup without permissions 
If the user doesn't have ManageMedia permissions,
the markdown editor will use a specific image editor.
 2015-09-16 17:51:50 -07:00
Sebastien Ros
0bf76dc7ac Implementing a positioned wrapper for text elements 
When adding a text directly to a zone, the position will now
be taken into account. This is also useful for the Capture feature.

Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-16 17:51:23 -07:00
Sipke Schoorstra
951391f4dd Refactored DefaultMessageBus. 
* Replaced private GetHostName with IHostNameProvider.
 2015-09-16 23:18:19 +01:00
Daniel Stolt
b011594be6 Improved asset manifest file change handling in Gulpfile.js. 
Code now only restarts watchers for the asset groups in the changed asset manifest file, rather than *all* asset groups. The "build" task now forces rebuild of a given asset group if its asset manifest file is newer than its concatenated output. Refactored and cleaned up the code.
 2015-09-16 16:56:51 +02:00
Sipke Schoorstra
8ee09eacd0 Added configurable RecipeExecutionTimeout properties. 
* Added RecipeExecutionTimeout to SetupController.
* Added RecipeExecutionTimeout to ExecuteRecipeAction.
* Added property-injection registration source to ShellContainerFactory so that controllers can have their public properties be configured.
 2015-09-15 23:41:58 +01:00
Sipke Schoorstra
3896a8f921 Minor cleanup and formatting. 2015-09-15 23:02:58 +01:00
Sipke Schoorstra
c6a87f5228 Refactor renamed IMachineNameProvider. 2015-09-15 22:58:21 +01:00
Sipke Schoorstra
66ff5d36e9 Merge pull request #5810 from Codinlab/issue/5809 
Fixes #5809 : Layouts : DisplayText encoded twice in Design mode
 2015-09-15 14:03:55 +01:00
Thierry Fleury
749ff5dc72 Fixes #5809 : Layouts : DisplayText encoded twice in Design mode 2015-09-15 14:53:52 +02:00
Sipke Schoorstra
40071a6050 Fixed missing feature states exception. 
- Fixed an issue with Orchard failing to initialize when the Settings_ShellFeatureRecord contains orphaned features (which happens when a module has been removed).
- Added unit tests.
 2015-09-15 12:38:27 +01:00
Sipke Schoorstra
40f1e39622 Merge pull request #5806 from OrchardCMS/issues/5805/outputcachesettings-importexport 
Implemented output cache routes import/export.
 2015-09-15 10:27:23 +01:00
Sipke Schoorstra
7fae88a879 Implemented output cache routes import/export. 
Fixes #5805
 2015-09-14 23:33:17 +01:00
mvarblow
d958df3041 Update TermsPartHandler.cs 2015-09-14 17:03:30 -04:00
mvarblow
8690278bed Update TaxonomyService.cs 
Improves, but does not fully resolve, the performance problems described in issue #5663.
 2015-09-14 17:01:08 -04:00
Sipke Schoorstra
d0e7c09ba5 Updated AliasMap 
Ordering by key Length rather than key value.
 2015-09-14 13:21:57 +01:00
Nicholas Mayne
85c4a99c13 Merge pull request #5798 from mvarblow/patch-4 
Fixed typo in Sites.Config comment.
 2015-09-13 17:35:28 +01:00
Sipke Schoorstra
a3fe3592c6 Merge pull request #5799 from mvarblow/patch-5 
Code clean-up in TermCountProcessor.cs
 2015-09-13 13:42:39 +01:00
mvarblow
a2c31a1e5c Code clean-up in TermCountProcessor.cs 
Removed an unused field and unused using statements.
 2015-09-13 08:33:08 -04:00
mvarblow
3f6dfa3dec Fixed typo in Sites.Config comment. 2015-09-12 20:54:54 -04:00
Sipke Schoorstra
fe43ef4912 Small UI improvement to Content / Content Definition export UI. 2015-09-12 19:25:55 +01:00
Sipke Schoorstra
5540e98079 Fixed MultiTenancy feature specflow tests. 2015-09-12 15:50:38 +01:00
Sipke Schoorstra
8ca6c3367a Fixed Pages specflow test. 
Note: this changes the specification from the hime page being accessible only via ~/ to being accessible via both ~/ as well as ~/my-page.
 2015-09-12 15:03:12 +01:00
Sipke Schoorstra
9e3d9c8557 Changed home alias and fixed blog feature specflow test. 
- The Home Alias change causes home page content items to be reachable via two URLS (e.g. ~/ and ~/my-blog), so accomodated the specflow test for that.
- Fixed a bug with HomeAlias where it would not find content items if their display route values contains keys other than "Id". Blogs uses "blogId", so the former implementation of just looking up the "Id" entry was too naive.
 2015-09-12 14:44:46 +01:00
Sébastien Ros
f9ef297777 Merge pull request #5780 from mjy78/issue/5779 
[Fixes #5779] Query and Taxonomy Elements should include value attribute for default option
 2015-09-11 15:07:51 -07:00
Sébastien Ros
801b8998db Merge pull request #5783 from mjy78/issue/20377 
[Fixes #4206] Ensure comment tokens available to anti-spam module.
 2015-09-11 15:03:45 -07:00
Sipke Schoorstra
158069ef47 Formatted specflow files. 2015-09-11 19:46:09 +01:00