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

1944 Commits

Author SHA1 Message Date
Sebastiaan Janssen
68860b6c54 Update Umbraco version everywhere 2014-06-09 10:32:09 +02:00
leekelleher
91ddbff990 U4-5066 Display message on empty list-view. 2014-06-08 18:18:50 +01:00
Sebastiaan Janssen
cbe23663e3 Merge pull request #400 from BatJan/7.1.5-installer-fix-4874 
7.1.5 installer fix 4874
 2014-06-08 18:23:21 +02:00
Shannon
ec0d6959a9 mini profiler in back office now enabled with query string 2014-06-08 17:15:52 +02:00
BatJan
ff42a1b79c Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:32:03 +02:00
BatJan
4e433becd6 Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:29:10 +02:00
Shannon
7b33eca014 disables dist call 2014-06-08 13:14:27 +02:00
Shannon
b43f39a0cb disables dist call 2014-06-08 12:50:45 +02:00
Shannon
d0cb27d1c1 Completes: U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance 2014-06-08 12:49:20 +02:00
Shannon
e8990eb6b2 Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
 2014-06-08 12:24:29 +02:00
antoine
5cb210c7b6 slider input updated real time 2014-06-08 11:08:56 +02:00
Lesley
754a6e327e Correct capitals for English days of the week (part 2). 2014-06-07 15:56:17 +01:00
Lesley
650fb94057 Correct capitals for English days of the week. 2014-06-07 14:12:01 +01:00
antoine
39eaa4a15e Element select improved, default style more clean 2014-06-03 19:33:31 +02:00
antoine
2fdf040f73 Palette improvement 2014-06-02 10:55:53 +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
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Sebastiaan Janssen
ea32776174 Bump version 2014-05-28 17:07:51 +02:00
Sebastiaan Janssen
b42d0bc17e Bump version and fix dashboard 2014-05-28 16:04:11 +02:00
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
Sebastiaan Janssen
020a416dc5 en_us lang also updated like en 2014-05-28 13:15:20 +02:00
Sebastiaan Janssen
d491c133a7 Merge pull request #391 from danlister/patch-1 
Updated en.xml to fix some minor spelling mistakes
 2014-05-28 13:13:01 +02:00
antoine
6382515258 Device preview always enable 2014-05-28 11:29:08 +02:00
Sebastiaan Janssen
84f94d6471 U4-4752 No "change password" dialog available in 7.x backoffice 2014-05-28 11:17:33 +02:00
Dan Lister
1b360226d6 Updated en.xml to fix some minor spelling mistakes 2014-05-27 12:01:41 +01:00
antoine
fd2b9ce67d /umbraco/dialogs/tuning.aspx removed 2014-05-27 12:37:43 +02:00
antoine
1284417a58 /umbraco/dialogs/tuning.aspx removed 2014-05-27 12:36:49 +02:00
antoine
b57642003c Grid row unique id 2014-05-25 20:52:23 +02:00
antoine
9ee59e8e38 Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid 
Conflicts:
	src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
 2014-05-25 18:35:18 +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
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
7508613d13 First approach 2014-05-22 22:20:13 +02:00
Shannon
e04eed41e7 Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PreValueCollection.cs
	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
 2014-05-22 13:01:23 +10:00
Shannon
62887607ff fixes csrf with mediauploader.ashx 2014-05-22 12:44:04 +10:00
antoine
9626e91c83 dependency with bootstrap.3.0.1.min.js 2014-05-21 19:51:13 +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
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