yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,544 Commits 4 Branches 7 Tags
cf0b72fd77fa87cc8b1805efcffd96b67ab0b1bf
Commit Graph

12966 Commits

Author SHA1 Message Date
Claus
0bc6b600a5 Merge pull request #1073 from umbraco/temp-U4-7806 
Fixes: U4-7806 Possible to interactive with property editor "preview"…
 2016-01-28 15:10:54 +01:00
Simon Busborg
fb4cf18873 Merge pull request #1053 from abryukhov/patch-7 
Latest update UI language ru.xml
 2016-01-28 15:03:59 +01:00
Simon Busborg
edd47814ee Merge pull request #1042 from abryukhov/patch-6 
Update UI language ru.xml
 2016-01-28 15:02:14 +01:00
Stephan
107e66e4da Merge pull request #1071 from umbraco/temp-U4-7682 
U4-7682 Add option to DatabaseServerMessengerOptions to force a Cold …
 2016-01-28 14:33:02 +01:00
Simon Busborg
ec0a9493e2 removed whitespace issue 2016-01-28 14:25:40 +01:00
Mads Rasmussen
549a8380c3 Fixes: U4-7806 Possible to interactive with property editor "preview" in document type editor 2016-01-28 14:23:53 +01:00
Simon Busborg
e0ba030b1f fixes U4-7851 Grid layout RTE formats not being applied. 2016-01-28 14:19:46 +01:00
Shannon
256849f8a6 adds nicer profiling during startup for app event handlers. 2016-01-28 14:19:38 +01:00
Stephan
c9c451be65 U4-7682 Minor review adjustments 2016-01-28 14:19:32 +01:00
Shannon
1fcea083e7 Ensures no profiling occurs when not in debug mode 2016-01-28 14:10:13 +01:00
Shannon
85d6ee5713 Merge branch '7.3.6' of https://github.com/umbraco/Umbraco-CMS into 7.3.6 2016-01-28 13:50:55 +01:00
Shannon
ec81583741 Fixes case sensitive matching on alias in TemplateRepository 2016-01-28 13:50:45 +01:00
Sebastiaan Janssen
332da9bf2d Merge pull request #1070 from umbraco/temp-RepoCachePerf736 
Temp repo cache perf736
 2016-01-28 12:15:24 +01:00
Shannon
a0036d925e U4-7682 Add option to DatabaseServerMessengerOptions to force a Cold Boot if there are too many instructions 2016-01-28 12:14:30 +01:00
Shannon
81a99d6f7d adds null check and ensures that SetInternalRedirectPublishedContent cannot be called with a null result 2016-01-28 10:19:51 +01:00
Shannon
e912238574 Saw there was another place with the incorrect case for the column name AllowedId 2016-01-28 09:32:01 +01:00
glennweb
5d3e580cda Saw there was another place with the incorrect case for the column name AllowedId 2016-01-28 15:12:14 +10:00
glennweb
93aadc196f Fixed incorrect case property in select statement causing case sensitive database's to throw error. 
https://our.umbraco.org/forum/core/general/49619-Went-wrong-in-a-moment-Invalid-column-name
 2016-01-28 15:07:18 +10:00
Shannon
9a830e5de6 fixes tests 2016-01-27 19:44:36 +01:00
Shannon
5f43b360ec Merge remote-tracking branch 'origin/dev-v7' into temp-RepoCachePerf 2016-01-27 19:44:04 +01:00
Shannon
7d9ba0e36e manually backports changes from 7.4 fixes 2016-01-27 19:42:06 +01:00
Shannon
6c5e09fd84 Ensures that the main content type repositories are returning the correct result from their GetAll methods. Fixes the FullDataSetRepositoryCachePolicy to ensure that any request with Ids actually returns the result of GetAll and then filters to ensure caching is correct. 2016-01-27 19:26:08 +01:00
Shannon
5d96534678 fixes tests 2016-01-27 19:20:24 +01:00
Shannon
0cefdcbc20 Fixes ContentTypeBaseRepository - there were several hack in place to query by GUID but this is totally irrelavent because we are caching them all so the result should be from the GetAll(), so this removes all of those hacks which greatly simplifies things. This fixes the MapContentTypes and MapMediaTypes methods - before this was looking up a collection and then recursing back to Get(int) (but we already have all of the data we need), then it was storing a lot of arrays in memory to build up an Entity when it's much faster to just iterate forward only and build up the entity. This saves 5 SQL calls on startup. 2016-01-27 18:55:10 +01:00
Shannon
02b74a5059 Fixes FullDataSetRepositoryCachePolicy so that whenever Ids are requested, it retrieves all of the items and then post filters - ensuring there's no additional trips to the database. Fixes MemberTypeRepository so that calls to PerformGet(int) are wrapping the GetAll() call. 2016-01-27 18:51:37 +01:00
Sebastiaan Janssen
2913a0f624 With only LineFeeds then...? 2016-01-27 17:15:30 +01:00
Sebastiaan Janssen
1c58360891 Another attempt at fixing unit tests 2016-01-27 15:47:37 +01:00
Shannon
49fc068b38 Merge remote-tracking branch 'origin/7.3.6' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/UmbracoContext.cs
 2016-01-27 15:42:06 +01:00
Mads Rasmussen
b671595608 fix tab indention 2016-01-27 15:34:15 +01:00
Mads Rasmussen
4bc51feccd fix semicolons 2016-01-27 15:31:29 +01:00
Sebastiaan Janssen
1d5696a08b Merged branch dev-v7 into dev-v7 2016-01-27 15:30:54 +01:00
Sebastiaan Janssen
bd2b6e0f93 Should hopefully fix unit tests 2016-01-27 15:30:34 +01:00
Mads Rasmussen
98c65ff8f4 U4-7847 Do not allow folders to be created underneath content types (or data types) 2016-01-27 15:29:53 +01:00
Shannon
3addffbd34 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-27 15:23:10 +01:00
Shannon
dbb7e3825d Fixes events for containers 2016-01-27 15:22:58 +01:00
Claus
1d1dd87d44 Merge pull request #1059 from umbraco/temp-U4-7832-U4-7772 
Fixes: U4-7772 Cursor jumps when editing alias in new ContentType edi…
 2016-01-27 15:12:23 +01:00
Simon Busborg
592ccd29e3 Merge pull request #1065 from umbraco/temp-U4-7846 
Fixes: U4-7846 Media grid missing min-height on item + make media item sizes as attr so they can be set outside the directive
 2016-01-27 15:01:24 +01:00
Shannon
0ea9ce1363 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-27 14:31:12 +01:00
Shannon
cc4c7b0d88 Adds events for creating/deleting containers 2016-01-27 14:30:57 +01:00
Claus
800df325a9 Merge pull request #1063 from umbraco/temp-U4-2670 
U4-2670 Add event to modify the model before being sent to render
 2016-01-27 14:30:40 +01:00
Mads Rasmussen
1c04aa377c fix tab indention 2016-01-27 14:21:27 +01:00
Simon Busborg
1f1aeaf446 Merge pull request #1064 from umbraco/temp-U4-7845 
Fixes: U4-7845 Show drop zone in media section + fix recycle bin for …
 2016-01-27 14:19:22 +01:00
Mads Rasmussen
38e9193573 Fixes: U4-7846 Media grid missing min-height on item + make media item sizes as attr so they can be set outside the directive 2016-01-27 14:18:53 +01:00
Mads Rasmussen
9c5d5f4318 Fixes: U4-7845 Show drop zone in media section + fix recycle bin for content section + localise texts 2016-01-27 13:25:54 +01:00
Shannon
e8dfa056b0 U4-2670 Add event to modify the model before being sent to render 2016-01-27 13:20:13 +01:00
Stephan
81754b37a4 Add support for models in controllers 2016-01-27 12:05:22 +01:00
bjarnef
02e5056987 Change value of vertical-align property. 2016-01-27 09:36:25 +01:00
Claus
c33b488006 Ensuring we only do the base SetupNode stuff if its actually a media type and not a folder requested. 2016-01-27 09:27:56 +01:00
Mads Rasmussen
43e49b75de Add extra div to media grid to fix firefox issue in chrome 2016-01-27 09:21:58 +01:00
bjarnef
5e88fbfad0 Indent of toolbar options in TinyMCE config 2016-01-26 23:52:16 +01:00