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

65 Commits

Author SHA1 Message Date
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
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
perploug
3e3f12bf63 Added events.Service and xmlhelper.service 2013-08-12 15:06:12 +02:00
Per Ploug Krogslund
aeedcae088 Moved additional docs to tutorial section 2013-08-07 13:36:22 +02:00
Per Ploug Krogslund
f9f54b3ee7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
 2013-07-28 01:01:50 +02:00
Per Ploug Krogslund
0877a69a3e Removed trailing space from ngdoc declaration 2013-07-28 00:41:28 +02:00
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon
e2ef802f65 Got delete working for legacy items... just need to get the tree to respond, do tree syncing, etc... but it is working. 2013-07-12 14:36:35 +10:00