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

16496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
aa66fd6e33 rewrite controller as vm + refactor controller to follow angular style guide 2016-08-05 16:59:03 +02:00
Sebastiaan Janssen
19325ac522 Fixes the build 2016-08-05 14:44:37 +02:00
Mads Rasmussen
b8b30bdc6e make resource for all redirect url end points 2016-08-05 14:35:58 +02:00
Mads Rasmussen
1f8dc9a424 move dashboard from App_Plugins to dashboards folder 2016-08-05 12:36:10 +02:00
Mads Rasmussen
2f0ba3ac07 First part of html + js cleanup - use angular components in dashboard view + make js fit. 2016-08-05 10:51:32 +02:00
Sebastiaan Janssen
221edc76cf Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-U4-8802 2016-08-04 17:49:42 +02:00
Sebastiaan Janssen
0280d832b5 Some fixing based on code review 2016-08-04 17:48:50 +02:00
Sebastiaan Janssen
875070fed8 File should not have been committed 2016-08-04 17:02:46 +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
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
Sebastiaan Janssen
ba5be0e22a Adds search function 2016-08-04 11:21:42 +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
Sebastiaan Janssen
e66eefbbd7 Fixes unit test 2016-08-03 21:42:40 +02:00
Sebastiaan Janssen
f1d9775a0f Fix the build 2016-08-03 21:15:27 +02:00
Sebastiaan Janssen
1aa2845b4a Merge pull request #1360 from marcemarc/dev-u4-8657 
Closes Issue U4-8657 - Add an overload to GetDictionaryValue to provide fallback text
 2016-08-03 21:08:16 +02:00
Sebastiaan Janssen
1c88117498 U4-8803 Add "Create package" back as a right-click item on the "Created Packages" node 
#U4-8803 Fixed
 2016-08-03 20:17:43 +02:00
Sebastiaan Janssen
6237d4a3e5 Adds a toggle to disable/enable the URL tracker 
Adds paging, adapted from https://github.com/robertjf/umbMemberListView/blob/master/MemberListView/App_Plugins/MemberManager/backoffice/dashboard/memberListView.controller.js
 2016-08-03 20:01:43 +02:00
Sebastiaan Janssen
77cbdcf38f js files are ignored by default, need to force add them if we really want them 2016-08-03 19:05:04 +02:00
Sebastiaan Janssen
85a3abf643 Adds a setting to be able to disable redirect URL tracking 2016-08-03 17:57:41 +02:00
Sebastiaan Janssen
c53a04d658 Needed to be fixed, just like for the ascending OrderBy - see U4-4474 2016-08-03 17:57:41 +02:00
Sebastiaan Janssen
b4d5140d07 WIP Starting with taking Marc's code to get a rudimentary dashboard for the 301 URL tracker 2016-08-03 17:57:01 +02:00
Sebastiaan Janssen
11cafa2c4c Adds a setting to be able to disable redirect URL tracking 2016-08-03 17:54:21 +02:00
Sebastiaan Janssen
a5f3b50699 Needed to be fixed, just like for the ascending OrderBy - see U4-4474 2016-08-03 17:52:27 +02:00
Shannon
00bc454080 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-03 14:04:33 +02:00
Shannon
67cd4aeb59 fixes user mgr logic 2016-08-03 14:04:25 +02:00
Claus
b4ea03cdf3 U4-8779 Sorting not working in Members List View in 7.5 Beta2 2016-08-03 12:43:46 +02:00
Mads Rasmussen
c8d7a62a47 Fixes: U4-8747 Actions menu button not aligned with heading input 2016-08-03 09:53:55 +02:00
Sebastiaan Janssen
b9fcda8f39 U4-8361 301 Url Tracking 
Adds the ability to add certain headers to a PublishedContentRequest - these are internal for now until we're sure we want to expose them
Adds response headers to tell browsers not to cache the 301 redirects so people can easily change their mind later
 2016-08-02 17:01:32 +02:00
Sebastiaan Janssen
e020779a14 U4-8751 GetCropUrl method should have a parameter for specifying the image format 
Additional fix asking for InvariantContains instead of just Contains
 2016-08-02 15:07:25 +02:00
Sebastiaan Janssen
d611ae85e1 Merge pull request #1398 from arknu/U4-8751_2 
U4-8751: Put format parameter at the end when format is specified in furtherOptions
 2016-08-02 14:57:38 +02:00
Sebastiaan Janssen
2df8f55032 U4-8794 Allow Newtosoft JSON 9.0.1 to be installed 
#U4-8794 Fixed
 2016-08-02 14:45:57 +02:00
Sebastiaan Janssen
6788e8954e U4-8509 woff2 mime type 2016-08-02 14:37:08 +02:00
Sebastiaan Janssen
080da771ff U4-8457 Ensure <MacroErrors> default is updated from legacy inline setting to newer throw setting 
#U4-8457 Fixed
 2016-08-02 14:37:08 +02:00
Sebastiaan Janssen
08b3b635b4 Merge pull request #1305 from electricsheep/U4-8336 
U4-8509 - Added woff2 mime type
 2016-08-02 14:36:58 +02:00
Mads Rasmussen
8e411069f4 Merge pull request #1318 from umbraco/temp-U4-8584 
Temp u4 8584
 2016-08-02 13:26:34 +02:00