fc06bbf116
Rolls back a grunt file path issue
2015-10-09 08:56:11 +02:00
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
9c9ba477aa
Merge dev-v7 into dev-v7-contenttypeeditor
...
Conflicts:
src/Umbraco.Core/Constants-ObjectTypes.cs
src/Umbraco.Web.UI.Client/gruntFile.js
src/Umbraco.Web.UI.Client/src/loader.dev.js
src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
src/Umbraco.Web/Umbraco.Web.csproj
2015-09-16 13:25:32 +02:00
b883c7cb11
Fixes: U4-6947 Don't ship unnecessary js files
2015-08-31 18:51:36 +02:00
3eed1d6df8
add postcss autoprefixer to watch task
2015-08-24 13:29:07 +02:00
c0b06a4cec
Added grunt-postcss to auto-prefix the css files + minify all css files.
2015-08-24 12:22:51 +02:00
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
569371ffff
Fixes resize panel U4-5308 Umbraco 7 Content Tree Width not resizable or scrollable
2015-08-04 13:22:22 +02:00
b4bb15c66f
fixes up a bower reference
2015-07-14 10:47:51 +02:00
888ba8f285
Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor
2015-06-25 11:49:08 +02:00
fc323ae89d
Include EsLint in grunt
...
ESlint is not turned on by default - as it gives us 500ish errors as of
the current state of the codebase, also, we should start linting
controllers (why arent we?)
EsLint contains angular best practices rules and will help us get V8
ready for Angular2 and to follow best practices, untill everything
passes we can turn it on and off during clean-up time
2015-06-25 11:49:00 +02:00
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
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
f82d8a5df1
updates bower and bower install task.
2015-06-24 11:39:50 +02:00
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
32e0cbc886
updates bower/grunt file for new ng file upload
2015-06-24 09:51:36 +02:00
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
3496a064c9
Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs
2015-06-19 10:54:46 +02:00
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
d77f95f29b
removes tutorial docs and irrelavent readme and todo files, updates docs build to exclude tutorials header
2015-06-17 11:56:20 +02:00
0f01925c4a
Fixed less file casing and paths
2015-05-21 07:50:02 +02:00
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
db4495cf50
Grid mock data and modified tests
...
all client side changes, will not affect live sites
2014-11-07 11:13:28 +01:00
892a8d2a8a
Update gruntFile.js
2014-10-30 10:12:43 +01:00
4521e31ec5
#U4-5582 Fixed Due in version 7.2.0
...
v7 JS exposes version number
2014-10-27 13:07:10 +01:00
142a5ec922
Removes demo packages from source control, we don't need these, they were just committed POCs at the beginning of v7 development
2014-10-16 14:31:44 +10:00
6d1ccaa7a4
Renames Tuning to canvasdesigner (code and comments)
2014-09-23 19:10:51 +02:00
0f32283601
Renames Grid to canvas
2014-09-23 16:30:27 +02:00
eb6326487f
Fixes grunt watches, Fixes: U4-3138 Examine mgmt dashboard styling is broken, rebuilds the mgmt dashboard in angular
2014-09-09 18:53:47 +10:00
9784a3d868
Add new Grunt Task 'docserve' to rerun ng-docs task & spin up a test server to browse to along with new watch task to recompile generated docs
2014-08-26 15:07:40 +01:00
e701f0d8a1
new editor for the ui designer
2014-08-05 18:01:04 +02:00
5fd59a6450
Fix merge problems
2014-08-04 13:56:51 +02:00
ec294cefd8
Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0
2014-06-30 19:29:38 +02:00
16d8481ad9
Tuning new concept, config throught json config or/and html5 data tags
2014-06-30 19:28:33 +02:00
4fea55e751
More efficient grunt execution
2014-06-26 11:24:05 +02:00
39eaa4a15e
Element select improved, default style more clean
2014-06-03 19:33:31 +02:00
aec956dd2e
grunt js task issue
2014-06-02 10:55:17 +02:00
3dabd73ec2
Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid
...
Conflicts:
src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
src/Umbraco.Web.UI/Umbraco/js/tuning.panel.js
src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
2014-05-30 19:56:51 +02:00
a5f81ae6c2
Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky
...
Conflicts:
src/Umbraco.Web.UI.Client/gruntFile.js
2014-05-23 16:39:39 +02:00
83b6375f04
Migrated the Editors out of the grid
...
Added configuration for individual editors, added allowed editors, new
styling refactored css
2014-05-21 15:40:17 +02:00
0c8ff187aa
grunt update to copy default files
2014-05-21 15:37:20 +02:00
23c7eafaf5
merge from upstream 7.1.4
2014-05-20 12:32:47 +02:00
e62d1559b1
Fix grunt not copying tuning's index.html to Umbraco/preview.
...
Also fixes same issue when using grunt --dev.
2014-05-20 10:36:48 +02:00
89081b86af
preview grunt issue
2014-05-16 14:42:47 +02:00
8cda6e4062
Tuning panel include in preview mode
2014-05-14 14:51:58 +02:00
39ede8c47a
Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky
...
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
2014-05-13 13:07:38 +02:00
a00e5d54aa
rename tuning project without usky
2014-05-13 12:50:48 +02:00
e8f4e7663f
More visual tweaks to the grid to handle deletes
...
also rolls back a couple of bower "tweaks" that ended up being horrible
2014-05-13 09:45:09 +02:00
9f116c00d5
Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky
2014-05-12 20:00:57 +02:00
7e61b25746
uskytuning with style suggest and preview device
2014-05-12 19:57:06 +02:00
Per Ploug