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

11798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
bf7473145f Merge pull request #577 from abjerner/patch-4 
Moved the right click action for the tree header
 2014-12-09 16:06:56 +11:00
Shannon Deminick
01a309ef42 Merge pull request #582 from arknu/propertyeditor-localization 
U4-5101: Localize property editors (updated)
 2014-12-09 13:08:19 +11:00
Shannon Deminick
bf4d0a8d01 Merge pull request #581 from readingdancer/Fix_for_5364_Second_Version 
Fix for issue U4-5364 without trying to fix the localization of error msg.
 2014-12-09 12:54:37 +11:00
arknu
77fd2c9444 Update translations for Grid 2014-12-08 18:36:51 +01:00
arknu
30042aae6d U4-5101: Localize Grid property editor 2014-12-08 17:46:32 +01:00
arknu
8bc9fb9242 U4-5101: Localize Image Cropper property editor 2014-12-08 17:41:03 +01:00
arknu
482e90dbc0 U4-5101: Localize Content Picker property editor 2014-12-08 17:41:02 +01:00
arknu
0b61546633 U4-5101: Localize Tags property editor 2014-12-08 17:41:01 +01:00
arknu
ca69e64846 U4-5101: Localize Related Link property editor 2014-12-08 17:37:47 +01:00
Chris Houston
6e60aa17dc Fix for issue U4-5364 without trying to fix the localization of the error text. 2014-12-08 15:16:37 +00:00
Shannon
f60884e796 reverts change to umbraco module to set the original URL when using SSL... there should be no need to specify anything differently here. If there's an explicity base path and url then use the basePath config option. 2014-12-08 17:34:54 +11:00
Shannon
d2dbd91b17 Fixes merge issues 2014-12-08 17:19:48 +11:00
Shannon
0a7bbfb1ca Merge remote-tracking branch 'origin/6.2.5' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-08 17:16:16 +11:00
Shannon
864994a56e updates error msgs when sending requests to the same server pointing to docs on baseUrl 2014-12-08 17:04:22 +11:00
Shannon
3405c5001b working on U4-5964, U4-5907, U4-5965 2014-12-08 15:18:32 +11:00
Shannon
4d8732d925 The only way i could get this project to build and run was to change the transform to explicitly target 4.0.0.1 for mvc and webapi, otherwise nothing works and horribly cryptic build errors. Added the tests for the BackgroundTaskRunner 2014-12-08 14:59:32 +11:00
Anders Bjerner
0feb65c455 Moved the right click action for the tree header 
See http://issues.umbraco.org/issue/U4-5961
 2014-12-07 17:21:30 +01:00
Sebastiaan Janssen
4eb9a54fa5 Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon 
#U4-5728
 2014-12-07 16:16:29 +01:00
Shannon
3b2a27dfb2 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-05 10:29:35 +11:00
Shannon
ad66613011 Updates ValidateCurrentUser so that it doesn't re-decrypt the cookie since that is already done, it just needs to check if the current user is authenticated and if it is a back office identity. Added lots of notes for extension points when we start looking at extending how the back office auth works. 2014-12-05 10:29:18 +11:00
Shannon Deminick
a1de100a93 Merge pull request #575 from greystate/typo-buster 
Just a teeny-tiny typo change ("differnt" -> "different")
 2014-12-05 10:02:18 +11:00
Chriztian Steinmeier
cbcbc128ff Typo change "differnt" -> "different" 2014-12-04 23:40:28 +01:00
Sebastiaan Janssen
788a0241d8 Remove Forms preview notice 2014-12-04 13:17:29 +01:00
Sebastiaan Janssen
25237995eb It's nice to unzip a build in the build folder, so just ignore it for git :) 2014-12-04 12:41:39 +01:00
per ploug
ed75109829 Removes textstring editor controller - not needed 
functionality moved to directive
 2014-12-04 12:27:33 +01:00
per ploug
6738a25bfa Fxes grid datatype config to handle cols > 12 and <= 0 2014-12-04 12:27:10 +01:00
per ploug
aa9c753455 Forms installer cookie check fixed 2014-12-04 12:26:32 +01:00
per ploug
0e5f9b92e8 adds autocomplete=off to installer password 
To avoid autocomplete to pick up peoples secret passwords
 2014-12-04 12:26:05 +01:00
per ploug
77fd4d383b Fixes grid cell resizing timing bug 2014-12-04 12:25:33 +01:00
Sebastiaan Janssen
98a03a0127 Fixes nonodes a:visited bug 2014-12-04 08:55:19 +01:00
Shannon
464130a102 Fixes: U4-5930 Lock "Save and publish" once activated 2014-12-04 13:09:28 +11:00
Shannon
dfb324b003 Fixes: U4-5706 Listview search bar enter button in IE11 submits form 2014-12-04 12:44:46 +11:00
Shannon
966b8565ba publicizes Mandate 2014-12-04 11:36:15 +11:00
Shannon
2b774dbdf2 Revert "Revert "Fixes PetaPoco to support Medium trust." - This revert back to original peta poco actually causes issues with some custom multi-poco queries, turns out the med trust fix also fixes a few other things! We've been running with this fix for a very long time now so it is definitely stable and correct. 2014-12-04 11:35:42 +11:00
Sebastiaan Janssen
cae600ac2f Merge pull request #574 from readingdancer/Fix_for_U4-4125 
Fix for U4 4125 - Spanish Localization file updated.
 2014-12-03 17:12:23 +01:00
Chris Houston
5e4702a4ab Final changes (for now) for the Spanish localization file. 2014-12-03 16:04:26 +00:00
Sebastiaan Janssen
8442b2e8e7 Updates installer backgrounnd and nonodes page 2014-12-03 16:51:16 +01:00
Morten Christensen
64efd0abbc #U4-5913 Fixed Media Type composition panel so it shows the right types 2014-12-03 16:40:46 +01:00
Chris Houston
b8f3f93d83 Added more Spanish translations. 2014-12-03 14:24:13 +00:00
per ploug
ce9e851087 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-12-03 14:11:08 +01:00
per ploug
53d9a34996 Makes the forms installer reload hard 2014-12-03 14:10:44 +01:00
Sebastiaan Janssen
2f79d4a71d Better replacement of examine management ascx to html 2014-12-03 11:27:02 +01:00
per ploug
98d72da622 Removes .Syntax from grid macro editor 
This is never used and should not be stored
 2014-12-03 10:33:52 +01:00
Sebastiaan Janssen
c563629756 Bump version 2014-12-03 10:25:08 +01:00
Sebastiaan Janssen
acb3ecbbf7 Updates NuGet Readme 2014-12-03 09:57:22 +01:00
Shannon Deminick
2cbe6f5543 Merge pull request #571 from umbraco/starterkit 
Implements new starterkit rest call
 2014-12-03 18:58:40 +11:00
Sebastiaan Janssen
9beaaa825e Use the UmbracoContext property instead of the singleton 2014-12-03 08:56:21 +01:00
per ploug
bf90edb5be Fixed U4-5906 7.2.0 RC - other values than 12 in Grid Columns config mess up styling 2014-12-03 08:17:02 +01:00
Shannon
94a506f8e8 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-12-03 15:24:22 +11:00
Shannon
4f68941f98 Fixes: U4-5701 Upgrade to 7.2 beta error. Cannot alter column of type NTEXT or IMAGE. 2014-12-03 15:24:10 +11:00