yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,422 Commits 4 Branches 7 Tags
820069d5d5cd3d0da0c3c1829ff428113e94de6c
Commit Graph

17422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Claus
9f5a9f179f U4-8866 Deleting a parent document type fails if any documents using a child document type exist 
ensures that we also manually delete content of any child content type being deleted, instead of only deleting content of the actual content type sent for delete.
 2016-08-18 11:17:05 +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
Shannon Deminick
432fac7dc9 Merge pull request #1430 from umbraco/temp-U4-8849 
Fixes: U4-8849 301 Url tracker - When deleting last item on a page th…
 2016-08-12 16:40:49 +02:00
Sebastiaan Janssen
fad69046df Don't ship with the test-baseUrl 2016-08-12 16:38:48 +02:00
Shannon
6bcadfea44 Removes the explicit castings to (BackOfficeUserManager) since that isn't actually the base class! The base class is BackOfficeUserManager<BackOfficeIdentityUser>, all of this identity stuff is a bit of a generics nightmare but that also do to the generic nightmare that is OWIN. Moves more logic to the base class so it can be used by sub classes, fixes the base class to use a generic user type 2016-08-12 16:17:14 +02:00
theotron
a3c457e50b Fixes U4-8845 - Double-click on confirm delete, deletes from bin as well 
http://issues.umbraco.org/issue/U4-8845
 2016-08-12 14:39:12 +01:00
Sebastiaan Janssen
b2a56fa58f Merge branch 'ugurcelenk-dev-v7' into dev-v7 2016-08-12 14:19:09 +02:00
Sebastiaan Janssen
f97c20253a Turkish Language file updated #1431 2016-08-12 14:18:50 +02:00
Ugur Celenk
51f57eb5ce Turkish Language file updated 2016-08-12 14:58:10 +03:00
Sebastiaan Janssen
54e82f9ed1 Fix nasty typo 2016-08-12 12:25:58 +02:00
Shannon
2ff3ce933b U4-8850 Configuring a custom BackOfficeUserManager type will not work if the type is not specifically BackOfficeUserManager 2016-08-12 12:20:00 +02:00
Mads Rasmussen
1c15daca52 Fixes: U4-8849 301 Url tracker - When deleting last item on a page the url tracker should check for new results. 2016-08-12 10:49:20 +02:00
Shannon
de2d4bef13 Ensure the current umbraco version is passed up to Our for the new packaging section 2016-08-12 10:19:08 +02:00
bjarnef
8c6f56d3f5 Set border radius for modal to zero. 2016-08-11 18:46:01 +02:00
Sebastiaan Janssen
2f0b26db47 Merge pull request #1428 from umbraco/temp-U4-8841 
U4-8841 Scheduled publishing in 7.5.0-latest has some problems
 2016-08-11 17:37:16 +02:00
Shannon
1fd020a0f2 adds better debug logging to scheduled publishing 2016-08-11 14:33:10 +02:00
Shannon
e12c294150 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-11 14:06:49 +02:00
Shannon
8d1d394ded Adds latest stable Examine version 2016-08-11 14:06:38 +02:00
Claus
3274965c34 typo 2016-08-11 12:43:12 +02:00
Claus
54fb1c6231 fixes the offsetting not being applied when loading the datepicker. 2016-08-11 11:22:50 +02:00
Morten Christensen
d3ff1cbba9 Merge pull request #1426 from umbraco/temp-U4-8671 
U4-8671 Media Types Missing in 7.4
 2016-08-11 11:03:08 +02:00