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

3624 Commits

Author SHA1 Message Date
Shannon
41346a784d adds ngdocs 2013-06-18 20:18:08 +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 Krogslund
f92ee9b768 Updates the mocked content to support new editor path 2013-06-18 11:45:04 +02:00
perploug
26d63439ec Update README.md 2013-06-18 11:43:07 +02:00
perploug
bcc0beb79b Update README.md 2013-06-18 12:41:40 +03:00
Per Ploug
1ca883631e Media Resource Mock returns promise 2013-06-18 11:14:16 +02: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
e501e7fb98 chore Clean up the build/belle directory 2013-06-18 10:58:04 +02: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
895ff65585 Got mock user data working and updated index.html to reflect how we're working with it in the .net solution with correct directives. Now mock tree data seems to be an issue. 2013-06-18 18:36:32 +10:00
Shannon
47b6c42253 removes mock userresource as that doesn't exist. 2013-06-18 18:17:25 +10:00
Shannon
4630ddb818 updated user service to use $q.when so we can just return values instead of promises. 2013-06-18 18:16:11 +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
feeba0e6f9 Merge branch '6.1.2' into 7.0.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:47:56 +10:00
Shannon
273c1956ab Fixes: #U4-2343 for api controllers, already fixed for surface controllers 2013-06-18 15:46:36 +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
eb8f957977 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-18 15:25:12 +10:00
Shannon
f7c474ac2c fixed merge issue and ensures UseNamespaceFallback are set for plugin controllers. 2013-06-18 15:24:44 +10:00
Shannon
4143dbd02d Fixed some merge issues 2013-06-18 15:20:18 +10:00
Shannon
768eb3d1ed Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
	src/Umbraco.Web/Mvc/PluginControllerArea.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:13:43 +10:00
Shannon
120bdca9eb removed constraint names on SurfaceControllers, they don't need to be suffixed with SurfaceController, only Controller. 2013-06-18 15:05:13 +10:00
Shannon
a5041aa34e Backported changes to use a real Area to do Umbraco area routes and updates our extension methods with the UseNamespaceFallback data token to only check in one namespace. 2013-06-18 14:59:00 +10:00
Shandem
59811c2841 Merge pull request #11 from florisrobbemont/6.1.2 
Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umb...
 2013-06-17 21:27:19 -07: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
15ea17e6d6 started on avatar directive 2013-06-18 12:02:34 +10:00
perploug
00898902a3 Create README.md 2013-06-17 13:36:34 +02:00
Shannon
e408d5f536 moves other controllers into separate files 2013-06-17 17:12:19 +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
34c98fe97b Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	.gitignore
 2013-06-17 05:36:18 +02:00
Shannon
88b84c5bcf Fixed up user login logic and works now, now to clean up the user data. 2013-06-17 05:34:30 +02: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
Floris Robbemont
aecc3d28bf Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umbraco 
Simple fix, just made the FilteredCOntrollerFactoriesResolver public. This way developers can add their own on application start
 2013-06-15 22:46:01 +02:00
Sebastiaan Janssen
b51022575f Merge pull request #8 from mattbrailsford/6.1.2 
Updated RenderMvcController to have the view engines test for file existance
 2013-06-13 03:42:34 -07:00
Sebastiaan Janssen
6600e9c899 Merge pull request #6 from dpen2000/UserPermisionsFixIn6.1.2 
Fix U4-2320 - Error on saving User Permissions (for 6.1.2 release)
 2013-06-13 03:18:37 -07:00
mattbrailsford
9b78cb3f7c Updated RenderMvcController to have the view engines test for file existance, rather than assuming views will always be razor. This allows alternative MVC view engines to be used. 2013-06-13 09:26:45 +01:00
Jeremy Pyne
c6c90fde44 Fixed Ctl+S on stylesheets editor. 2013-06-12 23:41:49 -03:00
david.pendray
773500332b Fix U4-2320 - Error on saving User Permissions 
Nodes can be null but NodeIds property always returns a collection and this will return Ids from Nodes if _nodeIds are null and Nodes is not.
 2013-06-13 02:50:25 +01:00
Jayshoe
2cd07c841f Sitemap provider be gone! Issue #U4-1950 2013-06-12 16:19:14 +02:00
Per Ploug
a2e4b6b698 Icons fixed again, F U rebase 2013-06-11 18:16:48 +02:00
Per Ploug
a8cf9b1a44 merge 2013-06-11 18:15:17 +02:00
Per Ploug
0ace3a1f74 utill.service.js update to support icons 2013-06-11 18:06:52 +02:00
Shannon
9cc95aba0e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-06-11 18:02:23 +02:00