swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,791 Commits 73 Branches 219 Tags
9789fbdb796b94306a79f153fdc4874ca243bcd5
Commit Graph

1674 Commits

Author SHA1 Message Date
antoine 9789fbdb79 tuning config for current umbraco kit starter 2014-08-07 18:11:50 +02:00
antoine e701f0d8a1 new editor for the ui designer 2014-08-05 18:01:04 +02:00
per ploug 173d4c9655 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:12 +02:00
Sebastiaan Janssen 5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
Sebastiaan Janssen dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
 2014-08-04 13:32:44 +02:00
Sebastiaan Janssen 1c83114c78 Merge pull request #436 from lucasch/U4-5109 
U4-5109 - Added an icon for the Visual Blocks tinymce plugin to the skins CSS files
 2014-08-04 09:11:54 +02:00
user d6833c9b86 Updated the Umbraco TinyMCE skin to use the templates icon for visual blocks, 
Visual blocks had no icon in the css
 2014-08-01 11:58:33 -05:00
Shannon Deminick 2325c8a64f Merge pull request #434 from naepalm/7.1.5 
Updated the dictionary table icons and the CSS
 2014-07-31 18:46:29 -06:00
per ploug d8a0502055 Updates to the grid editor 
Updates the active grid with correct width, permissions etc on config
changes
 2014-07-31 14:45:49 +02:00
Sebastiaan Janssen 84df6e5315 Merge branch 'wip-u4-3963' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3963 2014-07-31 12:42:45 +02:00
Janae Cram af3b655073 Updated the dictionary table icons and the CSS to make the section more usable. 2014-07-30 09:12:06 -07:00
Shannon f8e366bb4a fixes minor bool check in js for jslint 2014-07-29 11:23:58 -06:00
arknu cad946905c Bugfix: 0 value was ignored 2014-07-27 13:06:02 +02:00
arknu 49c26f4a5e Followup: make sure that defualt value is applied in RTE 2014-07-27 12:46:52 +02:00
arknu 45b173c0db U4-4729: Make max image dimension in RTE configurable 2014-07-27 01:25:39 +02:00
Shannon Deminick 7ab8ea4da4 Merge pull request #432 from AndyButland/u4-5138 
U4 5138 - fixed a couple of issues with list view styling and function
 2014-07-24 15:24:51 -07:00
Shannon 1e8f016234 Fixes: U4-5111 7.1.4 JavaScript runtime error: 'UmbClientMgr' is undefined 2014-07-24 15:13:41 -07:00
Sebastiaan Janssen b1350fa4a6 Customize button was displayed lower than installer button 2014-07-24 14:40:33 +02:00
antoine fbe49acc77 preview cell with fixed 2014-07-23 10:55:07 +02:00
antoine 677983a59e markup and layouts sortable issue 2014-07-23 09:30:33 +02:00
AndyButland 8445c9c29b Applied styling to list view paging (active class on page numbers, disabled on prev and next when not available 2014-07-22 23:11:22 +01:00
AndyButland e8eea039e1 Reset page number to one when applying filter on list view 2014-07-22 22:35:58 +01:00
Shannon cd8b8dc704 Fixes: U4-5212 Preview button only greyed and not disabled while previewing. (was save button) 2014-07-22 11:33:58 -07:00
Shannon Deminick de968a18dd Merge pull request #431 from AndyButland/u4-5097 
U4-5097 - fixed issue with inital value of slider not being saved
 2014-07-23 01:47:43 +10:00
AndyButland 8d1d2f2414 Initialised slider scope model value if not already set from a previous save 2014-07-21 22:27:04 +02:00
Søren Reinke fdafd07117 Changed minimum bootstrap column span from 2 to 1 in the grid view 2014-07-09 12:24:33 +02:00
Shannon 3aff474648 Fixes: #U4-4685 Default sorting of listview items 2014-07-07 16:21:12 +10:00
antoine 8f66258a94 Top min margin to avoid that rte hidden 2014-07-01 17:35:54 +02:00
antoine aa8f7a9394 Remove control issue, it wasn't using the right index 2014-07-01 17:29:20 +02:00
antoine 5c24759234 RTE unique id issue, replace unique ID base on date by GUID 2014-07-01 17:15:48 +02:00
antoine b84a52c760 Tuning style selector improvement 2014-07-01 16:13:04 +02:00
antoine 2e1e1eee1c Link to current tuned css file in preview mode 2014-07-01 13:55:39 +02:00
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 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
per ploug 7edd7cbd8a Friendlier YSOD modal 2014-06-26 23:35:25 +02:00
per ploug 51e9ef21aa Adding comment + docs to checboxlistmodel 2014-06-26 11:33:35 +02:00
per ploug c8c2d2d601 GridView Configaration UI 2014-06-26 11:27:45 +02:00
per ploug 4fea55e751 More efficient grunt execution 2014-06-26 11:24:05 +02:00
Shannon f627de2433 tweaks orange 2014-06-26 17:38:24 +10:00
Shannon be98ceea6c Fixes: U4-5011 Auto collapsing tree structure 2014-06-26 16:14:50 +10:00
Shannon 07e0cd2957 uses a better orange 2014-06-26 14:08:51 +10:00
Shannon 5a3890159f Fixes: U4-5142 Fix the horrible orange warning color in the back office 2014-06-26 13:52:59 +10:00
Shannon 70da51113c Streamlines form error colors to be inline with the rest of our color scheme 2014-06-26 13:31:39 +10:00
Shannon 6b5cb3a9cf Fixes: U4-4947 Tag Editor twitter typeahead 2014-06-19 18:04:32 +10:00
Shannon ad3502d438 Fixes: U4-5004 Pressing escape in the login screen causes a blank screen 2014-06-18 19:28:16 +10:00
Shannon dfb40802ff makes grunt vs and grunt dev a little faster 2014-06-18 17:31:00 +10:00
Shannon 8ded6fff93 adds vs task to grunt 2014-06-18 17:15:09 +10:00
Shannon 56111be82d Properly fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-18 17:11:47 +10:00