yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,877 Commits 4 Branches 7 Tags
371b1817ea4d10e7ecaee2dbbb044ee4388b6c9b
Commit Graph

6877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
686250c586 Fixed U4-608 Empty tinymce config throws null ref exception 2013-09-08 19:42:34 +02:00
Robert Stocks
98d1b93862 Fix all references to to getImagePropertyVaue 2013-09-07 14:32:01 +01:00
Stephan
c5197dbe17 U4-2807 - better exception message on bogus domain 2013-09-07 10:25:39 +02:00
neehouse
d821401ea2 Removing file location restriction from PartialViewMacro to allow custom paths. 2013-09-06 15:34:19 -04:00
Stephan
39316a345f Tests - stop deleting dummy.txt files 2013-09-06 20:24:22 +02:00
Sebastiaan Janssen
349dc9a228 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-06 16:20:16 +02:00
Sebastiaan Janssen
303c1e16b8 Change document type did unnecessary checks on root node which resulted in YSOD 2013-09-06 16:17:08 +02:00
stocksr
a99deb655b Update util.service.js 
Fix typo
 2013-09-06 15:09:03 +01:00
Shannon
8adfec51d0 Getting more unit tests fixed up, removed the old SQL installer scripts since there are not used whatsoever anymore 2013-09-06 18:03:00 +10:00
Shannon
b3ec44b61d Getting all the unit tests working again with the GUID to alias change, lots of little fixes everywhere. 2013-09-06 17:50:31 +10:00
Shannon
cf6a3cdfef A bunch more work done to convert the GUID -> alias for prop eds 2013-09-06 16:00:35 +10:00
Shannon
9a017279ae More work converting obsoleted methods to new ones 2013-09-06 15:37:01 +10:00
Shannon
78741bf134 more work on removing the GUID requirement for prop editors, removes legacy editDataType webforms editor (U4-2801 Remove legacy/un-used editDataType.aspx webforms editor) 2013-09-06 15:27:38 +10:00
Shannon
b1b7a330b5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 2013-09-06 15:09:24 +10:00
Shannon
c2b1ed205b Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-06 11:40:56 +10:00
Shannon
fee02af4eb Completes: U4-1639 Add support to generate GET urls to SurfaceController actions 2013-09-06 11:40:37 +10:00
perploug
b3c68d44f1 Getting closer to the sorting to work 2013-09-06 01:12:12 +02:00
leekelleher
4770e903fb Minor corrected to uQuery doco/comments. 2013-09-05 18:22:48 +01:00
perploug
37c07bbc51 Working css for IE 2013-09-05 15:17:10 +02:00
Morten Christensen
e080965468 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-05 11:28:45 +02:00
perploug
70a1b63813 make rte handle null images from dialog 2013-09-05 11:14:56 +02:00
perploug
779ba61fb1 removes uglify from build for now 2013-09-05 11:14:38 +02:00
perploug
b30bcec390 Normaliize dialogservice method signature 2013-09-05 11:14:24 +02:00
perploug
d2df96e2e0 Comment outnContentPostValidate as its currently broken 2013-09-05 11:13:55 +02:00
perploug
cb06b97d69 Making propertyeditor and attribute public 2013-09-05 11:13:22 +02:00
Morten Christensen
0c05836537 Fixes U4-2791 Error creating node containing @ v6.1.4. 
Adding unit test which covers both U4-2791 and U4-2607
 2013-09-05 10:44:28 +02:00
Shannon
45dabd6293 Lots of work on U4-2722 Change Property Editors over to use unique alias instead of GUID 
it compiles but i haven't had time to test anything yet, will start all unit testing/fixing tomorrow, just needed to save this work somewhere.
 2013-09-05 18:38:54 +10:00
perploug
39233aa219 gruntfile 2013-09-05 08:33:40 +02:00
Shannon
e4cb079ae1 Fixes template drop down data and persisting an updated template. 2013-09-05 15:14:28 +10:00
Shannon
0026f7bd01 More ignores 2013-09-05 14:55:55 +10:00
Shannon
0b1cad7687 Fixes app.dev to not include ui.sortable. Fixes server vars mocks to have an entry for dashboardApiBaseUrl, adds dashboard.mocks to not throw an exception when trying access that data. 2013-09-05 14:54:40 +10:00
Shannon
038780614c Re-deletes files that should not be committed! Seriously WHY DOES THIS KEEP HAPPENING??! Have updated the ignore to try and stop this 2013-09-05 14:38:22 +10:00
Shannon
c269f55074 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-05 14:01:48 +10:00
Shannon
177486418d Implements: U4-1639 Add support to generate GET urls to SurfaceController actions 2013-09-05 14:01:28 +10:00
perploug
ac4eb18b55 Add ngmin and uglify to grunt setup RERUN NPM INSTALL 2013-09-04 23:31:05 +02:00
perploug
cab92d203e Delete contour files checked in by mistake 2013-09-04 21:08:48 +02:00
perploug
9414639ee1 icons and modal css updates 2013-09-04 21:07:10 +02:00
Morten Christensen
3393b6b0da Adding comments to the MemberService methods 2013-09-04 16:35:54 +02:00
Morten Christensen
33bba57047 Implementing addtional methods in the MemberService 2013-09-04 16:30:51 +02:00
perploug
c27f6e3458 merge legacy client 2013-09-04 16:02:23 +02:00
Morten Christensen
269f573b82 Refactoring the GetById method in the MemberService. 2013-09-04 16:00:38 +02:00
perploug
8e93cfa94d merge 2013-09-04 16:00:30 +02:00
Morten Christensen
2ec367fd59 Removing the SecurityHelper and moving the 3 methods into the Provider as private classes, as they aren't used anywhere else. 
The SecUtility will be removed along with the legacy MembershipProvider when cleanup is possible.
 2013-09-04 15:44:29 +02:00
perploug
334374b9f6 New sorter and contentType editor 2013-09-04 15:43:56 +02:00
perploug
a5445bb779 media picker icons 2013-09-04 15:43:41 +02:00
perploug
fd06c1b785 add jqueyr sortable lib 2013-09-04 15:43:24 +02:00
perploug
d59963a53e Comment jquery UI for new sorter 2013-09-04 15:43:00 +02:00
Morten Christensen
72dcb32ac2 Refactoring the TypedModelBase and UmbracoTempaltePage for the TypedModel POC 2013-09-04 15:42:25 +02:00
perploug
025b952fb6 Remove old debug valu from content picker 2013-09-04 15:42:23 +02:00
Morten Christensen
1f68cad45b Refactoring MemberService and MembersMembershipProvider from Darrens pull request to fit the changes made the past week. 
SecurityHelper is moved to the Umbraco.Web.Security namespace.
MembershipExtensions are changed to the new models
 2013-09-04 15:42:01 +02:00