Commit Graph

26389 Commits

Author SHA1 Message Date
Lars-Erik Aabech
91f2d47cf8 Merge branch 'temp8-u4-11427-remove-propertyinjection' of https://github.com/lars-erik/Umbraco-CMS into temp8-u4-11427-remove-propertyinjection 2018-12-05 23:02:59 +01:00
Lars-Erik Aabech
542b08650b Also register RenderMvcControllers 2018-12-05 23:01:16 +01:00
Stephan
c6a9701e53 Merge branch temp8 into temp8-di2690 2018-12-05 09:05:47 +01:00
Stephan
e5d12117d5 Composition can set default renderMvc controller 2018-12-05 08:19:21 +01:00
Stephan
50f4e12ca1 Merge pull request #3819 from umbraco/temp8-fix-dashboard-manifest
Refactor package.manifest dashboards JSON structure
2018-12-04 12:12:44 +01:00
Stephan
73f31dd800 Refactor manifest dashboards, security 2018-12-04 11:37:07 +01:00
Warren Buckley
b361d1c950 Refactor package.manifest dashboards JSON structure 2018-12-03 14:26:16 +00:00
Warren Buckley
8b5eb1f0a4 Merge pull request #2478 from Shazwazza/U4-2827
U4-2827 Allow dashboards via manifest
2018-12-03 12:13:12 +00:00
Warren Buckley
53df1dfc82 Merge pull request #3815 from umbraco/temp8-upgrade-dev-dependencies
Temp8 upgrade dev dependencies
2018-12-03 11:19:51 +00:00
Warren Buckley
0d6ee927bc Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-dev-dependencies 2018-12-03 11:01:32 +00:00
Warren Buckley
37eeeba76b Merge pull request #3798 from umbraco/temp8-upgrade-depdendencies
Temp8 upgrade depdendencies
2018-12-03 10:07:16 +00:00
Warren Buckley
e4fb2dff96 Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-depdendencies 2018-12-03 09:39:26 +00:00
Warren Buckley
8b77c5e278 Merge pull request #3792 from umbraco/temp8-upgrade-jquery
Temp8 upgrade jquery
2018-12-03 09:35:45 +00:00
Warren Buckley
dd7b4669d5 Merge pull request #3786 from umbraco/temp8-3651
add overlay to tree when infinite editing is open
2018-12-03 09:21:41 +00:00
Warren Buckley
a40a6fbe8f Merge pull request #3783 from umbraco/temp8-3110
Temp8 3110
2018-12-03 09:16:33 +00:00
Mads Rasmussen
32ed237729 package-lock 2018-12-03 09:48:59 +01:00
Shannon
774b968112 Cleans up the dashboard config that we release 2018-12-03 16:55:06 +11:00
Shannon
a5b331f6d7 Gets site running with dashboards 2018-12-03 16:40:28 +11:00
Shannon
162b90194d Gets sln building, removes old legacy settings, removes ascx dashboard support 2018-12-03 16:14:49 +11:00
Shannon
953f37f2db Merge remote-tracking branch 'umbraco/temp8' into U4-2827
# Conflicts:
#	src/Umbraco.Core/Manifest/ManifestBuilder.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Manifest/PackageManifest.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/SectionController.cs
2018-12-03 15:25:31 +11:00
Mads Rasmussen
704a1ee840 upgrade dev-dependencies 2018-11-30 09:12:58 +01:00
Mads Rasmussen
80afcb64e0 remove bootstrap javascript 2018-11-29 15:10:11 +01:00
Mads Rasmussen
3a839ca1ef don't ship with moments libraries including locales 2018-11-29 14:24:15 +01:00
Mads Rasmussen
45feb9577d get spectrum color picker from npm + get latest version 2018-11-29 13:30:37 +01:00
Mads Rasmussen
9f557d5697 fix color picker model.value 2018-11-29 13:03:43 +01:00
Stephan
2c2873492f Fix merge 2018-11-29 12:48:13 +01:00
Stephan
146bbcec4b Merge branch temp8 into temp8-di2690 2018-11-29 12:38:44 +01:00
Mads Rasmussen
5a33990a74 fix js error in diff + break words 2018-11-29 12:29:52 +01:00
Stephan
eb0d2464aa Minor fixes 2018-11-29 12:27:16 +01:00
Mads Rasmussen
89cac781ae fix checkmark when copying password 2018-11-29 11:01:50 +01:00
Mads Rasmussen
aa9950ff29 fix assets service 2018-11-29 11:01:21 +01:00
Mads Rasmussen
1daddf484c update npm for packages not running latest 2018-11-29 11:00:09 +01:00
Stephan
c6891c6c70 RegisterUnique 2018-11-29 10:35:16 +01:00
Stephan
ec3fd890ec Merge pull request #3761 from kjac/v8-fix-move-copy-status-type-ysod
V8: Fix YSODs when moving and copying things in the Settings section
2018-11-28 21:45:15 +01:00
Mads Rasmussen
44478201cf update package-lock 2018-11-28 20:47:02 +01:00
Mads Rasmussen
e512ba0b8b remove css for jquery-ui 2018-11-28 20:40:40 +01:00
Stephan
e9de6c1fc9 Naming is hard 2018-11-28 17:35:12 +01:00
Stephan
e42f140a2c Cleanup 2018-11-28 16:57:01 +01:00
Stephan
b1651b8c9e Delete legacy code 2018-11-28 16:22:20 +01:00
Stephan
8d49fb3e8b Cleanup and document controller constructors 2018-11-28 16:19:50 +01:00
Mads Rasmussen
e4a4a17739 get jquery touch punch from npm 2018-11-28 15:34:51 +01:00
Mads Rasmussen
df193987c4 add back jquery-ui and remove jquery-migrate 2018-11-28 15:18:14 +01:00
Mads Rasmussen
d0d44bf542 remove unused treepicker overlay 2018-11-28 14:54:01 +01:00
Mads Rasmussen
6fc38b1d12 fix tooltip and overlay calculations 2018-11-28 14:53:39 +01:00
Mads Rasmussen
350bfb3461 remove keypress shorthand 2018-11-28 14:52:49 +01:00
Mads Rasmussen
f3d30342b4 change from bind/unbind to on/off 2018-11-28 14:32:30 +01:00
Mads Rasmussen
9c9a05f32c changing from click and focus shorthands 2018-11-28 13:22:30 +01:00
Mads Rasmussen
85d61ee127 remove unused focus search field code 2018-11-28 13:17:08 +01:00
Mads Rasmussen
4e29a3709d upgrade jquery + temp add jquery migrate + temp remove other jquery libraries 2018-11-28 13:16:26 +01:00
Mads Rasmussen
f956a035a1 remove jquery validation libraries 2018-11-28 13:12:00 +01:00