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

15357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Woestenborghs
647fbea066 Use product name in migration runner instead of Umbraco productname 
Fixes http://issues.umbraco.org/issue/U4-7872
 2016-02-01 11:48:32 +01:00
Sebastiaan Janssen
b69bd8617f Merged branch dev-v7 into dev-v7 2016-02-01 09:28:31 +01:00
Sebastiaan Janssen
924d2a0d88 U4-7669 Update Newtonsoft.Json dependency to v8.0.1 from v6.0.5 
#U4-7669 Fixed
 2016-02-01 09:28:20 +01:00
Claus
17fdc7d246 Merge pull request #1077 from abryukhov/patch-3 
Update UI language ru.xml
 2016-01-31 12:26:12 +01:00
Alexander Bryukhov
10fc60def3 Update UI language ru.xml 
Based on keys added in 7.4 nightly build 155
 2016-01-31 12:05:07 +06:00
Shannon
cf022ca6a4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-28 19:35:20 +01:00
Shannon
e2bf27e53f U4-7857 Flexible Load Balancing does not sync with the correct timeout threshold 2016-01-28 19:35:11 +01:00
Claus
db6f492aac Merge pull request #1056 from umbraco/temp-U4-7695 
U4-7695 Media items are not updated when a new crop is added to Image…
 2016-01-28 18:30:37 +01:00
Simon Busborg
a1dcd2739b Merge branch 'abryukhov-patch-5' into dev-v7 2016-01-28 15:32:35 +01:00
Simon Busborg
ef4bb3e341 Merge branch 'patch-5' of git://github.com/abryukhov/Umbraco-CMS into abryukhov-patch-5 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
 2016-01-28 15:29:56 +01:00
Shannon Deminick
8c90e2fd58 Merge pull request #1066 from umbraco/temp-U4-7847 
Fixes: U4-7847 Do not allow folders to be created underneath content types (or data types)
 2016-01-28 15:22:03 +01:00
Shannon
a1156472fb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-28 15:16:37 +01:00
Shannon
d526ff43f2 Merge branch 'temp-RepoCachePerf' into dev-v7 2016-01-28 15:16:02 +01:00
Simon Busborg
dc6c15e150 Merge pull request #1058 from greystate/fix-querybuilder-button 
U4-7842 Query Builder "Sort by" direction button changes case when clicked
 2016-01-28 15:16:01 +01:00
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
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
Shannon Deminick
2d17603703 Merge pull request #1068 from glennweb/dev-v7 
Incorrect case for column AllowedId in select query.
 2016-01-28 09:30:37 +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
5f43b360ec Merge remote-tracking branch 'origin/dev-v7' into temp-RepoCachePerf 2016-01-27 19:44:04 +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
Shannon Deminick
409d6dd71c Merge pull request #1062 from umbraco/temp-U4-7844 
U4-7844 - Add support for models in controllers
 2016-01-27 13:54:45 +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