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

14608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
bca74790ca Implement IFileService.GetTemplate(Guid) 2015-11-17 12:02:35 +01:00
Claus
0fecad9867 Merge pull request #906 from umbraco/temp-U4-6515 
Fixes: U4-6515 Media picker does not set $dirty
 2015-11-17 11:51:58 +01:00
Claus
3d95b4d73a Updated unit test after adding in TaskTypeMapper. 
cherrypicked from dev-v7.
 2015-11-17 11:51:03 +01:00
Shannon Deminick
60c2040cba Merge pull request #890 from umbraco/temp-U4-7286 
Fixes: U4-7286 Upgrade script to normalize all GUIDs for content types + update Courier to support it
 2015-11-17 11:48:19 +01:00
Mads Rasmussen
4594b952b4 add control overlay to select control before editing 2015-11-17 11:41:17 +01:00
Claus
3045068d68 Fixes: U4-6515 Media picker does not set $dirty 
Included fix for member picker.
 2015-11-17 10:59:21 +01:00
Claus
37a6668313 Merge branch 'U4-6515' of git://github.com/deepak4u/Umbraco-CMS into deepak4u-U4-6515 2015-11-17 10:50:07 +01:00
Sebastiaan Janssen
36814d746f Merge pull request #905 from GertyEngrie/dev-v7 
U4-7297 - fixes <hr/>-button in tinymce
 2015-11-17 10:34:37 +01:00
Claus
a72f6edb6b Merge pull request #846 from OptimisticCoder/UKFest-U4-6732 
U4-6732 - Added message on back office, when JS is disabled.
 2015-11-17 10:23:06 +01:00
Claus
e442911d0f Merge pull request #892 from umbraco/temp-U4-7342 
Temp u4 7342
 2015-11-17 10:09:33 +01:00
Sebastiaan Janssen
e01cbcd405 Fix failing upgrade due to old dll being in bin folder 2015-11-17 09:24:22 +01:00
Claus
012ed6cf16 Merge pull request #862 from dampee/u4-7314 
U4-7314 Change name of "Textbox Multiple" to "TextArea"
 2015-11-17 08:57:49 +01:00
Gerty Engrie
eb3ff12916 U4-7297 - fixes <hr/>-button 2015-11-17 00:35:10 +01:00
Mads Rasmussen
609a475c67 remove margin bottom on tiny mce in grid.rte directive 2015-11-16 21:20:29 +01:00
Mads Rasmussen
ec3ef2c018 add cursor pointer to title, remove a bit bottom space, animate icons 2015-11-16 21:13:53 +01:00
Mads Rasmussen
23f8952605 insert cell tools 2015-11-16 20:58:47 +01:00
Mads Rasmussen
6f893ae69b only render elements in control bar when control is active to prevent click when collapsed 2015-11-16 20:18:39 +01:00
Mads Rasmussen
2b4f0ebf64 always add controls to the bottom of the array 2015-11-16 19:38:00 +01:00
Claus
1ebff69358 Merge pull request #904 from umbraco/temp-U4-7393 
Fixes: U4-7393 Actions menu placed behind publish button on mobile phone
 2015-11-16 16:02:00 +01:00
Claus
5435c44ea9 Using a lower z-index to fix the issue at hand. 2015-11-16 16:00:43 +01:00
Claus
76fa477c35 Merge branch 'U4-7393' of git://github.com/Acentrage/Umbraco-CMS into Acentrage-U4-7393 2015-11-16 15:55:04 +01:00
Claus
1f6f36d8c8 Updated unit test after adding in TaskTypeMapper. 2015-11-16 15:53:58 +01:00
Claus Jensen
c46ac11125 Merge pull request #849 from mzajkowski/UKFest-U4-6282 
U4-6282  Add note to Register Partial Macro
 2015-11-16 15:37:47 +01:00
Claus
73d5a3f993 Merge branch 'opelpanfan-UKFest-U4-6511' into dev-v7 2015-11-16 15:31:29 +01:00
Mads Rasmussen
4bc5bb9c64 style control bars + add outside click to deselect controls and cells 2015-11-16 10:57:06 +01:00
Stephan
92e4a14b7e Merge temp-U4-6911 into 7.4.0 2015-11-13 15:06:28 +01:00
Stephan
9654a0aa3a Enable moving system datatypes (but not deleting) in tree 2015-11-13 15:04:14 +01:00
Stephan
8653da010e Remove warning on container delete, cannot delete a non-empty container 2015-11-13 15:03:57 +01:00
Claus Jensen
5a99a6903d Merge pull request #888 from umbraco/temp-U4-7353 
Fixes: U4-7353 OAuth providers for the back office require more flexi…
 2015-11-13 14:47:11 +01:00
Shannon Deminick
775639da41 Merge pull request #848 from Khinrot/UKFest-U4-5560 
Fixing "U4-5560 White space issue in content tree"
 2015-11-13 14:06:40 +01:00
Mads Rasmussen
b6b3dee8ed fix up media, macro and embed editor placeholders 2015-11-13 13:52:32 +01:00
Shannon Deminick
2375ede161 Merge pull request #867 from jbreuer/U4-4028 
U4-4028 Don't load the full images, but server side resized.
 2015-11-13 13:41:53 +01:00
Shannon Deminick
fcd00599da Merge pull request #858 from tompipe/U4-1959 
Fixes U4-1959
 2015-11-13 13:40:26 +01:00
Shannon
d3f5090150 Fixes up a couple of missing path updates and incorrect icon resolution and fixed another issue with webservice path reference 2015-11-13 13:38:30 +01:00
Rune Strand
6d5d160b6f Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-11-13 13:10:34 +01:00
Rune Strand
afd4b19259 Initial sortable styling 2015-11-13 13:10:23 +01:00
Stephan
b59ea231c5 Merge 7.4.0 into temp-U4-6911 2015-11-13 12:53:34 +01:00
Mads Rasmussen
51e6072013 set active state on rows, cells and editors 2015-11-13 12:48:35 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Shannon
ec247d2b27 ensures the migration table's seed is higher than 1 (have put it to 100). 2015-11-13 11:31:59 +01:00
Mads Rasmussen
d00569325a Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI.Client/src/common/directives/components/forms/focuswhen.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/dashboard/ChangePassword.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
 2015-11-13 11:29:47 +01:00
Shannon
f32479bb10 bumps version 2015-11-13 11:26:31 +01:00
Shannon
bf40fc25e6 Fixes csproj and fixes migration script to use Sql object and ensures that it normalizes GUIDs across ALL content types 2015-11-13 11:17:14 +01:00
Shannon Deminick
371269436f Merge pull request #891 from umbraco/temp-U4-7128 
Fixes: U4-7128 Send to Translation gives YSOD
 2015-11-13 10:23:41 +01:00
Shannon
50e2bd5d7e Gets data type folders working, this includes updating the data type repo + unit test, the move dialog/views, the data type tree to just show folders. 2015-11-12 19:01:42 +01:00
Shannon
5209a54f2a Added Move methods for both content types and media types ... these move methods are done as part of the UOW commit/transaction process, something that should be done with the Move/Copy operations of the content/media services. I added unit tests for the move operations for both content, media and data types. Events are all in places for content type and media type moves (something which Courier will need to use). Updated the trees/menu items to support moving which includes rendering the tree with only folders, updated the move dialog views to work. 2015-11-12 19:01:41 +01:00
Shannon
98be8dfe3e adds unit tests for content, media and data type repositories for creating and deleting containers (NOTE: There are other failing tests that are not part of this branch that need to be fixed in the 7.4 branch) 2015-11-12 19:01:41 +01:00
Shannon
d379b98c57 Gets data type folders working/creating, data types being able to be created in folders, tree syncing with data type paths, fixes up some localization stuff and fixes up some issues with media type folders with parent ids 2015-11-12 18:59:43 +01:00
Shannon
42a0697d60 Nearly got data type folders creating 2015-11-12 18:59:42 +01:00
Shannon
4f07033d58 Gets creating/deleting media type folders working. 2015-11-12 18:59:41 +01:00