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

15846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
cd401f5e37 U4-8216 Hijacked controller actions fail with custom RenderModel subclass due to ModelBinding error 2016-03-21 16:12:34 +01:00
Sebastiaan Janssen
75c2b07ad3 Update ModelsBuilder dependency for the NuGet package 2016-03-18 16:32:05 +01:00
Sebastiaan Janssen
969fe30f6e Merge pull request #1186 from umbraco/temp-U4-8043 
U4-8043 - reboot app when PureLive models go wrong
 2016-03-18 16:26:52 +01:00
Stephan
0f90d357cf U4-8043 - reboot application when PureLive models go wrong 2016-03-18 16:14:06 +01:00
Stephan
d955daab0f Upgrade ModelsBuilder to 3.0.2 2016-03-18 16:13:19 +01:00
Shannon
617b17ca9e puts back in the current node permission check - since we use this for Create 2016-03-18 15:43:14 +01:00
Shannon
9e3d7a1cce updates default pipeline marker stage for the preview middleware, updates MembershipHelper to not throw an exception if the Role manager is disabled. 2016-03-18 11:05:39 +01:00
Warren Buckley
f04071d7c7 Merge pull request #1180 from umbraco/temp-U4-8165 
U4-8165 Ensure browsers are not caching service requests
 2016-03-18 09:53:12 +00:00
Shannon Deminick
2cce9395da Merge pull request #1181 from mittonp/dev-v7 
French translations for Grid.
 2016-03-18 10:15:50 +01:00
Mitton
6ad56863d4 Grid translation - French 2016-03-18 06:15:37 +02:00
Mitton
2703fa7ea2 Grid translation - French 2016-03-18 06:12:44 +02:00
Shannon
b3c6654d41 bumps version 2016-03-17 17:31:36 +01:00
Shannon
0071651621 fixes keyboard shortcut after refactor 2016-03-17 16:36:13 +01:00
Shannon Deminick
4dbc27f1fe Merge pull request #1178 from bjarnef/dev-U4-8163 
U4-8163 - Don't set dirty on form for examine dashboard search
 2016-03-17 11:31:36 +01:00
Shannon
3f8bbc2f02 Merge branch 'pynej-view-save-restore-cursor' into dev-v7 2016-03-17 11:29:29 +01:00
Shannon
999be9c578 Merge branch 'view-save-restore-cursor' of https://github.com/pynej/Umbraco-CMS into pynej-view-save-restore-cursor 2016-03-17 11:26:09 +01:00
Claus
b36b1693dd Fixes broken regex. 2016-03-17 10:33:04 +01:00
Simon Busborg
99b2192ab7 Fixes U4-8181 It is not possible to scroll in an overlay in Chrome 49 on a Retina Mac 
By removing animated -half-second fadeIn it resolves the issue where it's not possible to scroll in dialogs on a retina screen ¯\_(ツ)_/¯
 2016-03-17 09:58:57 +01:00
Shannon
5230f55f44 moves attribute 2016-03-16 14:52:40 +01:00
Shannon
f93fee28dd U4-8165 Ensure browsers are not caching service requests 2016-03-16 14:51:04 +01:00
Shannon Deminick
fc7cfea4ad Merge pull request #1179 from umbraco/temp-U4-8175 
U4-8175 - fix PropertyType.PropertyGroupId inconsistencies
 2016-03-16 14:18:03 +01:00
Stephan
bc5f651c64 U4-8154 - bugfix test 2016-03-16 13:46:51 +01:00
Stephan
ecdca378c6 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies 2016-03-16 13:41:58 +01:00
Stephan
4628c1f858 U4-8154 - bugfix test 2016-03-16 13:16:56 +01:00
Shannon Deminick
5af4d02f44 Merge pull request #1177 from umbraco/temp-U4-7109 
U4-7109 - could not change language in Culture and Hostnames
 2016-03-16 10:48:35 +01:00
Shannon
2f9b526465 Only apply preview auth if Umbraco is fully configured 2016-03-16 10:41:33 +01:00
Stephan
800e02bccf Bugfix model mapper for PropertyTypeDisplay 2016-03-16 10:19:06 +01:00
Shannon Deminick
693b0dba24 Merge pull request #1161 from umbraco/temp-U4-4219 
U4-4219 Can't Preview protected pages
 2016-03-16 10:18:06 +01:00
Stephan
2004f6a51e U4-8154 - bugfix 2016-03-16 10:10:31 +01:00
Claus
f650b6238c Merge branch 'arknu-U4-8026' into dev-v7 2016-03-16 07:57:59 +01:00
Claus
7c179a7868 U4-8026 Fixes up unit tests 2016-03-16 07:56:41 +01:00
bjarnef
7a7e0edfa7 Don't set dirty on form for examine dashboard search 2016-03-15 23:59:11 +01:00
bjarnef
69adec1d68 Merge branch 'dev-v7' of https://github.com/bjarnef/Umbraco-CMS into dev-v7 2016-03-15 20:23:58 +01:00
Stephan
0cf6548f86 U4-7109 - could not change language in Culture and Hostnames 2016-03-15 17:26:05 +01:00
Sebastiaan Janssen
111ee66b60 Update ModelsBuilder dependency for the NuGet package 2016-03-15 17:15:39 +01:00
Stephan
fedcd6f970 Merge pull request #1176 from umbraco/temp-U4-8168 
U4-8168 Cannot re-order/move locked property types - such as the lock…
 2016-03-15 16:29:57 +01:00
Stephan
8e82ff5450 Merge pull request #1173 from umbraco/temp-U4-8012 
U4-8012 Generic properties tab disappears on the edit Member Type win…
 2016-03-15 16:24:21 +01:00
Stephan
81459c3659 Merge pull request #1174 from umbraco/temp-U4-8065 
U4-8065 Inherited from is empty - reverts 10617d1bd52bdac57534a7d7b8…
 2016-03-15 16:08:26 +01:00
Rune Hem Strand
8907c9855b Merge pull request #1172 from umbraco/temp-U4-7185 
Temp u4 7185
 2016-03-15 16:02:47 +01:00
Stephan
e1bf30ec26 Merge pull request #1175 from umbraco/temp-U4-8106 
U4-8106 Content type inheritance can be broken by compositions
 2016-03-15 15:53:37 +01:00
Shannon
6bb9c5b81c U4-8168 Cannot re-order/move locked property types - such as the locked/system member type properties 2016-03-15 15:43:21 +01:00
Shannon
6aafbfb245 U4-8106 Content type inheritance can be broken by compositions 2016-03-15 15:25:05 +01:00
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Shannon
3fdb122e91 U4-8012 Generic properties tab disappears on the edit Member Type window after upgrade to 7.4 2016-03-15 14:44:03 +01:00
Shannon Deminick
710dda164f Merge pull request #1166 from umbraco/temp-U4-7708 
U4-7708 Using a RTE Macro Partial Form (SurfaceController) & Doctype …
 2016-03-15 13:57:27 +01:00
Claus
07d0d82bd1 Merge branch 'U4-8026' of git://github.com/arknu/Umbraco-CMS into arknu-U4-8026 2016-03-15 13:47:10 +01:00
Claus
91eb3ea59e Merge pull request #1152 from AndyButland/u4-7888 
Fixed U4-7888 - Cannot change default template for document type
 2016-03-15 13:43:07 +01:00
Rune Strand
096f1b6ff9 add selected state to umbFolderGrid 2016-03-15 13:18:48 +01:00
Rune Strand
f24c0d3e7a Update umbBreadcrumb to use custom controller 2016-03-15 13:18:48 +01:00
Rune Hem Strand
104338c817 A little bit of foldergrid+ 2016-03-15 13:18:48 +01:00