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

73 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
eb8f957977 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-18 15:25:12 +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
b50658121d Started integrating authorization services. 2013-06-17 01:06:31 +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
1511a5b951 Got images to work even if they are stored as legacy image data structure 2013-06-11 18:00:25 +02:00
Shannon
5dee0208f5 Fixed content title saving 2013-06-11 15:04:23 +02:00
Shannon
c055dedee9 GetByIds content method 2013-06-11 14:43:36 +02:00
Shannon
b89958af41 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-11 14:31:14 +02:00
Shannon
d4cfa57b2a Got media creation working and fixed updating node names. 2013-06-11 14:30:37 +02:00
Per Ploug Krogslund
20bac8085e Update manifest to support textstring, area, boolean and content picker 2013-06-11 13:19:58 +02:00
Shannon
16d2711177 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-11 13:16:03 +02:00
Shannon
a39e57f4d9 added null check for prop editors, got the RTE media picker working properly with correct styles and using the server data. 2013-06-11 13:12:54 +02:00
Per Ploug Krogslund
e32d0890c0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	.gitignore
 2013-06-11 12:29:34 +02:00
Shannon
a656911061 Updating media picker to work and look properly 2013-06-11 12:16:37 +02:00
Per Ploug Krogslund
6061190021 googlemaps update to support duncanson 2013-06-11 12:16:31 +02:00
Shannon
da146891ef Updated ignore file and ignored all Belle build files. 2013-06-11 09:32:51 +02:00
Shannon
3fee64d6eb Got media saving now. 
Signed-off-by: Shannon <sdeminick@gmail.com>
 2013-06-11 02:01:17 +02:00
Shannon
aea1a17a03 Last commit into mercurial!!! -- a bunch of model mapping mayhem 2013-06-10 20:24:54 -02:00
Shannon
e750fda197 added readonly view to support showing value from legacy data types. 2013-06-10 17:12:59 -02:00
Shannon
877c0b85cd Refactors content model mapper to be re-used for media, added new base model class 
to deal with content similarities like media. Renamed some service methods to be consistent.
 2013-06-10 16:43:42 -02:00
Shannon
e8c4063ed1 Fixes data saving services 2013-06-10 15:58:52 -02:00
Shannon
01c48b7dba Fixed content edit data issue and fixes media controller naming 2013-06-10 15:49:35 -02:00
Shannon
655a280cf1 Ensures the tree expansion doesn't happen when there are no child nodes. 2013-06-10 15:03:25 -02:00