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

30669 Commits

Author SHA1 Message Date
Bjarke Berg
dfc37a571a Fixes for Umbraco.Web.UI.csproj 2020-08-11 11:22:15 +02:00
Bjarke Berg
7b6d64872f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 10:05:55 +02:00
Bjarke Berg
1481804014 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-08-11 10:01:17 +02:00
Bjarke Berg
9432f71a63 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-11 10:00:19 +02:00
Bjarke Berg
0fe50728df Fix csproj of Umbraco.Web.UI 2020-08-11 09:50:17 +02:00
Bjarke Berg
7ced06bc05 fix tests 2020-08-11 09:11:53 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Bjarke Berg
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591) 
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-08-11 08:28:16 +02:00
Bjarke Berg
94e1056dd9 Merge pull request #8603 from umbraco/netcore/feature/6976-migrate-preview-middleware 
Migrates preview auth Middleware
 2020-08-11 08:24:57 +02:00
Bjarke Berg
d98d1d8373 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-11 07:30:50 +02:00
Bjarke Berg
a02b5e93a5 Merge pull request #8598 from umbraco/netcore/feature/6972-migrate-non-oauth-auth-controller 
Migrates remaining non-oauth AuthenticationController actions to netcore
 2020-08-11 07:30:23 +02:00
Shannon Deminick
2aae974281 Merge pull request #8394 from umbraco/netcore/feature/fix-integration-tests 
Netcore: More tests migrated..
 2020-08-11 11:54:37 +10:00
Bjarke Berg
6d51dc4afa Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-10 14:30:25 +02:00
Bjarke Berg
8322151426 Fix test issue. Now testserver tests always is executed in debugmode 2020-08-10 14:10:08 +02:00
Bjarke Berg
8dea65286b Fix test. Asserting on something irrelevant 2020-08-10 13:21:44 +02:00
Shannon
cfc4933170 Merge branch 'netcore/netcore' into netcore/feature/fix-integration-tests 2020-08-10 15:50:05 +10:00
Shannon
635f1ba984 removes unused code 2020-08-10 15:48:13 +10:00
Bjarke Berg
499ffdfe97 Merge pull request #8584 from umbraco/netcore/feature/request-localization-from-user 
Netcore: Added request localization from the current user.
 2020-08-10 07:04:20 +02:00
Bjarke Berg
379454cd4b fix appsettings.json 2020-08-07 14:36:45 +02:00
Bjarke Berg
8539ffa27a Fix issue where Umbraco.Tests.Common know a legacy mvc package 2020-08-07 14:10:29 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Claus
c73f9bc2a5 fixing the other umb-toggle. 2020-08-07 09:52:19 +02:00
Shannon
cca7303abd Migrates preview auth Middleware 
Migrates UriExtensionsTests to netcore, fixes preview controller bits, adds tests for preview path for back office route check, fixes virtual paths for views,
 2020-08-07 00:48:32 +10:00
Claus
4799f73775 using label on umb-toggle instead of a separate element. 
updating localized texts to reflect what is happening.
ensure the selected value is pushed back to scope and used for the action.
 2020-08-06 15:04:18 +02:00
Shannon
1239975b07 Ensures all back office controllers have the thread culture set, we do this with a new application model targeting all back office controllers. 2020-08-06 22:08:27 +10:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Shannon
b9a4a75656 Migrates remaining non-oauth AuthenticationController actions to netcore 2020-08-06 19:09:05 +10:00
Claus
9ac3885488 Merge pull request #7596 from umbraco/v8/feature/7292-memberhasaccess 
Adds new methods to MembershipHelper for dealing with checking bulk paths for access
 2020-08-06 08:22:45 +02:00
Shannon Deminick
9cafeaf39e Merge pull request #8590 from umbraco/netcore/bugfix/get_rid_of_system_web 
Netcore: Get rid of System.Web in netcore and netstandard projects
 2020-08-06 14:42:54 +10:00
Bjarke Berg
53d8cfcfe4 Updated rc version of ImageSharp.Web 2020-08-05 08:48:18 +02:00
Bjarke Berg
3ea7945f24 Get rid of system web in netcore and netstandard libraries 2020-08-05 08:44:22 +02:00
Bjarke Berg
23a6de30ec Merge pull request #8458 from umbraco/netcore/feature/AB7479-macro-templates-migration 
NetCore: Migrating Macro Templates
 2020-08-04 15:05:25 +02:00
Bjarke Berg
38ee3c322d Moved needed extension methods for the Gallery snippet.. 2020-08-04 14:12:22 +02:00
Bjarke Berg
1dac8779c2 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/7619 - Added request localization from the current user 2020-08-04 12:54:54 +02:00
Bjarke Berg
05e7d64a08 Merge pull request #8571 from umbraco/netcore/bugfix/controller-areas 
Ensure all back office controllers are plugin controllers and use constant
 2020-08-04 08:47:51 +02:00
Bjarke Berg
7490f0cd92 Updated Smidge to 3.1.1 2020-08-04 08:29:45 +02:00
Bjarke Berg
c672f61c53 Revert appsettings.json 2020-08-04 08:14:30 +02:00
Shannon
99b012fc26 Fixes package service paths so that it's using content and web roots not just web 2020-08-04 14:51:12 +10:00
Shannon
4edf7fdf83 Ensure all back office controllers are plugin controllers and use constant 2020-08-04 12:27:21 +10:00
Bjarke Berg
6dd896ea01 https://github.com/umbraco/Umbraco-CMS/pull/8458 cleanup 2020-08-03 14:28:23 +02:00
Nikolaj E. Lauridsen
87383db814 Fix button selectors 2020-08-03 12:04:22 +02:00
Bjarke Berg
790a3b26bf Removed missing files from csproj 2020-08-03 11:42:45 +02:00
Bjarke Berg
5aae0c2b52 Removed folder from csproj 2020-08-03 11:15:02 +02:00
Shannon
7d762e0455 Merge remote-tracking branch 'origin/v8/8.7' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-07-31 15:55:39 +10:00
Ian Houghton
a0034c51f9 fix #7842 - Render a larger textarea for editing dictionary items 2020-07-30 17:59:59 +02:00
Niels Lyngsø
d5c0e79c40 make label bar white 2020-07-30 14:47:16 +02:00
Niels Lyngsø
e8332a16ae make inline editor bar white 2020-07-30 14:44:13 +02:00
Kenn Jacobsen
a93cc88756 Don't show empty search results on top of the search input field in the linkpicker 2020-07-30 12:19:27 +02:00
Kenn Jacobsen
e387c3b27f Fix JS error when trying to insert a link in an empty RTE 2020-07-30 12:13:40 +02:00
Shannon
f0cc7a493d Cleanup servervalidationmgr booleans and moves to more readable functions with comments 2020-07-30 16:03:31 +10:00