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

858 Commits

Author SHA1 Message Date
Per Ploug
d214935ecb Panel, Tabview, Propertie controls converted 
Changed the html to output bootstrap html, masterpages load our belle
css + bootstrap.min.js
 2013-06-26 11:12:06 +02:00
Shannon
a2e16b4922 Fixed up gravatar with a watch, started implementing legacy proxy JS notification calls to our angular services. 2013-06-25 14:02:31 +10:00
Shannon
68a648d3ba Merge remote-tracking branch 'origin/6.1.2' into 7.0.0 
Conflicts:
	.hgignore
 2013-06-25 10:01:23 +10:00
Shannon
39d7676bee Got the legacy editors working and iframe implementation almost done! 2013-06-25 08:54:36 +10:00
Sebastiaan Janssen
bd77463fa4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/IContentTypeBase.cs
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
 2013-06-24 12:06:58 +02:00
Sebastiaan Janssen
496d51c2a0 Merge pull request #25 from kipusoep/Duplicate-words-domainHelp 
Duplicate words removed
 2013-06-24 01:30:04 -07:00
Shannon
5af8e86e3b updated web.config settings and default settings. 2013-06-24 13:37:25 +10:00
Stefan Kip
6cc1735363 Duplicate words removed 2013-06-23 21:49:43 +02:00
Stefan Kip
22cf59345c Removed space before UmbracoModule 
Removed space before UmbracoModule
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2013-06-23 16:02:02 +02:00
Michiel van Oosterhout
16a46a4ea4 Changed default user email address to use the example domain, instead of domain.com 2013-06-23 16:01:04 +02:00
Sebastiaan Janssen
09d9728fb8 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2013-06-23 15:16:44 +02:00
Sebastiaan Janssen
c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally 
(you don't have to re-map your port to the correct folder)
 2013-06-23 15:13:27 +02:00
Sebastiaan Janssen
5bd55bdd09 Merge branch '6.0.7' into 6.1.2 2013-06-21 17:33:42 +02:00
Sebastiaan Janssen
a2da27121e U4-2335 [Regression] YSOD when editing stylesheet property on 6.0.6 2013-06-21 17:00:40 +02:00
Sebastiaan Janssen
23ec07276a U4-2369 Wrong path for Umbraco/Config/Lang/xx.xml for publish notification mail 2013-06-21 16:56:59 +02:00
Sebastiaan Janssen
96cec0b407 U4-2410 EditRelationType.aspx missing virtual path - 6.0.6 2013-06-21 16:30:44 +02:00
Sebastiaan Janssen
47b94e68e3 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-21 15:26:10 +02:00
Sebastiaan Janssen
0f4b1752e0 U4-2416 Missing colon in file ListChildPagesOrderedByProperty causes Web site not to run 2013-06-21 15:25:46 +02:00
Shannon
ed1aee5047 Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config 2013-06-21 16:20:18 +10:00
Shannon
c81cd0fd1d Merge branch '6.1.2' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-21 15:49:40 +10:00
Shannon
3f626b444f re-enables CDF logger 2013-06-21 10:55:38 +10:00
Shannon
c5b8931aa6 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-21 10:50:35 +10:00
Shannon
818d22ba61 updates CDF config examples (#U4-2331) 2013-06-21 10:49:27 +10:00
Shannon
27fdb1ebab removed custom dashboard, re-put back in the external index (must have got removed by accident) 2013-06-21 09:19:50 +10:00
Shannon
06bbfe2960 Gets the context menu items actually resolving from the server data, created converters to convert legacy menu items to new ones including more icon converters (still need to get more stuff on menu items working and planned out but the data is from the server). Updated the mocks to include a menu structure with each node, creaeted a simply context menu directive. 2013-06-20 19:49:27 +10:00
Shannon
b6cbd521ce Merge branch '6.1.2' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
 2013-06-20 16:06:23 +10:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon
b4ba57695e Merge branch '6.1.2' into 7.0.0 2013-06-20 10:09:39 +10:00
Sebastiaan Janssen
c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
 2013-06-19 18:26:45 +02:00
Phil Dye
7f22809ebf U4-1478 Create button still visible when not active 2013-06-19 17:55:00 +02:00
Edwin de Koning
302ebde422 Translating the word "or" 2013-06-19 16:28:58 +02:00
Shannon
2650740fa7 moved umbraco property editors into the core and outside the manifest (as c# declarations). Changed property editor names to not be editor.html and instead be the name of the folder as a convention. 2013-06-19 16:42:50 +10:00
Shannon
8db763c953 Updated server side stuff to work with new yepnope which makes things much simpler. 2013-06-19 13:45:41 +10:00
Shannon
111ae3d3e3 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-18 20:09:30 +10:00
Shannon
608265ff19 Created new directive: umbpropertyinclude which handles the lazy loading of a property editor and then checks if it declares a controller before it compiles it. If it does, we'll make a lazy JS request for it's JS file and then finally compile it. With this in place we could have our own custom directive to officially state that a JS file is required instead of just checking for the ng-controller. 2013-06-18 20:08:00 +10:00
Per Ploug
03b9a91458 merge 2013-06-18 11:09:16 +02:00
Shannon
3caa44d26b Removes property editor filter as it gets executed too many times, changed this into a helper method. 2013-06-18 19:02:53 +10:00
Per Ploug
4b68d1950c Replaces require.js with jepnope 
Gets rid of the AMD pattern, adds scriptLoader service, work on security
service started
 2013-06-18 10:51:26 +02:00
Shannon
9720717076 changed default location of prop editor views to not be in the 'umbraco' folder (not needed) 2013-06-18 18:44:33 +10:00
Shannon
1f56d0b280 Starting to move umbraco property editors into the core, not in a manifest. 2013-06-18 17:57:15 +10:00
Shannon
816edce620 Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings. 2013-06-18 17:22:01 +10:00
Shannon
93fa4c0447 Merge branch '6.1.2' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Web/Mvc/BackOfficeArea.cs
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:28:37 +10:00
Shannon
5719820fad Merge branch '6.0.7' into 6.1.2 
Conflicts:
	.gitignore
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
 2013-06-18 14:18:17 +10:00
Shannon
f0f394263f Removed all build files, updated sln to not try to build website project, 2013-06-18 14:11:23 +10:00
Shannon
6ecfcd3767 Moves main controller into separate file, ignore file removes a bunch of build files that don't need to be there. 2013-06-17 17:02:36 +10:00
Shannon
a7b546527c Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though). 2013-06-17 16:03:27 +10:00
Shannon
c52e51b2d8 Fixed up external templated directives to use the templateUrl property which i didn't previously know about, this ensures that a new scope is not created for these elements which was causing issues. updated ignore file some more, removed committed files that shouldn't be there 2013-06-17 04:51:59 +02:00
Shannon
9d15228c68 manually applies patch for drag/drop fix in media for vdir 2013-06-17 03:06:24 +02:00
Shannon
b50658121d Started integrating authorization services. 2013-06-17 01:06:31 +02:00