yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,540 Commits 4 Branches 7 Tags
9b2b961f83d8d4213f77b5befd2f4f9dcb7776fa
Commit Graph

8280 Commits

Author SHA1 Message Date
Shannon
6485e625b1 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 11:37:21 +10:00
Shannon
3aa486a463 another log 2014-06-25 11:36:58 +10:00
Shannon
5aa0621c90 adds some notes 2014-06-25 11:36:14 +10:00
Shannon
625b8f7e65 Ensures the 'Index' portion of the path is used for scheduled publishing 2014-06-25 11:26:08 +10:00
Shannon
72b7b443e9 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-25 11:02:04 +10:00
Shannon
53c1c97aeb Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-25 11:01:03 +10:00
Shannon
5011eee037 fixes merge issue 2014-06-25 11:00:53 +10:00
Shannon
e27163f3a7 adds logging to scheduled bits 2014-06-25 11:00:11 +10:00
jakobdyrby
8c36a683e6 Change some class from public to internal 2014-06-24 11:27:04 +02:00
Tom Fulton
a23fb7bc74 Support virtual paths when defining PropertyEditors via Attributes (U4-5128) 2014-06-23 12:16:14 -04:00
Shannon
2ccec3be33 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/LegacyScheduledTasks.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/publishingService.cs
 2014-06-23 15:08:04 +10:00
Shannon
65ea6f94d3 adds authorization to the scheduled publishing , this new attribute can be used to secure scheduled tasks as well. 2014-06-23 15:02:23 +10:00
Morten Christensen
3af3e054d7 Minor refactoring of the MigrationRunner to allow a bit more flexibility for using it for non-Core migrations. 
Allowing the list of migrations to be changed through the two migration events using the MigrationEventArgs.
 2014-06-20 12:57:33 +02:00
Shannon
9158ea1ace fixes url returned in GetCurrentServerUmbracoBaseUrl 2014-06-20 14:45:45 +10:00
Shannon
e8f7f77bb6 Fixes: U4-581 Automatic publishing not working in load balanced setup - added some more convention and configuration to distributed calls so that servers are aware of the master and how to call into themselves for scheduled tasks, ping and scheduled publishing. Will need to update the docs on LB regarding this too. Cleaned up the code that does the scheduling and separates it into proper segments. Obsoletes the old presentation classes that were doing it. 2014-06-20 14:34:21 +10:00
Shannon
6b5cb3a9cf Fixes: U4-4947 Tag Editor twitter typeahead 2014-06-19 18:04:32 +10:00
Shannon
bb655afd72 Fixes: U4-5080 Error deleting property type that references tags 2014-06-19 17:39:31 +10:00
Shannon
ad3502d438 Fixes: U4-5004 Pressing escape in the login screen causes a blank screen 2014-06-18 19:28:16 +10:00
Shannon
dfb40802ff makes grunt vs and grunt dev a little faster 2014-06-18 17:31:00 +10:00
Shannon
8ded6fff93 adds vs task to grunt 2014-06-18 17:15:09 +10:00
Shannon
56111be82d Properly fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-18 17:11:47 +10:00
Shannon
f25463babe Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-17 19:05:22 +10:00
Shannon
b8575ef158 Started writing test implementation to mimic what developers might test in their controllers to expose the pitfalls of umbraco testing so we can make this simpler - identifying what needs to be public and how to re-strcuture some objects constructors, etc... to simplify and make this possible. 2014-06-17 18:53:23 +10:00
jakobdyrby
3e0cd0a605 Now it works with a notimplimentet exception 2014-06-17 09:13:54 +02:00
Shannon
1c23940b0b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-17 16:09:29 +10:00
Shannon
d3bb750f98 Updated to latest Examine with lock fixes 2014-06-17 16:07:08 +10:00
jakobdyrby
7ec13146b2 more revert 2014-06-17 07:34:49 +02:00
jakobdyrby
48e0e5da75 revert to org files 2014-06-17 07:31:22 +02:00
jakobdyrby
448bfc166f revert to org files 2014-06-17 07:12:59 +02:00
jakobdyrby
7b48a59ca2 added events 2014-06-17 07:06:07 +02:00
Shandem
1f161b2b9c Merge pull request #395 from Excommunicated/7.1.5 
Close user dialog on logout
 2014-06-17 14:07:45 +10:00
Morten Christensen
6f27f839e0 Related to U4-4199 lets get rid of all these Console.WriteLine's 2014-06-16 16:29:15 +02:00
jakobdyrby
f7e046deaf Undo some non changes 2014-06-16 14:01:59 +02:00
jakobdyrby
09b34625b9 removed change to src/Umbraco.Core/Services/DataTypeService.cs 2014-06-16 13:58:50 +02:00
jakobdyrby
3c6bf1ce92 Removed some complex objects that didn't need to be complex 2014-06-16 12:13:01 +02:00
jakobdyrby
dfb08b9ec7 Removed IStyleSheet 2014-06-16 12:13:00 +02:00
jakobdyrby
eef7ce45d3 cleanup 2014-06-16 12:13:00 +02:00
jakobdyrby
697d4e3b23 more logical code 2014-06-16 12:12:59 +02:00
jakobdyrby
6d77121c05 Test for support stylesheets 2014-06-16 12:12:58 +02:00
jakobdyrby
a7928f87ee small ajustments 2014-06-16 12:12:58 +02:00
jakobdyrby
07d431f52e more moving 2014-06-16 12:12:57 +02:00
jakobdyrby
bb71efd4fa Move moving classes around 2014-06-16 12:12:57 +02:00
jakobdyrby
48b60961b5 removed unused code 2014-06-16 12:12:56 +02:00
jakobdyrby
2bea8c5691 back to const 2014-06-16 12:12:56 +02:00
jakobdyrby
32ed0de4f6 Moved and renamed classes to fit standard 2014-06-16 12:12:55 +02:00
jakobdyrby
c67f0baf74 Method renaming and zip allowed 2014-06-16 12:12:54 +02:00
jakobdyrby
95ff1a03fb some renaming 2014-06-16 12:12:53 +02:00
jakobdyrby
c0b22c4349 renamed a class 2014-06-16 12:12:53 +02:00
jakobdyrby
5d3d2e9331 added comments to IUnpackHelper 2014-06-16 12:12:52 +02:00
jakobdyrby
de266351d1 Refactoring to move redundant code and added sanity check for doublet filenames in package 2014-06-16 12:12:52 +02:00