yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,514 Commits 4 Branches 7 Tags
4022c3cec9e0321dd1e1fade55a8cfe90bbcc182
Commit Graph

16514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
4022c3cec9 U4-8816 Update to jQuery 2.2.4 2016-08-05 19:15:11 +02:00
Shannon
31b17e3048 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-05 17:41:13 +02:00
Shannon
42666403a6 Fixes regression issue with building the xml cache file, moves the logic to query and build the xml document for the cache to the repository level. 2016-08-05 17:41:00 +02:00
Claus
69b6044bc6 fixing null check on UmbracoContext.Current in RedirectTrackingEventHandler's PageCacheRefresher_CacheUpdated. 2016-08-05 14:01:25 +02:00
Sebastiaan Janssen
18a1aa2f6f Merge pull request #1413 from umbraco/temp-U4-8530 
U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem
 2016-08-05 13:18:29 +02:00
Shannon
92f7782ab9 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-05 13:06:49 +02:00
Shannon
3e932ecf3f fixes icon and author urls for local package install 2016-08-05 13:06:35 +02:00
Sebastiaan Janssen
dd62a917fd Merge pull request #1411 from umbraco/temp-U4-8808 
U4-8808 Fixing up 301 redirects
 2016-08-05 13:06:18 +02:00
Sebastiaan Janssen
958e20356c Merge pull request #1412 from umbraco/temp-U4-8786 
U4-8786 Member search in listview returns error (7.5-beta2)
 2016-08-05 13:04:42 +02:00
Shannon
539637720f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-05 12:31:00 +02:00
Shannon
6a3f146da1 Fixes health check index & throbber while fixing, fixes xml data integrity check to check for invalid XML that doesn't contain a GUID 2016-08-05 12:29:05 +02:00
Sebastiaan Janssen
aab2c65aaa Merge pull request #1417 from umbraco/temp-U4-8156 
U4-8156 Support minimum versions for Umbraco packages
 2016-08-05 11:58:38 +02:00
Sebastiaan Janssen
3dcba7a6b0 urlHash column has to be 20 chars because SHA1 uses more bytes than MD5 2016-08-05 11:51:08 +02:00
Sebastiaan Janssen
3ece30bd8b Don't let the event handlers kick in if Redirect Tracking is turned off in the config 2016-08-05 11:41:08 +02:00
Shannon
36a191464d ensures table name is quoted properly 2016-08-05 11:26:20 +02:00
Simon Busborg
9131b73cbb Merge pull request #1415 from bjarnef/dev-v7-U4-8809 
Show only empty recycle bin text, when filter doesn't has a value
 2016-08-05 11:14:44 +02:00
Simon Busborg
68b3ea349e Merge pull request #1414 from bjarnef/dev-v7-U4-8805 
Ensure editing area use full height when it only has a little...
 2016-08-05 10:53:13 +02:00
Claus
6c271d92f9 migration should only delete table if it is using a integer id, otherwise leave it alone. 2016-08-05 08:25:58 +02:00
bjarnef
a136235c72 Show only empty recycle bin text, when filter doesn't has a value 2016-08-04 21:10:31 +02:00
bjarnef
e8e440516f Ensure editing area use full height when it only has a little or no content 2016-08-04 20:30:54 +02:00
Sebastiaan Janssen
b2e7c7a8d4 More specific exception when a conversion fails 2016-08-04 19:18:52 +02:00
Shannon
2c15db5950 U4-8530 Make it possbile to hide preview button by DocumentType or ContentItem 2016-08-04 18:34:20 +02:00
Shannon
7ed240d510 Merge branch 'Phosworks-U4-8530' into temp-U4-8530 2016-08-04 18:09:00 +02:00
Shannon
a91b8e0acf Merge branch 'U4-8530' of https://github.com/Phosworks/Umbraco-CMS into Phosworks-U4-8530 2016-08-04 18:08:27 +02:00
Shannon
0be81aa4e5 U4-8786 Member search in listview returns error (7.5-beta2) 2016-08-04 18:01:57 +02:00
Shannon
9d62b2f5f9 nuspec and nuget refs updated to latest Models Builder 2016-08-04 16:59:26 +02:00
Shannon Deminick
548c7845cb Merge pull request #1409 from umbraco/temp-U4-8779 
U4-8779 Sorting not working in Members List View in 7.5 Beta2
 2016-08-04 16:46:54 +02:00
Shannon
9c7052f0fd Fixed the property join for sorting on custom columns, this would have only worked if there were actual values in those columns, we fix this now with an outer join instead of an inner join 2016-08-04 16:46:46 +02:00
Sebastiaan Janssen
177b61bbf5 Merge pull request #1292 from darrenferguson/dev-v7 
Fix U4-8532 - No built in Active Directory authentication in Umbraco
 2016-08-04 16:25:22 +02:00
Sebastiaan Janssen
8038016b55 U4-8778 The "Link your xx account" button doesn't work because it's a form wrapped in a form 2016-08-04 15:58:19 +02:00
Claus
ae0ad2becf switching to sha1 instead of md5. 2016-08-04 15:46:02 +02:00
Claus
ba11de51e3 deleting through the recycle bin also deletes redirect urls. 2016-08-04 15:46:01 +02:00
Claus
ccaa198e25 changing integer IDs to guid for RedirectUrls. 2016-08-04 15:46:01 +02:00
Claus
66c0d9dc12 removing migrations from solution 2016-08-04 15:45:58 +02:00
Claus
59c3d6a206 cleaning up migrations. we're deleting the table so no need to do a bunch of migration stuff instead of just compiling it into one migration deleting and creating the table again. 2016-08-04 15:45:58 +02:00
Shannon
0ab145e4ac Ensures that type="strict" is added to the package creation, does some null checking on the stylesheets packaging so ysod doesn't occur, some code formatting. 2016-08-04 15:33:26 +02:00
Shannon
423588d018 code formatting 2016-08-04 15:20:57 +02:00
Shannon Deminick
16afab86f3 Merge pull request #1407 from umbraco/temp-U4-8754 
U4-8754 Single content queries like Get(int id) for content, media an…
 2016-08-04 15:05:58 +02:00
Sebastiaan Janssen
43737e78fb Sorry about that! 2016-08-04 15:05:49 +02:00
Shannon Deminick
f6943ceab4 Merge pull request #1408 from umbraco/temp-U4-8361-2 
U4-8361 301 Url Tracking
 2016-08-04 14:51:50 +02:00
Sebastiaan Janssen
6495077568 Whoops 2016-08-04 14:50:55 +02:00
Sebastiaan Janssen
c61a9ee433 AppendCacheExtension needs to be AppendHeader 2016-08-04 14:46:07 +02:00
Sebastiaan Janssen
b7264b58f9 Fixed the mapping for HasPublishedVersion 2016-08-04 12:19:24 +02:00
Mads Rasmussen
d8f68f5f9b Merge branch 'spacebetween-U4-7475-grid-tinymce-styles' into dev-v7 2016-08-04 10:32:30 +02:00
Mads Rasmussen
b365a9944f Fix js errors for grunt to build 2016-08-04 10:29:36 +02:00
Simon Busborg
5b2bcdbfac Merge pull request #1399 from marcemarc/temp-u4-8772 
Fixes  U4-8772, adds icon to published but changed listview items
 2016-08-04 10:08:04 +02:00
Mads Rasmussen
abb994cf30 Merge branch 'U4-7475-grid-tinymce-styles' of git://github.com/spacebetween/Umbraco-CMS into spacebetween-U4-7475-grid-tinymce-styles 2016-08-04 10:02:11 +02:00
Sebastiaan Janssen
6e480058b9 Adds R# rule to give a little hint when newing up a disposable 2016-08-04 09:46:48 +02:00
Simon Busborg
912a460bd8 Merge pull request #1353 from abjerner/patch-7 
Added a tooltip with icon alias on mouseover
 2016-08-04 09:35:38 +02:00
Sebastiaan Janssen
52d366bb6f MD5CryptoServiceProvider is disposable 2016-08-04 08:58:30 +02:00