Commit Graph

12331 Commits

Author SHA1 Message Date
antoine
28f8194876 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-07 16:23:54 +02:00
antoine
8db67c0ba3 sorting row with last release ui.sortable lib and sorting control published 2014-09-07 16:23:24 +02:00
Kevin Jump
ce521c7624 Reverting SetValue change on CreateContent
Move the content.SetValue out of the if (propertyType == null) call - as
this causes inherited values not to be saved.
2014-09-07 01:59:02 +01:00
antoine
ef6e181eb1 control sorting with editor control (with ui.sortable last version) 2014-09-06 17:40:52 +02:00
antoine
142c4c09e1 control sort before ui.sortable upgrade 2014-09-06 17:35:13 +02:00
Jeremy Pyne
3d0e74522d Fix for dialog size logic.
Fix for css not associated with legend.
2014-09-05 15:32:39 -04:00
Jeremy Pyne
fba6d8ec66 Added codemirror plugin to tinymce v4 used in Umbraco7.
This is a tinymce plugin to seamlessly use the already existing code mirror package in umbraco as the source editor.
The tinymceconfig.config is updated to seamlessly replace the code plugin with the new codemirror plugin. (And the user can switch back to code here if they need to for some reason.)
2014-09-05 15:00:54 -04:00
Shannon
4230668c8b creates new UmbracoTreeAuthorizeAttribute which helps make tree and editor security with webapi a bit more flexible with a different option to authorize against an assigned app based on a tree alias. 2014-09-05 16:08:41 +10:00
Shannon
66e5843ef7 Creates new attribute: WebformsPageTreeAuthorizeAttribute for auto-authorizing webforms editors for a specific tree and thus for a specific application. 2014-09-05 15:47:45 +10:00
Shannon
bb4dd9c418 Merge branch '7.1.5-perf' into 7.2.0 2014-09-05 15:20:46 +10:00
Shannon Deminick
50b49f9ee2 Merge pull request #465 from mattbrailsford/7.1.6-movable-dictionary-tree
Fix U4-5413 Makes the dictionary tree moveable
2014-09-05 15:15:24 +10:00
Shannon Deminick
cf0eb87d03 Merge pull request #468 from codegecko/7.2.0
Made ICultureDictionary, CultureDictionaryFactoryResolver and UmbracoCul...
2014-09-05 15:08:32 +10:00
Shannon Deminick
75f2de2cc8 Merge pull request #467 from danlister/patch-2
Update Dashboard.Release.config
2014-09-05 09:27:48 +10:00
Shannon Deminick
927bf1d3a2 Merge pull request #471 from pynej/markdown-property-type
Markdown property should store to text not varchar.
2014-09-05 09:25:06 +10:00
Jeremy Pyne
24724ca6e8 Markdown property should store to text not varchar. 2014-09-04 16:05:34 -04:00
Jeremy Pyne
fbed14a9e0 Partial Views and Partial View Macro's should allow for folder hierarchy for organization. This changes makes them work much like the Scripts and css folders.
I didn't add a Type drop down like the scripts screen has.  This is unnecessary and cumbersome.  Instead it works like other screens and the user can generate a hierarchy in their files by adding /'s in the names.  This is how it works in Stylesheets works and its a lot cleaner.  I added a note of this to the creation dialogs as well.

For example create a view file with the name myFolder/myView and the system will take care of folder creation automatically.  There is also a delete option.

Other errors fixed:
 Selecting a folder in the scripts lists was generating an error.
 Stylesheets would not create a new folder(but they wold make nested children in existing folders.
 Partial and Macro Views would not use the proper elpers for generating syncTree code.
2014-09-04 10:17:54 -04:00
Shannon Deminick
a0ade0e183 Merge pull request #469 from kolchy/patch-1
Update Gravatar to use protocol relative URL
2014-09-04 10:06:28 +10:00
Kolchy
40fbcc5a99 Update Gravatar to use protocol relative URL
Stops warnings over SSL.
2014-09-04 10:05:43 +10:00
antoine
c04fee2aba Grid controls sortable first approach 2014-09-03 17:26:18 +02:00
benjamin.howarth
8aa5a64883 Made ICultureDictionary, CultureDictionaryFactoryResolver and UmbracoCultureDictionary public instead of internal (cause they're useful to query, and obsoleted umbraco.MacroEngines.ICultureDictionary was/is public) 2014-09-03 09:40:34 +01:00
Dan Lister
dfe89b50ae Update Dashboard.Release.config
Amended dashboard.release.config 'Change password' tab caption casing to match other tab captions
2014-09-02 15:55:34 +01:00
Shannon
db0a87e3ca fixes n+1 queries in MediaRepository.PerformGetAll 2014-09-02 16:40:17 +10:00
Shannon
a75f6d2afd Fixes n+1 on ContentRepository.PerformGetAll 2014-09-02 16:13:31 +10:00
Shannon
b3b813a649 Fixes n+1 queries on DataTypeDefinitionRepository 2014-09-02 14:33:11 +10:00
Shannon
bf401ed7a9 fixes n+1 queries on user type repo 2014-09-02 13:50:35 +10:00
Shannon
34699dc4e1 Fixes some null checks and updates a member test 2014-09-02 13:18:35 +10:00
Shannon
42fe4c77f6 Fixes n+1 queries on template repository 2014-09-02 12:47:46 +10:00
Shannon
c76d09c9b0 fixes n+1 query when assigning user types to users in user repo 2014-09-02 12:21:29 +10:00
Shannon
03f9b89810 fixes the n+1 queries on content and media type controllers and ensures if there are no ids that the query doesn' texeucte. 2014-09-02 11:53:12 +10:00
Shannon
c21dcb0279 Fixes n+1 queries for content and media types when resolving their properties and groups, this fixes the n+1 queries with the scheduled publishing too. Adds a test for template mappings, fixes call for GetAll on EntityController to not be called when there are no ids. 2014-09-02 11:50:04 +10:00
Shannon
eec734783c Fixes n+1 query on UserRepository.GetByQuery 2014-09-02 10:28:21 +10:00
Shannon
df416ccde4 Fixes n+1 query on UserRepository.GetAll with id params 2014-09-02 10:26:11 +10:00
Shannon
9336d21c25 updates to where clause 2014-09-01 18:58:52 +10:00
Shannon
2d36341118 Fixes n+1 queries in the EntityRepository 2014-09-01 18:50:10 +10:00
Shannon
202f582661 Renames TagsRepository to TagRepository, Fixes n+1 queries on entity repository, fixes n+1 queries on tag repository, updates umbraco member types to specify an entity type for IMember and IMemberType so the entity repository can use it. 2014-09-01 18:06:24 +10:00
Shannon
6cacfe599f Gets MediaRepository.PerformGetByQuery, MediaTypeRepository.PerformGetByQuery & MediaTypeRepository.PerformGetAll to not have n+1 2014-09-01 16:27:18 +10:00
Shannon
3822c83dbb fixes content type mappings 2014-09-01 15:14:45 +10:00
Shannon
07035f6b23 Fixes issue with duplicate dictionary entries when wiring up property data 2014-09-01 12:55:10 +10:00
Shannon
8b9397160b Merge branch '7.2.0' into 7.1.5-perf 2014-09-01 10:55:50 +10:00
mattbrailsford
7bcf8c17e5 Makes the dictionary tree moveable by looking up the application alias from the trees registration rather that hard coding to a specific section. 2014-08-28 14:10:22 +01:00
Shannon Deminick
5ac4b2b305 Merge pull request #461 from warrenbuckley/NG-Documentation
NG Documentation improvements
2014-08-28 17:45:51 +10:00
Shannon Deminick
07a52f659d Merge pull request #463 from kgiszewski/feature/rte-config
Fix for U4-5409 headline justification in the RTE
2014-08-28 08:14:19 +10:00
Kevin Giszewski
5420be483c Add style attribute to the headline white-listed attributes 2014-08-27 10:32:29 -04:00
warrenbuckley
29afebdb60 Initial starting work on ng-doc fleshing out for auth.resource.js (Also to see if Core team happy with this before investing too much time) 2014-08-26 15:08:40 +01:00
warrenbuckley
9784a3d868 Add new Grunt Task 'docserve' to rerun ng-docs task & spin up a test server to browse to along with new watch task to recompile generated docs 2014-08-26 15:07:40 +01:00
warrenbuckley
4b46cf9a42 Update .gitignore for output files generated by ng-docs 2014-08-26 14:54:37 +01:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
Shannon
ada2492c44 Merge branch '7.1.6' into 7.2.0
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2014-08-26 09:25:36 +10:00
Shannon
e9b137cde8 Fixes duplicate key error (U4-5385) 2014-08-26 09:20:32 +10:00
Sebastiaan Janssen
33ccf490ab Update nuspec to ask for a valid nuget pkg 2014-08-25 15:53:45 +02:00