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

1764 Commits

Author SHA1 Message Date
Jan Skovgaard
4421681538 Fix for U4-4913 2014-06-09 22:38:49 +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
Rusty Swayne
b0e96b256a Merge branch '7.1.5' into 7.1.5-templatequery 2014-06-09 08:44:19 -07:00
Jeavon Leopold
72a966b0fa Template Query Editor - Angular and hooking up to the API controller 2014-06-09 16:42:57 +01:00
Jan Skovgaard
4238b79c67 Fix for U4-4493 
Makes it possible to go back if you don't want to customize.
 2014-06-09 16:48:27 +02:00
James South
681a3e3046 Improving grammar in installer facts. 2014-06-09 15:20:28 +02:00
Sebastiaan Janssen
087dd1fe9e Merge pull request #404 from BatJan/7.1.5-installer-fix-4416 
Fix of U4-4416
 2014-06-09 13:58:08 +02:00
Sebastiaan Janssen
338a125eaa Merge pull request #405 from JimBobSquarePants/7.1.5 
Fixing broken preview dialog U4-4977
 2014-06-09 13:49:45 +02:00
James South
d2119c17c1 Fixing broken preview dialog U4-4977 2014-06-09 13:01:00 +02:00
Sebastiaan Janssen
db3d86aeca Merge pull request #402 from leekelleher/U4-3596 
U4-3596 Recycle bin, use the listview on the recycle bin instead of showing the deleted items as children
 2014-06-09 10:56:24 +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
5834757476 Merge pull request #403 from BatJan/7.1.5-installer-fix-5040 
Fix of U4-5040
 2014-06-09 10:15:06 +02:00
leekelleher
91ddbff990 U4-5066 Display message on empty list-view. 2014-06-08 18:18:50 +01:00
leekelleher
8ccb06c91d Tidied up the "Recycle Bin" headers for both content/media 2014-06-08 18:09:07 +01:00
Jan Skovgaard
0474605d36 Fix of U4-4416 
http://issues.umbraco.org/issue/U4-4416
 2014-06-08 18:47:07 +02:00
Sebastiaan Janssen
4dd3f2f8ac Merge pull request #399 from leekelleher/U4-3575 
U4-3575 Get Started Dashboard does not changes when changing sections using Left Menu icons
 2014-06-08 18:38:43 +02:00
Jan Skovgaard
d7a0447e2e Fix of U4-5040 2014-06-08 18:31:50 +02: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
Niels Hartvig
bff415a4c6 Fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-08 17:55:05 +02:00
leekelleher
caa59f2c80 Updated recycle-bin dashboard controller to handle both content and media items. 2014-06-08 16:46:04 +01:00
leekelleher
2ff1c973e0 Set the listview row item to 'inactive' if the item isTrashed. 
(As media items do not have a published state.)
 2014-06-08 16:45:22 +01:00
leekelleher
41a455c9ac Added treeHeaders_mediaRecycleBin to the localization mocks 2014-06-08 16:28:13 +01:00
leekelleher
3bb563ec55 Modified the 'listview' view + controller - added isTrashed property/state 2014-06-08 16:17:16 +01:00
leekelleher
519dd8b476 Modified the existing 'recyclebin' dashboard view. 
Added view for media 'recyclebin'
 2014-06-08 16:14:35 +01:00
leekelleher
0434b3e5bd #U4-3575 Get Started Dashboard does not changes when changing sections using Left Menu icons 
Switching sections updates the route/location; thus displays the corresponding dashboard.
 2014-06-08 16:02:18 +01:00
Niels Hartvig
8aafc583de New styling for content / media titles 2014-06-08 16:29:04 +02:00
Jan Skovgaard
d6b0ed2d40 Fix for U4-4874 
Added id's to the input fields, so labels are connected properly.
 2014-06-08 16:09:06 +02:00
antoine
5cb210c7b6 slider input updated real time 2014-06-08 11:08:56 +02:00
antoine
b80ab20cb4 device preview background color 2014-06-08 09:42:39 +02:00
Lesley
650fb94057 Correct capitals for English days of the week. 2014-06-07 14:12:01 +01:00
antoine
bac6e71e7f color picker in real time, general clear code 2014-06-05 14:02:38 +02:00
Matthew Sheeley
a4b25c3f84 Close user dialog on logout 2014-06-04 15:44:22 -05:00
antoine
9a36d74418 tuning issue 2014-06-04 16:24:02 +02: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
aec956dd2e grunt js task issue 2014-06-02 10:55:17 +02:00
antoine
65bb1e1e20 gridRow default less 2014-05-30 20:03:34 +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
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
b68dd6b35c U4-5006 Typo: "struture" in the Copy and Move dialogs 2014-05-28 13:12:10 +02:00
Shannon
2a0d2bdb86 Fixes: U4-4945 Slider type stops working on ajax load in 7.1.3 2014-05-28 13:25:47 +10:00
Shannon
f5194efb6e Fixes: U4-4999 Image cropper - Image file duplicated each time the page (content) is saved/published 2014-05-28 12:29:41 +10:00
Sebastiaan Janssen
7185a6dba5 Merge pull request #383 from imulus/colorpicker-toggle 
Allow colors to be toggled on/off in Color Picker - U4-4935
 2014-05-27 11:53:55 +02:00
antoine
b57642003c Grid row unique id 2014-05-25 20:52:23 +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