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

1865 Commits

Author SHA1 Message Date
Sebastiaan Janssen
aceef2b318 Add missing grid view files. 2014-08-01 12:12:25 +02:00
per ploug
4e1214085e Split grid rendering into seperate editor views 2014-07-31 14:45:48 +02:00
antoine
54c3e68f32 Ignore Preview folder 2014-07-01 13:57:04 +02:00
per ploug
601fef873a Found a couple of minor issues while testing 2014-06-27 11:50:03 +02:00
per ploug
49a374dbca Fixing various grid bugs with the new structure 2014-06-26 23:36:04 +02:00
Sebastiaan Janssen
c34f83e231 U4-5092 Czech language support 2014-06-16 10:11:19 +02:00
Morten Christensen
81e56bed9e Implementing Document Type Compositions in the Document Type Editor. 
Adds changes to the CMSNode and doc type related class which improves the internal usage of the new model based on IUmbracoEntity.
 2014-06-11 07:08:38 +02:00
Sebastiaan Janssen
52457fea21 Bump version number 2014-06-10 18:47:02 +02:00
Sebastiaan Janssen
07ec9aa813 Undo formatting of query for now 2014-06-10 18:11:14 +02:00
Sebastiaan Janssen
ba89aec34f Merge pull request #415 from rustyswayne/7.1.5-templatequery 
Query Builder - Fix Date sort fields and format returned query
 2014-06-10 17:48:59 +02:00
Jeavon Leopold
29533820ab Query Builder - Fix Date sort fields and format returned query to be on new lines and tabbed 2014-06-10 16:43:28 +01:00
Sebastiaan Janssen
4366500fad Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
 2014-06-10 17:15:07 +02:00
antoine
3b95184f04 empty video or media issue 2014-06-10 17:06:13 +02:00
antoine
9da7e108da double )) in embed open windows 2014-06-10 16:52:29 +02:00
Sebastiaan Janssen
344b880ba7 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-06-10 15:22:31 +02:00
Sebastiaan Janssen
c958f12bc1 Merge pull request #413 from rustyswayne/7.1.5-templatequery 
Template Query Editor Prototype
 2014-06-10 15:11:57 +02:00
Jeavon Leopold
2ffd0413e8 Adding query builder button to View editor 2014-06-10 11:27:26 +01:00
Jeavon Leopold
1d8e217c6f Template Query builder prototype working! 2014-06-09 23:23:31 +01:00
Sebastiaan Janssen
e59768dda0 Capitalize Caturday 2014-06-09 20:57:15 +02:00
Sebastiaan Janssen
0b114c88f0 Merge pull request #397 from lesleyauk/7.1.5 
Correct English days of the week on login screen
 2014-06-09 20:55:31 +02:00
Shannon
0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Sebastiaan Janssen
e5dea8e4be Merge pull request #407 from BatJan/7.1.5-translation-fix-4538 
Fix of U4-4538
 2014-06-09 14:09:19 +02:00
Jan Skovgaard
9d4afbd007 Fix of U4-4538 2014-06-09 12:44:07 +02:00
Sebastiaan Janssen
c17e60f709 Merge pull request #401 from leekelleher/U4-5066 
U4-5066 Display message on empty list-view.
 2014-06-09 10:45:13 +02:00
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
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
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