Commit Graph

331 Commits

Author SHA1 Message Date
Per Ploug Krogslund
0c3d274232 merge 2013-07-05 14:27:26 +02:00
Per Ploug Krogslund
852fe4210a Removes left-col leftover file, adds contentLoaded to contentEdit controller 2013-07-05 14:26:43 +02:00
Per Ploug
1b03dbd9c2 Adds compat.js click registering, adds bg load 2013-07-05 14:22:19 +02:00
Per Ploug
291c5920d8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 14:14:31 +02:00
Per Ploug
18a7f3dcc3 html encodes profile link to aspx page 2013-07-05 14:14:20 +02:00
Per Ploug Krogslund
63323c494f Adds body click detection to legacy pages 2013-07-05 14:13:45 +02:00
Per Ploug
699f76282d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-05 12:58:45 +02:00
Per Ploug
cfd299562e rename umb leftcol to umb navigation 2013-07-05 12:58:36 +02:00
Per Ploug Krogslund
d88c817770 User profile link in dialog 2013-07-05 12:57:46 +02:00
Per Ploug Krogslund
2580f13978 Changesection should trigger a $location.path change 2013-07-05 12:46:11 +02:00
Per Ploug
4a83262e1f Routes fallback to content if set to default 2013-07-05 12:45:37 +02:00
Per Ploug Krogslund
fd1e647ca7 Changes dashboard routing to the real dashboard.aspx 2013-07-05 12:26:06 +02:00
Per Ploug Krogslund
00ca7242b9 Adds user modal and history service
User can now log out, and see recent actions
2013-07-05 12:25:47 +02:00
Per Ploug Krogslund
63495d05e1 merge 2013-07-05 11:05:43 +02:00
Per Ploug Krogslund
0a08dce8f5 Modifies the dialog css class loading and allows for left side modals 2013-07-05 10:48:12 +02:00
Per Ploug
0030488b61 Fixes dialog service instant closing modals 2013-07-05 10:40:28 +02:00
Per Ploug
d9e79666ca css-template editor tweaks, more compat polish 2013-07-04 13:33:06 +02:00
Per Ploug Krogslund
a984bf0d68 Fixes failing tests
Adds a seperate unit test app loader, removes e2e backend from tests
adds scope.digest and httpbackend.flush to tests
2013-07-04 09:28:27 +02:00
Shannon
7e345fda70 puts angular.js source back in repo as it is good for debugging/learning. Fixed editContentController tests, but now there's other test issues which I'm not sure how to fix ? 2013-07-04 15:16:02 +10:00
Shannon
15f0503a99 Added js unit tests for icon helper 2013-07-04 13:11:07 +10:00
Shannon
93844f30ac Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons 2013-07-04 12:50:25 +10:00
Per Ploug
01d55625d5 merge 2013-07-03 14:04:00 +02:00
Per Ploug
693c0cb2a5 working modals 2013-07-03 13:55:33 +02:00
Shannon
d85c454012 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
2013-07-03 16:10:10 +10:00
Per Ploug
a798b5c343 Try to get the dialogService to intercept legacy modals
replace modals with dialogservice
2013-07-02 16:17:59 +02:00
Per Ploug
2e636d5bcb fixes testing due to wrong httpbackend injection 2013-07-02 15:46:50 +02:00
Per Ploug Krogslund
4c7351aa8a Working tree mock data 2013-07-02 10:45:43 +02:00
Shannon
ff410a9d7f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
2013-07-02 17:47:57 +10:00
Shannon
3779e79367 Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations. 2013-07-02 17:47:20 +10:00
Per Ploug Krogslund
7c63b88925 changed runner to phantomjs from chrome 2013-07-02 09:33:43 +02:00
Per Ploug Krogslund
0e431ffd3c File rename, refactor $httpBackend mocks 2013-07-02 09:17:32 +02:00
Shannon
357e29ebe1 implemented section resource and mocks to load in the sections (applications) 2013-07-02 12:57:28 +10:00
Per Ploug
32d7b88b45 Removes the ng-hide when unauthed
Not needed anymore, still something weird with the retry queue tho
2013-07-01 16:17:20 +02:00
Per Ploug
2b13dff769 Fixes login and tree
Adds tree loader, fixes icons, fixes toggle arrows
Refactors httpbackend into nicer system
Testing of promises are broken :(
TODO: update docs
2013-07-01 16:06:41 +02:00
Per Ploug Krogslund
0d44189f7f Mocked login works again 2013-07-01 09:58:10 +02:00
Shannon
388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
Per Ploug
ad766a2544 Authentication almost done
Missing some styling and we are good to go on promised based
authentication
2013-06-28 15:49:28 +02:00
Per Ploug Krogslund
86a330ae8e enabled the security interceptor 2013-06-28 14:13:20 +02:00
Per Ploug
453719e07b Mocked server variables 2013-06-28 14:07:38 +02:00
Per Ploug Krogslund
0744adf8a2 Start on a proper httpbackend 2013-06-28 14:00:52 +02:00
Shannon
a077836936 Implemented the required/regex validation that is applied to PropertyType's on a Document type (this might be temporary if we get around to implementing pre-value overrides). Changed the name from ManifestValueValidator to just ValueValidator and allows for property editors to override the defaults if they need to change how the regex/required validation is processed against the property's value. Have streamlined all of the validation directives to require an FormController which we then listen to. Have removed valBubble as we don't actually need that functionality anymore and this simplfies input elements too. 2013-06-28 12:23:15 +10:00
Per Ploug
d2273ee8ce Updated karma to 0.9
Tests are now cross-platform and runs in local phantomJS instead of in
chrome, remember to run npm install to upgrade
2013-06-26 15:46:36 +02:00
Per Ploug
7a89cf1ffd Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-06-26 11:12:24 +02:00
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
abbd79f4d0 adds notification msgs for failed validation. ensures that the subscriptions to the servervalidationservice are unsubscribed on $destroy = very important! 2013-06-26 14:36:45 +10:00
Shannon
e571e68d0c ensures validation msgs are not shown until the first submit. 2013-06-26 13:33:24 +10:00
Shannon
f2283d8457 fixes js errors 2013-06-26 13:03:03 +10:00
Shannon
7b35e7627a fixes js errors 2013-06-26 13:02:47 +10:00
Shannon
6ee1171e9c Got tab validation indication working. 2013-06-26 13:01:40 +10:00
Shannon
43972a66c2 another tweak to property level validation 2013-06-25 22:53:59 +10:00