Commit Graph

16732 Commits

Author SHA1 Message Date
Stephan
0d3a413708 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-09-01 16:01:03 +02:00
Stephan
85d243508c Merge pull request #1453 from umbraco/temp-U4-8923
U4-8923 Adding new property to media breaks ability to save
2016-09-01 15:55:48 +02:00
Sebastiaan Janssen
a74feab9eb U4-8923 Adding new property to media breaks ability to save
If you add a new property to a member or media type and then try to update an
existing media item/member ContentRepository didn't have this problem because
it was already using the additional if statement that has now also been added to
MemberRepository and MediaRepository
2016-09-01 15:15:47 +02:00
Claus
71482f0fc9 U4-8584 Starterkit thumbnails are not really thumbnails
updating url for thumbnails in the "new" starterkit code - seems we forgot those and only updated the legacy installer.
2016-08-29 08:54:01 +02:00
Stephan
41fafaf7ae Merge branch origin/dev-v7 into dev-v7-deploy 2016-08-26 13:20:53 +02:00
Stephan
0789295701 Temp - 7.6.0-alpha003 - even with internals visible to, need IBackgroundTask to be public 2016-08-24 10:11:38 +02:00
Sebastiaan Janssen
be57692a62 Change some event handlers back to .live instead of .on
#U4-8884 Fixed
2016-08-23 10:48:15 +02:00
Sebastiaan Janssen
460d884109 Update the companion PermissionEditor.aspx file too 2016-08-23 10:48:15 +02:00
Sebastiaan Janssen
1a1a3c43ca Merge pull request #1446 from or321/or321-patch-1
Update UmbracoCms.nuspec
2016-08-23 10:40:10 +02:00
or321
6df6b87c4c Update UmbracoCms.nuspec
Update Newtonsoft.Json dependency to allow version 9.0.1 . This will match the same change in UmbracoCms.Core.nuspec file
2016-08-23 11:01:21 +03:00
Stephan
bb81298e84 Temp - 7.6.0-alpha002 + internals visible to deploy 2016-08-23 09:40:02 +02:00
Sebastiaan Janssen
172895f17f U4-8884 Users editor doesn't work any more in 7.5.0
#U4-8884 Fixed
2016-08-22 15:18:04 +02:00
Simon Busborg
8d3add8834 Fixes: U4-8878 Text in grid items in reorder-mode is now right aligned 2016-08-22 09:10:05 +02:00
Sebastiaan Janssen
ae257550da Update README.md 2016-08-21 15:33:08 +02:00
Sebastiaan Janssen
4653746117 Correct notation of path/name combo 2016-08-21 11:06:25 +02:00
Sebastiaan Janssen
84bd22190b Use names artifacts 2016-08-21 10:58:57 +02:00
Sebastiaan Janssen
5e58e0d0a5 Wrong artifact filter 2016-08-20 16:05:46 +02:00
Sebastiaan Janssen
8b2fa22b90 Attempt to have dev-v7 builds deploy to nightlies 2016-08-20 15:49:21 +02:00
Sebastiaan Janssen
f76fd360f1 Bumps version 2016-08-20 10:29:49 +02:00
Sebastiaan Janssen
39ebb9545d Merge pull request #1442 from umbraco/temp-U4-8868
U4-8868 Ensuring all usages of .live() is updated
2016-08-18 15:32:03 +02:00
Sebastiaan Janssen
6572eea915 Merge pull request #1443 from jannikanker/jannikanker-U4-8867
U4-8867 (IFRAME casing typos)
2016-08-18 13:05:14 +02:00
Stephan
bd6e2477b5 Post-merge 2016-08-18 13:02:52 +02:00
Jannik Anker
99ad5d6826 Update en_us.xml 2016-08-18 12:57:17 +02:00
Jannik Anker
2a1697b0a3 Update en.xml 2016-08-18 12:55:37 +02:00
Jannik Anker
583a09260e Update ClickJackingCheck.cs 2016-08-18 12:52:34 +02:00
Claus
344dab65d4 U4-8868 Ensuring all usages of .live() is updated
changed .on bind handlers to use .live instead.
removed an old jquery.1.4.4 which seems unreferenced and unused in the whole project.
2016-08-18 12:45:15 +02:00
Stephan
acae05d287 Merge branch origin/dev-v7 into dev-v7-deploy 2016-08-18 12:38:38 +02:00
Sebastiaan Janssen
f658613fad Update README.md 2016-08-18 10:14:12 +02:00
Claus
1216f4a49e Merge pull request #1436 from umbraco/temp-u4-8856
U4-8856 - don't flood log with media errors
2016-08-17 10:52:02 +02:00
Sebastiaan Janssen
460e72fc1f Dealing with quirky trees.configs 2016-08-16 16:03:50 +02:00
Stephan
908c8837e9 U4-8856 - don't flood log with media errors 2016-08-16 15:41:52 +02:00
Sebastiaan Janssen
11c720cc2a Fixes trees config transform to work with versions older than 7.4 too 2016-08-16 14:39:52 +02:00
Sebastiaan Janssen
c93b4fa1fe Reverts: Makes sure the build uses a predictable version of npm 2016-08-16 14:39:52 +02:00
Stephan
d409d17189 U4-8813 - bugfix 2016-08-16 14:36:18 +02:00
Stephan
38c876bb53 Revert "U4-8813 - bugfix"
This reverts commit 95fb7f97d0.
2016-08-16 14:35:31 +02:00
Stephan
95fb7f97d0 U4-8813 - bugfix 2016-08-16 14:30:19 +02:00
Sebastiaan Janssen
9dfa9e2fb6 Bump the version 2016-08-16 13:37:05 +02:00
Sebastiaan Janssen
6ee8382ff3 Makes sure the build uses a predictable version of npm 2016-08-16 13:35:40 +02:00
Claus
69fb5e9932 Merge branch 'abjerner-patch-10' into dev-v7 2016-08-16 13:28:27 +02:00
Claus
ca9f3bbd5a updating various references to use examine constants. 2016-08-16 13:27:46 +02:00
Claus
fe7efa4fba Merge branch 'patch-10' of git://github.com/abjerner/Umbraco-CMS into abjerner-patch-10 2016-08-16 13:11:34 +02:00
Sebastiaan Janssen
1ec2cc430b Merge pull request #1429 from bjarnef/dev-v7-U4-8844
Set border radius for modal to zero.
2016-08-16 13:10:51 +02:00
Sebastiaan Janssen
c1a8ea9df3 Merge pull request #1433 from umbraco/temp-U4-8850
U4-8850 Configuring a custom BackOfficeUserManager type will not work if the type is not specifically BackOfficeUserManager
2016-08-16 13:09:50 +02:00
Stephan
cd2c79e7d5 U4-8813 - cleanup 2016-08-16 12:45:10 +02:00
Claus
d5d0a958d3 removed console.logs 2016-08-16 11:45:42 +02:00
Mads Rasmussen
9e9e51cf29 Merge pull request #1432 from theotron/U4-8845
U4-8845 - Prevents double-click on confirm delete from deleting from bin
2016-08-16 09:50:47 +02:00
Sebastiaan Janssen
808793edd8 Updating to latest ImageProcessor 2016-08-16 09:35:05 +02:00
Sebastiaan Janssen
3895a93b61 Replaces the old packages tree item with the new one and puts it at the top 2016-08-16 09:35:05 +02:00
Shannon
eadb9ba276 Merge branch 'refs/heads/dev-v7' into temp-U4-8850 2016-08-12 17:08:05 +02:00
Shannon
fc582b0516 adds db schema check to validate if 7.4 has been installed, changes the versions detected to only be minor versions (they shouldn't have indicated build versions), updates code to not use deprecated methods 2016-08-12 16:54:24 +02:00