yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,591 Commits 4 Branches 7 Tags
4107ccdb1289e467d950975125d899bcd61b9a78
Commit Graph

10352 Commits

Author SHA1 Message Date
Shannon
4107ccdb12 cleanup unneeded code , adds notes 2020-05-12 14:20:43 +10:00
Shannon
39fed867c1 Cleans up some routing, mvc base classes, gets controller specific model binding working, applies our own application model to our controllers 2020-05-12 10:21:40 +10:00
Shannon
aa25e29e7b removes old machine key things 2020-05-08 17:53:24 +10:00
Bjarke Berg
269c75e26b AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process 2020-05-06 20:37:03 +02:00
Bjarke Berg
13197eb5ff AB#6233 - Cleanup / Fixes from review 2020-05-05 14:28:01 +02:00
Bjarke Berg
305ed42b48 Moved the sqlce db to root/App_Data/umbraco.sdf, instead of wwwroot/App_Data/umbraco.sdf 2020-05-04 14:40:11 +02:00
Bjarke Berg
03c68fa638 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 2020-05-04 06:55:08 +02:00
Bjarke Berg
aa31a8b5dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
#	src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
#	src/Umbraco.Core/PublishedModelFactoryExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-05-01 14:13:15 +02:00
Bjarke Berg
b70d7101e3 AB#6233 - Explicit restarts umbraco after install to ensure runtime state is run and umbraco is correct composed. 2020-05-01 13:40:26 +02:00
Bjarke Berg
da1e83c0d1 AB#6233 - Added application url on IHostingEnvironment. Still need a way to figure out how to get this value 2020-05-01 08:26:05 +02:00
Bjarke Berg
55d9af2b68 #6233- Install steps + MacroRenderer 2020-04-27 13:00:55 +02:00
Sebastiaan Janssen
d65041c250 Merge branch 'v8/dev' into v8/contrib 2020-04-27 11:03:32 +02:00
Kenn Jacobsen
c7908a9ba1 V8: Make the sticky header span the full width of its container (#7184) 
* Make the sticky header span the full width of its container

* Fix bad merge
 2020-04-26 12:50:15 +01:00
Bjarke Berg
56b94b53b1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Services/UserServiceExtensions.cs
#	src/Umbraco.Infrastructure/Examine/ContentValueSetBuilder.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Infrastructure/Search/ExamineComposer.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
 2020-04-24 08:34:48 +02:00
Niels Lyngsø
3f22d1c452 correcting promise 2020-04-15 17:57:38 +02:00
Niels Lyngsø
0b4b28851e revert 2020-04-15 17:47:32 +02:00
Niels Lyngsø
61cb920808 show message if user has no start-nodes 2020-04-15 17:46:28 +02:00
Niels Lyngsø
b870ca7fcf revert 2020-04-15 17:46:12 +02:00
Niels Lyngsø
627243c84c show message when user has no start nodes 2020-04-15 16:43:59 +02:00
Niels Lyngsø
0d07742671 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/4901-user-no-start-nodes 2020-04-15 16:42:15 +02:00
Bjarke Berg
26e16cee7a Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-04-15 15:52:22 +02:00
Niels Lyngsø
aab629808d slightly more shadow on content-grid items 2020-04-15 15:08:10 +02:00
Joe Glombek
b5e866aeba Append "active" to currently selected section for screen readers (#7946) 2020-04-14 11:33:30 +02:00
Jan Skovgaard
d582460f36 Add backdrop to "user overlay" (#7956) 2020-04-14 10:45:25 +02:00
Jan Skovgaard
a5ff8a429b Replace angular.fromJson with JSON.parse (#7952) 2020-04-14 10:31:52 +02:00
Jan Skovgaard
90890cea33 Replace instances of angular.element() (#7951) 2020-04-14 10:28:16 +02:00
BatJan
bd26cb36ec Replace angular.copy with Utilities.copy 2020-04-14 10:20:09 +02:00
Rachel Breeze
7f64abb224 Upgraded TinyMCE to 4.9.9 2020-04-14 10:16:36 +02:00
Jan Skovgaard
d74d9ffb2b Replace instances of angular.forEach with vanilla JS forEach (#7928) 2020-04-14 10:14:25 +02:00
BatJan
021b39378a Remove unused directive 2020-04-14 09:53:57 +02:00
BatJan
7a1bd34fa5 Remove code that does UA sniffing and explicit stuff for IE11 only 2020-04-11 15:32:09 +02:00
Mike Masey
23e32d2b59 improvement: update umb-tabs to use better semantic markup (#7926) 2020-04-10 20:42:43 +02:00
Mike Masey
b5b319f917 Convert angular.isArray to Utilities.isArray (#7934) 2020-04-10 18:34:23 +02:00
Mike Masey
318fcbe3ba V8: Angular Divorce: isString (#7929) 2020-04-10 18:24:08 +02:00
Matthew-Wise
76e4b6b301 Replaced angular.toJson with Utilities.toJson [#CanConHackathon] (#7924) 2020-04-10 18:07:37 +02:00
Marc Goodson
1e851b615f Button tag isn't closed? leaving invalid markup 
It looks like to me there is an 'extra' closing div in this markup... but I think this is because the button isn't closed, there is a closing div where the closing button should be? - eg the icon and span are part of thee button... I've made this change locally and it operates fine, but then it operating fine before hand too...
 2020-04-10 17:58:59 +02:00
Matthew-Wise
a977cfdc3f Moved from angular.IsNumber to Utilities.IsNumber (#7925) 2020-04-10 17:57:33 +02:00
Jan Skovgaard
3e9c759426 Move the infinite overlay to the same source order as regular o… (#7923) 2020-04-10 17:41:31 +02:00
Mike
766a6df967 feat: add localisation for add new row button 2020-04-10 17:23:07 +02:00
Adam Werner
db8004982f angular.isObject replace to Utilities.isObject 2020-04-10 17:20:51 +02:00
Adam Werner
a9834f055e angular.isDefined replace to Utilities.isDefined 2020-04-10 17:12:09 +02:00
Emil Olsson
199d908d7a #7658 Fix linking account if multiple IDP on common user overlay (#7845) 2020-04-09 17:25:48 +02:00
Warren Buckley
ce3ea2328d Use the events to notify us that the user does not have start nodes - potetnially could emit a new event as the login screen not showing in this POC 2020-04-02 15:38:19 +01:00
Warren Buckley
cc62525378 Debug with emitted events - ensure to remove this once PR is done 2020-04-02 15:36:16 +01:00
Bjarke Berg
b1d214a13d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
 2020-04-01 15:52:23 +02:00
Bjarke Berg
e3ac778fc9 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/WebCachingAppCache.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
#	src/Umbraco.Web/Macros/MacroRenderer.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
 2020-04-01 12:44:53 +02:00
Bjarke Berg
c75c86ab27 AB#5822 Clean up 2020-03-31 16:28:13 +02:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg
12a957e9b6 AB#5820 - Copy client files into both netcore and framework executables 2020-03-31 12:59:10 +02:00
Andy Butland
75b216bca5 Removed registerFileResolver methods on image cropper and file upload property editors. 2020-03-30 14:30:50 +02:00