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

12787 Commits

Author SHA1 Message Date
Simon Busborg
ec0a9493e2 removed whitespace issue 2016-01-28 14:25:40 +01:00
Simon Busborg
e0ba030b1f fixes U4-7851 Grid layout RTE formats not being applied. 2016-01-28 14:19:46 +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
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
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
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
Mads Rasmussen
c9f71ce067 Fixes: U4-7772 Cursor jumps when editing alias in new ContentType editor + U4-7832 Editing property alias chomps 1st character 2016-01-26 21:07:15 +01:00
Sebastiaan Janssen
2f8c43c689 Merge pull request #1057 from umbraco/temp-U4-7836 
U4-7836 YSOD when upgrading Umbraco with error during AddUserDataClaims
 2016-01-26 19:25:04 +01:00
Shannon
7a25cb52b2 updates the repository cache policies so that we aren't keeping everything in cache unnecessarily 2016-01-26 19:13:42 +01:00
Shannon
19bc97a7fd Removes the static (hack) cache for content types for creating published content 2016-01-26 18:56:29 +01:00
Shannon
72900ef3b3 U4-7813 Enable MiniProfiler to profiler during startup 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2016-01-26 17:56:25 +01:00
Shannon
74ddd09c5d U4-7836 YSOD when upgrading Umbraco with error during AddUserDataClaims - this also ensures that no empty/null sections can be added to the user object since this is where the original exception was coming from. 2016-01-26 17:05:46 +01:00
Mads Rasmussen
fd58c3b3c6 Fixes: U4-7815 List view - bug when custom list view has been created. 2016-01-26 16:09:48 +01:00
Sebastiaan Janssen
e461cb92da U4-7787 Shorthand use of ?altTemplate= doesn't work 
#U4-7787 Fixed
 2016-01-26 16:07:44 +01:00
Shannon
7cdaacf149 adds assert 2016-01-26 14:26:16 +01:00
Shannon
7cfdc81555 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-26 14:24:18 +01:00
Shannon
aeb6babad0 fixes template unit tests 2016-01-26 14:24:07 +01:00
Simon Busborg
24f38e0c0e Fixed illustration width in safari 2016-01-26 14:18:07 +01:00
Simon Busborg
8cb9d6858e U4-7722 Show checkmark when hover image in media grid 2016-01-26 14:18:06 +01:00
Claus
17629ea1b5 Merge pull request #1055 from umbraco/temp-U4-7698 
Ensures that all property data is deleted for a doc type when it is b…
 2016-01-26 14:13:46 +01:00
Shannon
779e7d7667 fixes ContentTypeRepositoryTest 2016-01-26 13:46:55 +01:00
Shannon
7117c6f085 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-26 13:44:05 +01:00
Shannon
ba9ebd394b fixes MediaTypeRepositoryTest's 2016-01-26 13:43:56 +01:00
Simon Busborg
3ed340bde1 Fixes weird skew in media grid 2016-01-26 13:29:39 +01:00
Shannon
7d616cf937 Ensures that all property data is deleted for a doc type when it is being deleted, updates the ChangeDocType to not use the legacy EnsuredPage, updates the non-legacy EnsuredPage.ClientTools to support the legacy logic. 2016-01-26 12:13:53 +01:00
Mads Rasmussen
fa1c227136 U4-7724 Click on remove file(s) link, on an item in the media section, doesn't set dirty for form 2016-01-26 12:01:04 +01:00
bjarnef
738f24d6c9 Hide search input behind split slider 
Ensure search input is covered by the split slider, when it is dragged
all the way to the left similar to how tree nodes is covered.
 2016-01-26 11:38:04 +01:00
Shannon Deminick
3e5050ee9a Merge pull request #1054 from umbraco/temp-U4-7701 
Fixes: U4-7701 Unable to Delete Member in Member Section
 2016-01-26 11:26:33 +01:00
Mads Rasmussen
f30c05b37f add/remove semicolons 2016-01-26 10:47:36 +01:00
Mads Rasmussen
7fce8583c8 Fixes: U4-7701 Unable to Delete Member in Member Section 2016-01-26 10:34:31 +01:00