Commit Graph

14430 Commits

Author SHA1 Message Date
Mads Rasmussen
c81b034568 Fixes: U4-7441 Grid - Hide row picker when Grid has content (show + icon) 2015-11-23 19:57:15 +01:00
Simon Busborg
692e09871a Comments, TODOs, and general cleanup in umb-grid 2015-11-23 16:46:59 +01:00
Simon Busborg
e15b11389a Merge branch '7.4.0' into temp-U4-7366 2015-11-23 15:08:01 +01:00
Mads Rasmussen
522d9d148f Fixes: U4-7449 Cannot create datatype in new content type editor 2015-11-23 15:03:26 +01:00
Simon Busborg
36361bf9e8 Changed dropzone UI, to display link. Pulled SVG source from file into image file. 2015-11-23 14:13:12 +01:00
Claus
f09e3c206c Fixed formatting... 2015-11-23 13:45:17 +01:00
Claus
2415403149 Fixes: U4-7392 It's not possible to upload folders in the media root 2015-11-23 13:43:31 +01:00
Rune Strand
e4660115cd Dirty hack for Frankfurt 2015-11-23 13:05:41 +01:00
Mads Rasmussen
4adc645580 Merge branch '7.4.0' into temp-U4-7366 2015-11-19 22:19:52 +01:00
Rune Strand
664f80364b Add content visible when sorting
Add cell sorting
2015-11-19 21:54:59 +01:00
Sebastiaan Janssen
16f1fa1678 Merge branch 'dev-v7' into 7.4.0 2015-11-19 14:44:54 +01:00
Sebastiaan Janssen
3e2d59e526 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-11-19 14:43:45 +01:00
Sebastiaan Janssen
9d3e967c2a Ignore test that keeps crapping out on build server 2015-11-19 14:43:35 +01:00
Claus
8dadc92aa8 Fixed migration causing issues when upgrading from a site pre-migrations-table to version 7.3.2. 2015-11-19 12:01:46 +01:00
Shannon Deminick
58c3dfac1c Merge pull request #913 from Nicholas-Westby/feature/u4-7425-forms-constant-comment
Fixed typo for "forms": http://issues.umbraco.org/issue/U4-7425
2015-11-19 00:34:54 +01:00
Nicholas-Westby
dcf59d2b17 Fixed typo for "forms": http://issues.umbraco.org/issue/U4-7425 2015-11-18 14:29:10 -08:00
Sebastiaan Janssen
887111318f Update install facts 2015-11-18 20:35:36 +01:00
Sebastiaan Janssen
d0865017d1 Merge branch 'dev-v7' into 7.4.0 2015-11-18 19:42:13 +01:00
Sebastiaan Janssen
bf9755b27c Don't end response so people can actually hook into PostRequestHandlerExecute 2015-11-18 19:41:20 +01:00
Sebastiaan Janssen
aca181b32e U4-7410 Version issue with MySql.Data after upgrade to 7.3.1.
#U4-7410 Fixed
2015-11-18 19:39:10 +01:00
Shannon Deminick
886347e763 Merge pull request #912 from lars-erik/fix-u4-7268
Support generic CultureInfo as language culture
2015-11-18 18:26:09 +01:00
Shannon Deminick
9fa606e065 Merge pull request #907 from umbraco/temp-U4-7414
U4-7414 Deleted tab's properties should become generic properties
2015-11-18 17:01:02 +01:00
Shannon
e40ac44afd updates test to reflect the instructions to replicate the original issue U4-7414 2015-11-18 17:00:27 +01:00
Shannon
48603fb840 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-11-18 16:07:10 +01:00
Shannon
f824439180 Merge branch 'UKFest-U4-4792' of https://github.com/opelpanfan/Umbraco-CMS into opelpanfan-UKFest-U4-4792
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
2015-11-18 16:07:01 +01:00
Shannon Deminick
b3616c9f8c Merge pull request #911 from umbraco/temp-U4-4792
Fixes: U4-4792 Ancestors() on IContent throws "Object reference not set to an instance of an object."
2015-11-18 16:04:22 +01:00
Shannon
48383f2e7a updaes null check and ensures the path isn't pre-set in the withidentity overload 2015-11-18 16:04:01 +01:00
Shannon
cb98385242 updates content/media service methods - null checks for parent IContent, dosn't use Parent() syntactic sugar methods, removes path creation in the WithIdentity methods. 2015-11-18 15:52:32 +01:00
Claus
29ec8cb2d3 Merge pull request #857 from gerwinbouwhuis/UKFest-U4-5581
Uk fest u4 5581
2015-11-18 14:32:52 +01:00
Mads Rasmussen
813171e6ae remove styles which overwrite lists styles in control overlay 2015-11-18 14:16:33 +01:00
Lars-Erik Aabech
04900337c7 Support generic CultureInfo as language culture 2015-11-18 14:13:32 +01:00
Rune Strand
8d88394cf7 Move sortable init to row title 2015-11-18 13:37:29 +01:00
Rune Strand
46951cb79f Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-11-18 12:14:09 +01:00
Rune Strand
eff0ef027a Add cloned content when sorting 2015-11-18 12:13:51 +01:00
Mads Rasmussen
2922bf5ac8 Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-11-18 12:01:58 +01:00
Mads Rasmussen
6f15b9fb1e deselect everything when clicking outside a row 2015-11-18 12:01:24 +01:00
Mads Rasmussen
72311a7808 set blue background on active rows 2015-11-18 12:01:00 +01:00
Rune Strand
6fa94b4f5d More sortable styling 2015-11-18 09:33:34 +01:00
Claus
1433685160 MediaService assigns Path when creating media objects. 2015-11-18 09:26:45 +01:00
Rune Strand
15426193a2 Merge branch 2015-11-18 09:24:58 +01:00
Sebastiaan Janssen
214e4beb2f Merge branch 'dev-v7' into 7.4.0 2015-11-17 18:51:29 +01:00
Stephan
c5994ed54a Fix previous commit 2015-11-17 17:25:01 +01:00
Stephan
f5f9cb676c Fix CultureInfo leak in UmbracoApplicationBase too. 2015-11-17 16:54:24 +01:00
Claus
04e2d2370a Fixes: U4-4792 Ancestors() on IContent throws "Object reference not set to an instance of an object." 2015-11-17 16:49:01 +01:00
Stephan
8d00d931b0 U4-7414 Deleted tab's properties should become generic properties 2015-11-17 16:36:57 +01:00
Shannon Deminick
2998ad8cea Merge pull request #873 from AffinityID/u4-7352
U4-7352 Fixed exception logging in UmbracoDatabase.
2015-11-17 16:21:18 +01:00
Shannon Deminick
46c15ef28f Merge pull request #877 from cheeseytoastie/UKFest-7341
Ukfest 7341
2015-11-17 16:19:35 +01:00
Shannon
5c1a10e1f9 re-fixes the jquery bower build 2015-11-17 14:36:05 +01:00
Claus
2b369a57d8 Merge pull request #864 from andycyberian/UKFest-U4-6980
Uk fest u4 6980
2015-11-17 14:25:38 +01:00
Sebastiaan Janssen
da479430d4 Merge branch 'dev-v7' into 7.4.0 2015-11-17 13:49:21 +01:00