yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,641 Commits 4 Branches 7 Tags
115b0cd2aa6868e6d3ca3676c32e8f90381fb637
Commit Graph

48 Commits

Author SHA1 Message Date
Stephan
115b0cd2aa Merge branch temp8 into temp8-di2690 2018-12-18 15:42:45 +01:00
Shannon
c80a9b1402 Fixes the typeahead (mostly) 2018-12-10 17:26:15 +11:00
Stephan
ed222510f0 Fixes 2018-12-07 13:24:25 +01:00
Stephan
710ec704b3 Merge branch temp8 into temp8-di2690 2018-12-07 09:52:46 +01:00
Stephan
fb4717d31e Merge branch 'temp8-3527-indexes-via-code' into temp8 2018-12-07 09:27:38 +01:00
Stephan
c74fc7a8f9 Misc cleanup and renaming 2018-12-05 12:57:23 +01:00
Sebastiaan Janssen
f002b371b9 Update npm marked reference 2018-12-05 10:42:44 +01:00
Stephan
c6a9701e53 Merge branch temp8 into temp8-di2690 2018-12-05 09:05:47 +01:00
Mads Rasmussen
32ed237729 package-lock 2018-12-03 09:48:59 +01:00
Mads Rasmussen
704a1ee840 upgrade dev-dependencies 2018-11-30 09:12:58 +01:00
Mads Rasmussen
1daddf484c update npm for packages not running latest 2018-11-29 11:00:09 +01:00
Mads Rasmussen
44478201cf update package-lock 2018-11-28 20:47:02 +01:00
Stephan
49a0b68b28 IContainer is IRegister+IFactory 2018-11-28 11:05:41 +01:00
Shannon
08dc94a535 Merge branch 'temp8' into temp-tinymce 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
 2018-11-22 15:38:58 +11:00
Stephan
d3a894b7a3 Add package-lock.json back 2018-10-26 16:06:45 +02:00
Shannon
d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Chris Houston
c401782d5e Added clean-css to the client side build process (#3371) 2018-10-21 16:27:39 +02:00
Lars-Erik Aabech
8894df919e Should not have package-lock in git 2018-10-21 12:37:14 +02:00
Warren Buckley
d8f1ec5116 Merge pull request #3200 from umbraco/temp8-3087-tree-grouping 
#3087 - Tree Grouping in Settings section
 2018-10-16 10:14:22 +01:00
Shannon
286f7b3279 Gets tree syncing working, updates the GetApplicationTrees to still return a single Root since we require this everywhere for JS, fixes full screen section and makes users a full screen section (and reduces unecessary code), removes code to avoid breaking changes from v7 2018-10-16 16:41:06 +11:00
Shannon
02eb1aef91 Updates some styles so we get the button state back, cleans up some js 2018-10-16 12:15:48 +11:00
Carole Rennie Logan
1f072a383e ContentApp Show/Hide per user Role 
Making content app work show hide in manifest work for user roles. for example:

 "show": [
                "+role/admin"
            ]
 2018-10-14 15:56:22 +01:00
Warren Buckley
996c48cc7f Package lock without codemirror 2018-10-12 14:35:47 +01:00
Shannon
ab846ec4f6 Changes default theme to Modern 2018-10-12 10:00:47 +02:00
Warren Buckley
0e8c5f48fe tinymce to correct version - 4.8.3 2018-10-11 15:14:33 +01:00
Warren Buckley
a275b47139 npm install of tinymce 2018-10-11 15:12:05 +01:00
Warren Buckley
ac5ee9053f Update & match momentjs version 2018-10-11 13:32:15 +01:00
Mads Rasmussen
a00875089c get the right version of ace 2018-10-11 14:10:18 +02:00
Shannon
926fef43d0 Fixes merge issues 2018-10-11 14:07:04 +02:00
Mads Rasmussen
09f67c6c43 fix version 2018-10-11 13:26:35 +02:00
Mads Rasmussen
bd20518d50 move the last dependencies 2018-10-11 12:16:09 +02:00
Mads Rasmussen
a0c7a45a4c move, move, move all day loong... 2018-10-11 10:44:14 +02:00
Mads Rasmussen
37d14f7413 moving moments + angular-dynamic-locale 2018-10-11 09:46:23 +02:00
Mads Rasmussen
4d13c631ed aaand move some more 2018-10-10 21:29:42 +02:00
Mads Rasmussen
a4903b9581 get jquery libraries to npm 2018-10-10 20:58:35 +02:00
Warren Buckley
ecb46214d8 package lock JSON update post babel merge 2018-10-09 15:20:31 +01:00
Mads Rasmussen
369971bf5f Merge branch 'temp8' into temp8-babel 2018-10-09 15:35:59 +02:00
Warren Buckley
ebe52ed6b6 Updated package-lock.json 2018-10-09 14:30:25 +01:00
Stephan
00017a0624 Version 8.0.0-alpha.52 for ModelsBuilder 2018-10-08 16:46:23 +02:00
Mads Rasmussen
8c52529e47 add babel + babel config 2018-10-07 20:01:20 +02:00
Stephan
61a926e7e6 Cleanup npm package[-log].json files 2018-10-03 14:44:08 +02:00
Shannon
edc9744397 manual merge pass #1 2018-10-02 11:14:04 +02:00
Mads Rasmussen
a47ae2e5c3 add diff library + generate diff 2018-09-24 20:10:05 +02:00
Shannon
5e8245c5b4 package-lock update 2018-09-07 16:12:43 +10:00
Stephan
f603cb3b05 Recent Node upgrade touches package[-lock].json 2018-09-04 09:36:26 +02:00
Shannon
f738e6d7c7 Fixes js tests 2018-08-09 19:38:20 +10:00
Shannon
1ffcc853e1 updates package-lock 2018-08-09 15:23:46 +10:00
Mads Rasmussen
c73860d144 start eslint from scratch so we slowly can add more rules for easier merging to v8 2018-08-08 19:52:00 +02:00