Sébastien Ros
bb41f1f559
Merge pull request #5831 from OrchardCMS/feature/ownmedia
...
Implementing own media management
2015-09-21 15:08:19 -07:00
Sébastien Ros
5903f75665
Merge pull request #5828 from OrchardCMS/feature/layoutpermission
...
Adding ManageLayout permission
2015-09-21 15:07:57 -07:00
Sébastien Ros
46182edc5d
Merge pull request #5827 from rtpHarry/1.9.x
...
[Fixes #5826 ] Restore placements confirmation message fix
2015-09-21 14:36:44 -07:00
Sebastien Ros
accd4196dc
Implementing own media management
2015-09-21 14:09:37 -07:00
Sebastien Ros
d3d85f3519
Adding ManageLayout permission
2015-09-21 14:04:37 -07:00
Sébastien Ros
6e90f704f8
Merge pull request #5833 from mjy78/issue/5829
...
[Fixes #5829 ] Cannot delete spam comment when viewing comment details
2015-09-21 13:02:32 -07:00
Sébastien Ros
497b782a6a
Merge pull request #5837 from mjy78/issue/5836
...
#5836 Fix null ref exception in CommentPartDriver
2015-09-21 12:58:01 -07:00
Sebastien Ros
bc935f18b3
Fixing unit tests
2015-09-21 12:45:57 -07:00
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
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
myates
adbab55ffc
Comment service now fetches latest (instead of published) when deleting a comment.
2015-09-18 16:45:10 +10: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
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
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
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
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
myates
92b7ad7554
Issue 20377 - Ensure comment tokens available to antispam module.
2015-09-11 17:15:42 +10:00
myates
18bb847488
Force empty value attribute on default option label in taxonomy and query element dropdown lists.
2015-09-11 14:19:52 +10:00
Sébastien Ros
47133604c3
Merge pull request #5676 from RoyalVeterinaryCollege/3404
...
[Fixes #3404 ] Added Required attribute to Enumeration and Numeric Fields
2015-09-10 12:24:28 -07:00
Sebastien Ros
80b93e412a
Supporting custom display type for search results
2015-09-09 15:44:53 -07:00
Sebastien Ros
e839f84537
Fixing unit test
...
The ThemeExtensionFolder stub should have been used
2015-09-09 14:53:16 -07:00
Sebastien Ros
a548e47f90
[ Fixes #5283 ] Adding some documentation for ResourceDefinition.SetVersion
...
It has to be a vallid SermVer format.
2015-09-09 14:52:41 -07:00
Sebastien Ros
89e8658f49
Improving protected zones in settings UI
...
Protecting MaxPagedCount
Protecting BaseUrl
Unhiding BaseUrl and SuperUser so that users can see what the values are
2015-09-09 11:27:18 -07:00
Sebastien Ros
6d255f24ab
Fixing exception when the Default layer doesn't exist
2015-09-09 09:25:01 -07:00
Sebastien Ros
e8f0ba6ec7
Fixing RecipeManagerTests
2015-09-08 17:12:44 -07:00
Sebastien Ros
60798f9346
Fixing TokenManagerTests
2015-09-08 17:09:53 -07:00
Sebastien Ros
c83f5d88cb
Supporting lazy cache manager resolution
2015-09-08 17:04:45 -07:00
Sebastien Ros
2f2134412e
[ Fixes #5492 ] Adding JavaScriptEncode token
2015-09-08 16:13:55 -07:00
Sébastien Ros
1e6b6bb24f
Merge pull request #5568 from Codinlab/Tokens
...
Token chaining improvements
2015-09-08 16:08:17 -07:00
Sébastien Ros
16de29dabd
Merge pull request #5652 from Codinlab/issues/5614
...
Fixes #5614 : ContentPickerField and LayoutPart issue
2015-09-08 15:57:38 -07:00
Sebastien Ros
691809cd85
[ Fixes #5733 ] Update default Layout state settings
2015-09-08 15:40:28 -07:00
Sébastien Ros
ce1df8d794
Merge pull request #5677 from dcinzona/Gulpfile-watch-assets.json
...
Enables gulp watch of Assets.json
2015-09-08 11:37:54 -07:00
Sébastien Ros
74be36d8a3
Merge pull request #5763 from phillipsj/1.9.x
...
Updating DynamicForms Module.txt
2015-09-08 11:11:12 -07:00
Jamie Phillips
2bb7eb2f91
Updating DynamicForms Module.txt
...
The CustomForms module name and website were listed.
2015-09-08 13:06:04 -04:00
