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

1566 Commits

Author SHA1 Message Date
antoine
90e5440518 bootstrap3 ; issue + hx style issue 2014-05-28 15:33:36 +02:00
antoine
7cfd2d6593 schema's selector improved 2014-05-28 15:06:16 +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
08cc608dc8 One last change, enable setting max number of items in a cell 2014-05-23 14:57:16 +02:00
per ploug
71839d53a6 Last round of polish to the grid 
adds image captions, textstring markup support in rendering, better
styling and icon previews
 2014-05-23 14:37:00 +02:00
antoine
9626e91c83 dependency with bootstrap.3.0.1.min.js 2014-05-21 19:51:13 +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
52cd44a700 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-21 15:37:58 +02:00
antoine
0c8ff187aa grunt update to copy default files 2014-05-21 15:37:20 +02:00
John
3af74bd4fd Load google fonts independently in the content iframe. 
Enables live preview on the page's content for google fonts.
 2014-05-21 14:57:20 +02:00
John
c9e2e1e116 Apply preview of font to page's content. 2014-05-21 14:57:18 +02:00
John
c27f73e54a Fix glitch when selecting new font in dropdown. 
In the font family picker, selecting a not-yet-loaded font caused the font sample to render as Arial until the font had been downloaded.
 2014-05-21 14:57:17 +02:00
John
cede13d180 Merge name and description changes from uSky. 2014-05-21 14:57:15 +02:00
antoine
3ffb2772b6 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-21 13:54:25 +02:00
antoine
e6f0d4e056 @Umbraco.EnableTuning() and Recursive less file 2014-05-21 13:53:00 +02:00
per ploug
23c7eafaf5 merge from upstream 7.1.4 2014-05-20 12:32:47 +02:00
per ploug
90892ce818 adds rootscope access to umb.clientmgr 2014-05-20 12:14:10 +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
81934c47d2 laptop width 2014-05-19 16:06:45 +02:00
antoine
80379e116d umbraco media support 2014-05-19 14:34:09 +02:00
antoine
89081b86af preview grunt issue 2014-05-16 14:42:47 +02:00
antoine
216e2255f2 Save message more friendly 2014-05-16 13:33:41 +02:00
antoine
9db3dbd730 Style improvement 
focus schema in front when roll-over in panel
 2014-05-16 11:40:39 +02:00
Shannon
ffbb1a85ab Fixes: U4-4312 Spelling error on "Retreive" should be Retrieve -U7.0.0.4 2014-05-16 12:43:23 +10:00
Shannon
1c7d83f589 Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741) 2014-05-15 12:49:03 +10:00
antoine
8a1dd96294 some styles fixed 2014-05-14 19:15:43 +02:00
antoine
67bebd0d2d index.html missing 2014-05-14 18:39:25 +02:00
antoine
4f34fbd2c8 devices preview better look 
tested in chrome/firefox/IE
 2014-05-14 18:37:44 +02:00
antoine
8cda6e4062 Tuning panel include in preview mode 2014-05-14 14:51:58 +02:00
Shannon
157428dbc8 ensures multiple commas in tags still work. 2014-05-14 20:54:01 +10:00
Shannon
922942197f Fixes: U4-4741 Tags Property Editor Mishandles Tags with Commas 2014-05-14 19:57:40 +10:00
Shannon
f00950bfe4 adds unit test for image helper 2014-05-14 18:38:05 +10:00
Shannon
80d012f3ad Fixes: U4-4771 u7.1.1 Media section can't view images RangeError: Maximum call stack size exceeded 2014-05-14 18:25:50 +10:00
Shannon
654efd1128 Fixes: U4-3492 Recent history list persist between logged in users 2014-05-14 15:26:52 +10:00
Shannon
aa2375b8ba Fixes client side mem leak for dialogs and not correctly removing their scopes. 2014-05-14 15:18:28 +10:00
Shannon
42cd71ef6c Fixes: U4-4865 Umbraco 7.1.2 Date Picker not rendering icon or calendar control 2014-05-14 12:01:38 +10: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
fec84b8ce3 iframe 100% in firefox 2014-05-13 13:04:39 +02:00
antoine
a00e5d54aa rename tuning project without usky 2014-05-13 12:50:48 +02:00
per ploug
6c36f43276 Adds support for loading custom RTE settings into the grid 2014-05-13 12:35:08 +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
Shannon
cb7f26c998 Fixes: U4-4197 Error 400 on admin area login 2014-05-13 13:39:18 +10:00
Shannon
16b5c86192 Fixes: U4-4869 Cannot save tags - was due to adding the loading... message and the ng-if creating a new scope and not targeting the $parent in the view, also fixes up clearing the value with typeahead is used 2014-05-13 12:55:31 +10: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
Martin Meixger
289bed8fd2 change negative coordinates to zero 2014-05-12 15:34:50 +02:00
per ploug
482750ab6a Missing file 2014-05-12 13:22:58 +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