yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,345 Commits 4 Branches 7 Tags
47b4a4d234cbb49e3d2d3e14c8b7305a543ae741
Commit Graph

40 Commits

Author SHA1 Message Date
Shannon
47b4a4d234 FIxes authz on some controllers, fixes js var paths for login providers, simplifies gulp so we aren't building 2x. 2020-12-01 00:19:08 +11:00
Shannon
eaa295095d Gets password roll forward working 2020-10-07 16:56:48 +11:00
Bjarke Berg
4181e2639c Clean up - Only add signalr once as dependency 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-01 07:13:16 +02:00
Mole
6ced0de2c4 Fix gulp dependencies 2020-09-29 13:32:08 +02:00
Nikolaj
2d760a7744 Update dependencies in gulp 2020-09-29 13:18:12 +02:00
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02:00
Bjarne Fyrstenborg
e1d6357806 Spectrum colorpicker v2 (#8784) 2020-09-02 19:10:22 +02:00
Bjarke Berg
361125e84b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/merge-v8-into-netcore-netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-08-27 08:39:02 +02:00
Bjarke Berg
25a7a2c7fb Changed all view paths to lowercase from gulp 2020-08-26 09:44:15 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +02:00
Jan Skovgaard
c95a7f2ef4 Add focus-lock directive (#8141) 2020-07-23 17:50:50 +02:00
Mike Chambers
ee15c68f04 Update dependencies.js 
DevTools failed to load SourceMap: Could not load content for https://localhost:44313/umbraco/lib/angular-aria/angular-aria.min.js.map: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
 2020-07-22 19:53:33 +02:00
Bjarne Fyrstenborg
6ed0d03da3 Use ace editor json mode for grid configuration (#8361) 2020-07-22 19:26:24 +02:00
Bjarke Berg
c49f50e6d4 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-04 19:04:04 +02:00
Bjarke Berg
f85204eaa1 Fixed lot of small issues for linux 2020-07-04 15:07:07 +02:00
Bjarke Berg
58d7fc1817 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
 2020-06-05 08:05:50 +02:00
Niels Lyngsø
180b858ff5 V8/bugfix/gulp update inline views on watch (#8200) 2020-05-29 14:09:20 +02:00
Bjarke Berg
12a957e9b6 AB#5820 - Copy client files into both netcore and framework executables 2020-03-31 12:59:10 +02:00
Niels Lyngsø
e2adb4964c remove isProd from Gulp script 2019-11-13 09:36:40 +01:00
Niels Lyngsø
957520aca0 fix watch task for LESS 2019-10-25 10:29:57 +02:00
Niels Lyngsø
6dbbe1bdd6 correct mistake in WatchTask of our Gulp Script 2019-10-23 15:52:48 +02:00
Niels Lyngsø
cc3ef9de0c Upgrade Gulp to v4 (#6809) 2019-10-23 10:31:07 +02:00
Matthew-Wise
04a201f5f0 install ngAria (#6628) 2019-10-17 16:41:25 +02:00
Niels Lyngsø
aafa314f0e Separate gulp script for docs (#6409) 2019-09-25 10:52:33 +02:00
Niels Lyngsø
f8b2489288 clean out image tests 2019-09-19 09:18:11 +02:00
Niels Lyngsø
f59cf544a5 make gulp able to watch libs 2019-09-13 13:43:48 +02:00
Shannon
9d77114d50 fixes gulp build for dev purposes - no fastdev since there's no need for it, removes inlining templates when not in prod 2019-08-14 12:28:28 +10:00
Shannon
5e38cadacc publishes js test results to xml so that Azure DevOps can read the results, re-enables js test building, fixes an issue with one of the tests 2019-02-14 12:30:36 +11:00
Stephan
b177607d47 Suspend JS tests - can we build? 2019-02-08 14:14:30 +01:00
Shannon
977250dcdd tests as part of build 2019-02-07 17:15:49 +11:00
Shannon
d76f7db700 fixes the runTest build so that it properly builds the babel js and fixes one of the tests 2019-02-07 16:59:25 +11:00
Shannon
261ddfbcd6 Gets unit tests running again and added a task runTests 2019-02-07 16:22:29 +11:00
Shannon
86b31c2782 fixes test.js to point to the correct karma config 2019-02-07 15:41:20 +11:00
Kenn Jacobsen
57fb9888a2 Add localization to Flatpickr 2019-01-26 18:22:12 +01:00
Niels Lyngsø
dd29deec6a V8 Gulp — only run imagemin in production mode. 2019-01-21 13:30:49 +01:00
Niels Lyngsø
6dd4d7f475 V8 FE Gulp Fastdev script 2019-01-18 10:12:24 +01:00
Niels Lyngsø
b9812ca5c4 Added processJs 2019-01-17 16:37:33 +01:00
Niels Lyngsø
d744d6aabe Gulp factoring 
- Moved tasks into separate files
- Moved all configuration into gulp/config.js
 2019-01-17 13:57:59 +01:00