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

72 Commits

Author SHA1 Message Date
Shannon
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
antoine
6d1ccaa7a4 Renames Tuning to canvasdesigner (code and comments) 2014-09-23 19:10:51 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
Shannon
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
warrenbuckley
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
antoine
e701f0d8a1 new editor for the ui designer 2014-08-05 18:01:04 +02:00
Sebastiaan Janssen
5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
antoine
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
antoine
16d8481ad9 Tuning new concept, config throught json config or/and html5 data tags 2014-06-30 19:28:33 +02:00
per ploug
4fea55e751 More efficient grunt execution 2014-06-26 11:24:05 +02:00
antoine
39eaa4a15e Element select improved, default style more clean 2014-06-03 19:33:31 +02:00
antoine
aec956dd2e grunt js task issue 2014-06-02 10:55:17 +02:00
antoine
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
antoine
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
per ploug
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
antoine
0c8ff187aa grunt update to copy default files 2014-05-21 15:37:20 +02:00
per ploug
23c7eafaf5 merge from upstream 7.1.4 2014-05-20 12:32:47 +02:00
John
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
antoine
89081b86af preview grunt issue 2014-05-16 14:42:47 +02:00
antoine
8cda6e4062 Tuning panel include in preview mode 2014-05-14 14:51:58 +02:00
antoine
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
antoine
a00e5d54aa rename tuning project without usky 2014-05-13 12:50:48 +02:00
per ploug
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
antoine
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
antoine
7e61b25746 uskytuning with style suggest and preview device 2014-05-12 19:57:06 +02:00
per ploug
40d1099fbd grid modifications 2014-05-12 13:22:57 +02:00
antoine
103f4f33bd Only one less style file 2014-05-10 15:56:36 +02:00
antoine
e269a0b9bb Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-09 18:22:37 +02:00
antoine
23301817bf uSkyTuning into Umbraco core, first approach 2014-05-09 18:18:08 +02:00
per ploug
4baf3ed99a Initial commit of the grid 2014-05-09 12:23:59 +02:00
Shannon
6b6ca615ba Updates build to ignore bower and commits typeahead. 2014-05-09 17:02:14 +10:00
Shannon
683f0c5725 Fixes: U4-4503 Tags datatype does not autocomplete 2014-05-06 14:44:24 +10:00
Shannon
27e6b8c80c Adds bower to node dependencies, uses bower to get the typeahead dependency, gets bower dependencies on npm install 2014-05-05 15:55:48 +10:00
per ploug
e3c4ed5bf7 Changes grunt to accept a buildversion param 
use grunt build --buildversion=7.1.2 to set it in all client files
 2014-04-10 14:25:26 +02:00
perploug
1ae9816c28 Updates grunt file to work with latest jshint cfg format 2014-03-18 02:24:38 +01:00
perploug
923eb300e5 Updates grunt file to run vs file copy 2014-03-04 19:11:27 +01:00
perploug
ce65ae8742 Updates to the installer UI 
Adds database and packages step
 2014-03-03 08:57:57 +01:00
Per Ploug Krogslund
de97d8849a Fixes broken unit tests 2014-02-26 15:51:09 +01:00
diachedelic
2ef48a3355 Added required mocks to run the backoffice in dev mode 2013-11-02 16:34:40 +11:00
perploug
547361a185 Removes all the views/*.controller.js files from build 2013-10-22 09:46:11 +02:00
perploug
d258fc5a9f added minification to grunt file 2013-10-21 14:29:00 +02:00
Shannon
fb3bad90d6 had to change port 9999 to 9990 because the new sony vaio admin uses 9999 2013-09-30 14:24:39 +10:00
perploug
779ba61fb1 removes uglify from build for now 2013-09-05 11:14:38 +02:00
perploug
39233aa219 gruntfile 2013-09-05 08:33:40 +02:00
perploug
ac4eb18b55 Add ngmin and uglify to grunt setup RERUN NPM INSTALL 2013-09-04 23:31:05 +02:00
perploug
baaecedac2 Finetuning html adding prevalue editors 2013-08-22 14:46:43 +02:00
perploug
16c67bd435 Added seperate test watcher in gruntfile 2013-08-21 21:10:33 +02:00
perploug
50845c63a8 Makes the grunt engine faster and only acts on specific files 2013-08-21 14:24:16 +02:00
Per Ploug Krogslund
39ae3f6160 Fixes firefox height scale issues 2013-08-21 13:08:52 +02:00
Per Ploug Krogslund
99d41ca63a added ace editor directive 2013-08-14 14:28:17 +02:00