Commit Graph

23 Commits

Author SHA1 Message Date
Shannon
2ebf6d09c6 Gets delete and empty recycle bin working, adds unit tests for tree service, ensures that the recycle bin shows children whenever something is deleted (though, i now realize i need to refresh the recycle bin node and expand it when something is deleted). Renames some namespaces for content/media/etc... controllers and makes the file names more readable. 2013-08-01 14:51:35 +10:00
Per Ploug Krogslund
f9f54b3ee7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
2013-07-28 01:01:50 +02:00
Shannon
53891a69af Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want. 2013-07-23 16:43:08 +10:00
Shannon
feb1892e9e Gets notification msgs on the server side to be displayed. Fixes property existence checking... was checking on id before but that is incorrect, needs to be on alias since a new property id is gen'd on each save and we're not re-wiring them back up. Fixes YSOD messaging for content as well. Changes the ModelState to modelState to be consistent in js. 2013-07-22 18:16:50 +10:00
Shannon
b9d0bca1b6 Fixed up validation messages when we are not redirecting, fixed up how we re-bind the content values to make sure we only set the values if they have been changed by the server and added unit tests for that. Added more properties to our display model including a new INotificationModel to put localized notifications in. 2013-07-22 17:13:38 +10:00
Per Ploug Krogslund
9421ae054f Removes security.service
Merges into user.service, moves the umbraco.security module into
umbraco.services, instead of in the root module, we could consider
doing that for umbraco.resources as well.
2013-07-21 22:14:05 +02:00
Shannon
d58b1ac107 Changed serverValidationService to be called serverValidationManager and added a bunch of unit tests for it. 2013-07-18 19:18:53 +10:00
Shannon
6f4a7f06a5 Changed naming conventions of spec files so they are human readable. Fixed up the route handling when clicking on nodes to ensure the query/search is cleared (so there's no overlap with creating nodes). Moved much of the data handling functionality of the content edit controller to a new service called contentEditingHelper which I've now written unit tests for. 2013-07-17 17:04:52 +10:00
Shannon
cdf114df4b Converted all resources over to use a newer structure for generating URLs, created unit tests for those, fixed the js build so that the name is still "umbraco" not "umbraco 7" since that causes problems with css and other file references. 2013-07-12 13:26:11 +10:00
Shannon
6652016faa Makes the 'active' property on a tab a server side thing, updates more resources to use the resourcePromise. 2013-07-10 17:28:15 +10:00
Shannon
0f207b01f2 Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated. 2013-07-10 13:24:28 +10: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
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
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
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
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
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
Per Ploug Krogslund
47f1dcf4e5 Missing client files, excluding node_modules 2013-06-10 10:44:40 -02:00