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

6741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
edc4dc6f7f Fixed merge issues 2013-09-10 11:51:57 +10:00
Shannon
e962e86c3c Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-09-10 11:49:05 +10:00
Shannon
b2deb3def3 Fixes: U4-2815 The code to determine the macro type is currently case sensitive 2013-09-10 11:15:25 +10:00
Per Ploug Krogslund
d7c68b7f12 tutorials index.ngdoc update to include part 4 2013-09-09 20:26:54 +02:00
perploug
f1bd8d29c6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-09 16:31:22 +02:00
perploug
f6fbf1fa51 merge 2013-09-09 16:31:04 +02:00
perploug
3b6d0055ed Merge pull request #130 from stocksr/patch-1 
fix typo - getImagePropertyVaue should be getImagePropertyValue
 2013-09-09 07:28:04 -07:00
perploug
6bc8713b7f Remove vaue->value typo in all files 2013-09-09 15:26:22 +01:00
Per Ploug Krogslund
e69f0ae6a3 karma conf update 2013-09-09 14:38:02 +02:00
Per Ploug Krogslund
d2e68cca54 Docs update 2013-09-09 14:37:49 +02:00
Per Ploug Krogslund
0da60087ae Adds touch and swiping support to navigation and all modals 2013-09-09 14:37:42 +02:00
perploug
ed3ef2d1c7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-09 11:15:40 +02:00
perploug
3ba7fbd0e7 Assets service spec for testing lib loading 2013-09-09 10:15:27 +01:00
Per Ploug Krogslund
752e4af59a imagehelper typo fix 2013-09-09 11:12:00 +02:00
Per Ploug Krogslund
69c5183dac tree touch specific padding 2013-09-09 11:11:37 +02:00
Per Ploug Krogslund
2f055e0c31 Fixes type in imagehelper method? 2013-09-09 11:11:13 +02:00
Per Ploug Krogslund
ff65237414 removes service.active clause in nav.closeNav method 2013-09-09 11:10:56 +02:00
Per Ploug Krogslund
a8caee75a5 Adds ngTouch events to main navigation 2013-09-09 11:10:31 +02:00
Sebastiaan Janssen
58ba7d2d6d Fixes U4-502 TextString/TextBox multiple don't accept polish Ś character 2013-09-08 21:29:20 +02:00
Sebastiaan Janssen
edd9aa80ae Fixes U4-489 Installer, link to folder permission video broken 2013-09-08 21:18:00 +02:00
Sebastiaan Janssen
7ddb77db66 Fixed U4-576 Umb 4.7.x - Dashboards 2013-09-08 21:06:22 +02:00
Sebastiaan Janssen
b25e015890 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-08 19:42:51 +02:00
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
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
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
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