yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,623 Commits 4 Branches 7 Tags
968d52e490e2419c361006bccf7c69f1d89e2bcf
Commit Graph

5836 Commits

Author SHA1 Message Date
Shannon
968d52e490 Removes old packager files that should absolutely never be used 2017-04-26 15:46:07 +10:00
Shannon
ebbe9f6ed0 Removes old packager files that should absolutely never be used 2017-04-26 15:45:37 +10:00
Shannon
a6f9d14a1b Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-26 14:18:05 +10:00
Shannon
bfb81f6362 Allows for the umb pckage repo rest api endpoint to be configurable - for testing 2017-04-26 14:04:47 +10:00
Warren Buckley
ca3dc030bc Merge pull request #1893 from umbraco/temp-u4-9764 
U4-9764 - add FirstChild with predicate extension
 2017-04-25 11:37:37 +01:00
Warren Buckley
7ee0a278f7 Adss null check 2017-04-24 14:57:57 +01:00
Warren Buckley
ce7dd19a8f Updates the template controller save method - to take into account if the master you are updating to is a sub master that has children that there path's need updating too 2017-04-24 13:19:30 +01:00
Shannon
d295174e53 Updates JS to include the current umbraco version when requesting a package's details, updates the c# to use a new endpoint on OUR to ensure that the correct file is downloaded based on the umb version passed in. 2017-04-24 21:31:35 +10:00
Stephan
5880df3859 U4-9764 - add FirstChild with predicate extension 2017-04-19 18:56:12 +02:00
Shannon
1402494e47 Reverts changes made for U4-8963 2017-04-19 15:41:26 +10:00
Shannon
7c491c1fc1 U4-9768 Examine Management dashboard indexers and searchers not in same order 2017-04-19 14:53:46 +10:00
Shannon
460dd69884 updates the is multiple check to check for default pre-values since those won't be persisted 2017-04-19 14:38:48 +10:00
Shannon
beda99963e Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7.6 2017-04-19 14:36:28 +10:00
Shannon
b06f16f5f7 Fixes issues with U4-7318 2017-04-19 14:36:23 +10:00
Shannon Deminick
f9d79871b4 Merge pull request #1837 from Jeavon/U4-9684 
U4-9684 UDI Media Picker Value Converter should cache prevalues
 2017-04-19 14:35:29 +10:00
Shannon
d19bebc404 Merge branch 'dev-v7.6' into temp-U4-7009 2017-04-18 20:10:27 +10:00
Shannon
46dd86c745 Moves logic for checking if the current user (based on the current thread) is an admin and in which case can reset the password to an extension method 2017-04-18 20:09:27 +10:00
Warren Buckley
5c558b0eeb Merge pull request #1881 from umbraco/temp-U4-9762 
U4-9762 ezSearch package complains about pickers in macro parameters
 2017-04-13 11:26:20 +01:00
Emil Wangaa
298e56ad05 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-12 14:24:27 +02:00
Emil Wangaa
d74d2cd945 Fixes U4-9732 Insert Value in new template editor missing standard metadata fields 2017-04-12 14:24:10 +02:00
Sebastiaan Janssen
e2dc4f36ad U4-9762 ezSearch package complains about pickers in macro parameters 2017-04-12 13:39:38 +02:00
Sebastiaan Janssen
b1c6276a67 U4-7009 Changing passwords design oversight 2017-04-11 20:53:34 +02:00
Emil Wangaa
2f63364925 Fixes issue with creating new partial being saved with wrong path 2017-04-11 13:26:54 +02:00
Shannon Deminick
4e84260619 Merge pull request #1866 from umbraco/temp-u4--9747 
Adds check for GuidUdi in MediaController
 2017-04-07 12:13:25 +10:00
Shannon
604bddabdf Updateing the app.configs with the correct redirects for log4net since alll package installs are going to change these 2017-04-07 12:04:05 +10:00
Sebastiaan Janssen
16582c8207 U4-9745 Update outdated NuGet dependencies 2017-04-06 16:27:41 +02:00
Niels Hartvig
5af773d1b0 Adds check for GuidUdi in MediaController 2017-04-06 16:14:28 +02:00
Claus
2ed4948619 Merge pull request #1854 from umbraco/temp-U4-9720 
U4-9720 No more _thumb thumbnail file generation - all thumbnails should be generated via Image Processor
 2017-04-04 09:49:10 +02:00
Shannon Deminick
7b34e59222 Merge pull request #1851 from umbraco/temp-U4-9706 
fixes: U4-9706 Partial View Macro File is not created but Macro is
 2017-04-04 12:46:29 +10:00
Shannon
3706405bff Obsoletes all methods that perform image manipulation and thumbnail generation, removes thumbnail generation from occurring, fixes the issue of getting the size for an image!! Argh, we were bypassing the Exif data reading and instead still loading the whole image in! 2017-04-04 12:14:06 +10:00
Emil Wangaa
c25b710b80 Using the VirtualPath for creating the partial view macro + file instead of parent+filename 2017-04-03 14:31:21 +02:00
Shannon
09e060ff92 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-03 21:53:21 +10:00
Shannon
2248a85876 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Core/Services/ContentTypeService.cs
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
#	src/Umbraco.Web.UI/packages.config
 2017-04-03 21:50:22 +10:00
Shannon
0e6f2b542e Merge branch 'dev-v7.6' into temp-faster-startup-less-scanning 
# Conflicts:
#	src/Umbraco.Core/PluginManager.cs
 2017-04-03 16:57:57 +10:00
Shannon Deminick
218f523022 Merge pull request #1843 from umbraco/temp-U4-9691 
Fixes the Examine mgmt dashboard to look better and to detect if an i…
 2017-04-03 16:28:36 +10:00
Shannon Deminick
50c6fb036a Merge pull request #1839 from umbraco/temp-uaasscrum-827 
uaasscrum-827 - more robust umbraco.config
 2017-04-03 16:19:27 +10:00
Sebastiaan Janssen
2daf71aee4 Move LoginBackgroundImage to the content section instead of the security section 2017-03-30 11:15:12 +02:00
Sebastiaan Janssen
339edb2295 Merge branch 'dev-v7.6' into temp-U4-9687 2017-03-30 10:49:03 +02:00
Shannon
c5f388f6bc Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-03-30 17:03:51 +11:00
Shannon
bf6d084f82 Merge branch 'dev-v7' into temp-U4-9691 2017-03-30 15:50:16 +11:00
Shannon
1a03bd9624 Logs an error if the index is rebuilding due to being corrupt 2017-03-30 15:49:45 +11:00
Shannon
6a1d60c5a7 U4-9692 Update to Examine 0.1.82 2017-03-30 15:43:06 +11:00
Shannon
4fef17190f adds notes 2017-03-30 11:03:07 +11:00
Warren Buckley
143b9c605b Merge pull request #1841 from umbraco/temp-CON-1296 
Adds support for loading uninitialized trees in the treepicker
 2017-03-29 13:31:44 +01:00
Niels Hartvig
5deb483b94 U4-9694 Add support for specifying custom login background photo 2017-03-29 14:04:45 +02:00
Niels Hartvig
a409b8b0f7 Adds server side support for configuring a background photo for login screen 2017-03-29 12:49:06 +02:00
Shannon
0512eaa7fd Fixes the Examine mgmt dashboard to look better and to detect if an index is unreadable in which case it allows you to rebuild it. 2017-03-29 21:43:00 +11:00
Stephan
c46678c766 uaasscrum-827 - more robust umbraco.config 2017-03-29 10:03:02 +02:00
Shannon
cb539e82d0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
#	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2017-03-29 18:11:51 +11:00
Shannon
77af16db55 Merge branch 'dev-v7' into temp-u4-9617 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2017-03-29 16:29:18 +11:00