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

55 Commits

Author SHA1 Message Date
Mads Rasmussen
c3116d5df7 remove moment resolution for bower.json 2018-01-12 08:52:13 +01:00
Shannon
19086ab3a1 Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10803 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
 2018-01-12 14:32:54 +11:00
Mads Rasmussen
0876004d9a U4-10803: remove dependency on angular-moment 2018-01-10 16:00:32 +01:00
Shannon
b32e7d4ccc running the build changed the bower.json file, i wonder if this will 'fix' vsts? 2018-01-05 10:45:06 +11:00
Claus
49c316e13d Merge pull request #2066 from arknu/U4-10191-tinymce46 
U4-10191: Update to TinyMCE 4.6.x
 2017-11-01 09:42:33 +01:00
Claus
5235053523 updating to latest tinymce 2017-11-01 09:27:04 +01:00
Mads Rasmussen
2708f11fcd fix path to angular moment 2017-10-16 12:01:19 +02:00
Mads Rasmussen
5330830362 Merge branch 'dev-v7.7' into temp-U4-10309 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
 2017-09-14 15:28:21 +02:00
Mads Rasmussen
a5c78f6325 fix bower.json after merge - copy correct clipboard.js file 2017-09-07 20:27:52 +02:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Mads Rasmussen
1a444fd703 add date pickers 2017-09-04 12:58:04 +02:00
Mads Rasmussen
70231fcee2 fix codemirror folder structure 2017-08-29 10:26:11 +02:00
Mads Rasmussen
c468e4736e bower name should be lowercase 2017-08-25 14:19:25 +02:00
Shannon
b8e2e49a44 Updates to latest Katana libs 2017-07-26 17:50:58 +10:00
Asbjørn Riis-Knudsen
841074fc27 U4-10191: Update to TinyMCE 4.6.x 2017-07-24 09:31:47 +02:00
Mads Rasmussen
de00b2ef00 fixes: U4-10061 Add functionality for show/hide/copy password when creating new user 2017-06-28 10:29:16 +02:00
Mads Rasmussen
631a9f92ea fix merge bug + add ignore list 2017-05-05 14:19:37 +02:00
Mads Rasmussen
28d7a4a6dc Merge branch 'dev-v7.6' into temp-gulp-spike 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
 2017-05-05 13:01:24 +02:00
Mads Rasmussen
21f003e705 clean up ace builds 2017-05-05 12:26:04 +02:00
Claus
bbd9e4f0fd updating tinymce to 4.5.3. 2017-02-16 12:16:11 +01:00
Claus
bf9a408c50 U4-9145 Updating TinyMCE to latest (4.4.3) 2017-02-16 12:13:48 +01:00
Per Ploug
4a191f0711 Rebuild bower.json to support bower-installer 
removes most of the custom bower lib installing we had in gruntfile
 2017-01-07 01:25:43 +01:00
Mads Rasmussen
f6d8a980a6 Merge branch 'dev-v7' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-11-14 11:04:15 +01:00
Sebastiaan Janssen
172895f17f U4-8884 Users editor doesn't work any more in 7.5.0 
#U4-8884 Fixed
 2016-08-22 15:18:04 +02:00
Shannon
4022c3cec9 U4-8816 Update to jQuery 2.2.4 2016-08-05 19:15:11 +02:00
Per Ploug
ebd2bf149c Basic editor + macro dialog implemented 2016-06-12 18:48:46 +02:00
Shannon
4aa4a03013 U4-8511 Update moment.js to the version to 2.10.3 for release 2016-05-30 14:25:47 +02:00
Simon Busborg
5f4309d2ca Fixes: U4-7590 List view layout cookie: Change to use local storage and clean up entry if its back to default layout. 2016-01-05 09:23:27 +01:00
Sebastiaan Janssen
7a4b7c25dd Can't use higher versions of angular-dynamic-locale 
See: https://github.com/lgalfaso/angular-dynamic-locale/issues/82
 2015-12-07 13:00:57 +01:00
Rune Strand
879ea73195 Updates jQuery UI to vLatest #woohoo 2015-12-01 15:51:15 +01:00
Shannon
85e5c0c219 fixes jquery reference issue (again) 2015-11-09 17:10:33 +01:00
Mads Rasmussen
e1f3e82fbf U4-6924 Updated ng-file-upload bower dependency to latest version, added support for accepted file types and max file size in directive. Get file types from config. Still missing max file size. 2015-09-28 11:55:12 +02:00
Shannon
85534bc3ce Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-08-04 17:10:58 +02:00
Shannon
d1bed54cf1 Fixes tabdrop memory leak U4-6907 Bootstrap tab drop has memory leaks, fixes tab/header to use the correct bootstrap tab api, simplifies the header code dramatically and speeds up processing. Fixes mem leak with delayedMouseLeave.directive 2015-08-04 11:59:57 +02:00
Shannon
fc7932c2bf Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/less/property-editors.less
 2015-06-25 10:16:35 +02:00
Shannon
84cac6ac90 Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror 2015-06-24 19:06:42 +02:00
Shannon
fde162b086 Fixes up bower installer, no longer using grunt-bower-task since it is old and doesn't support the copying that we need, updates to latest bower dependency 2015-06-24 11:15:04 +02:00
Shannon
32e0cbc886 updates bower/grunt file for new ng file upload 2015-06-24 09:51:36 +02:00
Shannon
aad82360ad Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/app.dev.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-06-23 18:27:18 +02:00
Per Ploug
3212bfa4b6 New upload field + dependencies 2015-06-23 14:08:02 +02:00
Shannon
3496a064c9 Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs 2015-06-19 10:54:46 +02:00
Shannon
be84db097a Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version 2015-06-17 15:06:34 +02:00
Shannon
fc2b3d7fc7 fixes merge issues 2015-04-01 13:42:04 +11:00
Shannon
d9cf9cee88 Includes nice social buttons, updates styling on login and user panel, updates logic to un-link accounts 2015-04-01 13:41:40 +11:00
Shannon
d2083673be Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower. 2015-03-10 13:02:34 +11:00
Shannon
c96b866f1d Fixes bower config for jquery 2015-02-19 10:35:06 +01:00
Sebastiaan Janssen
25cfceadc0 Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2015-02-17 10:46:36 +01:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
per ploug
306a30265e Remove ace from bower and directives folder 2014-11-10 13:36:57 +01:00