Shannon
|
bb3a9c0e2e
|
Fixes: U4-7394 Missing maxFilseSize variable from web.config in the backoffice
|
2015-11-23 15:19:13 +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 |
|
Lars-Erik Aabech
|
04900337c7
|
Support generic CultureInfo as language culture
|
2015-11-18 14:13:32 +01:00 |
|
Claus
|
1433685160
|
MediaService assigns Path when creating media objects.
|
2015-11-18 09:26:45 +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 |
|
Claus
|
c37a6bb928
|
Merge pull request #870 from JJCLane/UKFest-U4-6094
Adds a check to include users in the send to translation list that ha…
|
2015-11-17 13:48:01 +01:00 |
|
Sebastiaan Janssen
|
05c592860d
|
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2015-11-17 13:43:19 +01:00 |
|
Claus
|
0fecad9867
|
Merge pull request #906 from umbraco/temp-U4-6515
Fixes: U4-6515 Media picker does not set $dirty
|
2015-11-17 11:51:58 +01:00 |
|
Claus
|
3d95b4d73a
|
Updated unit test after adding in TaskTypeMapper.
cherrypicked from dev-v7.
|
2015-11-17 11:51:03 +01:00 |
|
Shannon Deminick
|
60c2040cba
|
Merge pull request #890 from umbraco/temp-U4-7286
Fixes: U4-7286 Upgrade script to normalize all GUIDs for content types + update Courier to support it
|
2015-11-17 11:48:19 +01:00 |
|
Claus
|
3045068d68
|
Fixes: U4-6515 Media picker does not set $dirty
Included fix for member picker.
|
2015-11-17 10:59:21 +01:00 |
|
Claus
|
37a6668313
|
Merge branch 'U4-6515' of git://github.com/deepak4u/Umbraco-CMS into deepak4u-U4-6515
|
2015-11-17 10:50:07 +01:00 |
|
Sebastiaan Janssen
|
36814d746f
|
Merge pull request #905 from GertyEngrie/dev-v7
U4-7297 - fixes <hr/>-button in tinymce
|
2015-11-17 10:34:37 +01:00 |
|
Claus
|
a72f6edb6b
|
Merge pull request #846 from OptimisticCoder/UKFest-U4-6732
U4-6732 - Added message on back office, when JS is disabled.
|
2015-11-17 10:23:06 +01:00 |
|
Claus
|
e442911d0f
|
Merge pull request #892 from umbraco/temp-U4-7342
Temp u4 7342
|
2015-11-17 10:09:33 +01:00 |
|
Sebastiaan Janssen
|
e01cbcd405
|
Fix failing upgrade due to old dll being in bin folder
|
2015-11-17 09:24:22 +01:00 |
|
Claus
|
012ed6cf16
|
Merge pull request #862 from dampee/u4-7314
U4-7314 Change name of "Textbox Multiple" to "TextArea"
|
2015-11-17 08:57:49 +01:00 |
|
Gerty Engrie
|
eb3ff12916
|
U4-7297 - fixes <hr/>-button
|
2015-11-17 00:35:10 +01:00 |
|
Claus
|
1ebff69358
|
Merge pull request #904 from umbraco/temp-U4-7393
Fixes: U4-7393 Actions menu placed behind publish button on mobile phone
|
2015-11-16 16:02:00 +01:00 |
|
Claus
|
5435c44ea9
|
Using a lower z-index to fix the issue at hand.
|
2015-11-16 16:00:43 +01:00 |
|
Claus
|
76fa477c35
|
Merge branch 'U4-7393' of git://github.com/Acentrage/Umbraco-CMS into Acentrage-U4-7393
|
2015-11-16 15:55:04 +01:00 |
|
Claus
|
1f6f36d8c8
|
Updated unit test after adding in TaskTypeMapper.
|
2015-11-16 15:53:58 +01:00 |
|
Claus Jensen
|
c46ac11125
|
Merge pull request #849 from mzajkowski/UKFest-U4-6282
U4-6282 Add note to Register Partial Macro
|
2015-11-16 15:37:47 +01:00 |
|