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

5778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10: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
a06821ffc0 missing files 2013-07-01 14:24:28 +10: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
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Sebastiaan Janssen
e553f2c671 Correct little mistake in nuspec file 2013-06-28 14:21:25 +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
Morten Christensen
42c6533e16 Correcting merge issues 2013-06-28 13:33:41 +02:00
Morten Christensen
b0f4cb7d02 Merge branch '6.0.7' into 6.1.2 2013-06-28 13:30:04 +02:00
Morten Christensen
f809dec874 Updating repository factory to inject unique name setting into ContentRepository 2013-06-28 13:28:03 +02:00
Morten Christensen
2477500045 Fixes #U4-2414 and removes internal usage of action handlers Yay! 2013-06-28 13:27:23 +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
Morten Christensen
d89539a437 Merge branch '6.1.2' of https://github.com/umbraco/Umbraco-CMS into 6.1.2 2013-06-27 15:36:46 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Morten Christensen
b90150279b Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
 2013-06-27 15:27:31 +02:00
Morten Christensen
ca1b05e30d Correcting unit test after update to ContentType ctor 2013-06-27 15:23:15 +02:00
Morten Christensen
5c09ba9a2d Updating nuspec files and build 2013-06-27 15:15:27 +02:00
Sebastiaan Janssen
cfa3e3aff1 Bump version number 2013-06-27 15:09:44 +02:00
Morten Christensen
59ff4a0484 It hurts having to do this, but Sebastiaan says I have to. So re-wiring the BulkPublishController to use the legacy Document class so legacy events are also fired. 2013-06-27 12:30:16 +02:00
Morten Christensen
b1db99f639 Fixing issue in previous fix for #U4-2182 2013-06-27 10:57:49 +02:00
Morten Christensen
ccbb838cef Fixing another part of #U4-2186 2013-06-27 10:56:45 +02:00
Shannon
8001a78b68 updated some legacy references 2013-06-27 15:28:30 +10:00
Shannon
7417e1706e Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy) 2013-06-27 15:27:05 +10:00
Sebastiaan Janssen
0d5ec8bfd5 Merge branch '6.0.7' into 6.1.2 2013-06-26 20:57:32 +02:00
Sebastiaan Janssen
5f67e85471 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-26 20:55:11 +02:00
Sebastiaan Janssen
d9228c368f Fixes U4-2404 Photo gallery broken on Azure - Since the template saving routine is doing ToSafeAlias, we should also do it when setting the default template 2013-06-26 20:54:36 +02:00
Morten Christensen
8226505e5b Merge branch '6.0.7' into 6.1.2 2013-06-26 15:55:49 +02:00
Morten Christensen
41b8de09b7 Fixes U4-2234 including test case from issue 2013-06-26 15:49:00 +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
Morten Christensen
bbf06cd13d Fixes U4-2234 2013-06-26 14:31:36 +02:00
Morten Christensen
639cb17741 Fixes U4-2182 and U4-2167 2013-06-26 14:31:10 +02:00
Morten Christensen
4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Sebastiaan Janssen
50035eae49 Merge pull request #33 from bokmadsen/6.0.7 
Bugfix for previous pullrequest "Duplicate e-mail addresses: U4-315, U4-...
 2013-06-26 02:43:34 -07: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
Bo Kingo Damgaard
2d857a8635 Bugfix for previous pullrequest "Duplicate e-mail addresses: U4-315, U4-2147, U4-304" 
There was a bug in the previous pullrequest that didn't allow a member
to saved if the email wasn't changed. Furthermore duplicate emails are
now prevented if requireUniqueEmail was false, but is switched to true
(when saving a member)
 2013-06-26 10:47:27 +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