yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,175 Commits 4 Branches 7 Tags
348bee885e3aff40363f59bffcdc32870d756bca
Commit Graph

3441 Commits

Author SHA1 Message Date
Sebastiaan Janssen
348bee885e Finish last bit for U4-7683 2016-01-20 15:01:25 +01:00
Sebastiaan Janssen
5440353fb3 Merge pull request #1031 from umbraco/temp-U4-7683 
Fixes: U4-7683 Search on Property Editors/Data Types in new Content Type Editor should display two results - resuse / available
 2016-01-20 14:37:15 +01:00
Mads Rasmussen
c16aa5bbf0 Fixes: U4-7745 7.4 Property Editor & Keyboard Shortcuts 2016-01-20 11:35:46 +01:00
Simon Busborg
e5f5e16f9a Added ng-cloak to fix flickeren in http://issues.umbraco.org/issue/U4-7762 
Fixes flickering in U4-7762 Move document or media briefly show error- and success placeholders + odd position of checkmark at root level
 2016-01-19 15:17:39 +01:00
Simon Busborg
e51ef64b66 Fixes: U4-7770 List view icon on content node not displayed properly 2016-01-19 14:54:37 +01:00
Simon Busborg
76ff12f681 Fixes: U4-7762 Move document or media briefly show error- and success placeholders + odd position of checkmark at root level 2016-01-19 14:54:37 +01:00
Mads Rasmussen
ff876266cf Fixes: U4-7775 Ctrl + S doesn't work in new document type editor 2016-01-19 13:50:50 +01:00
Mads Rasmussen
28aa928655 add loader to overlay 2016-01-19 12:29:14 +01:00
Simon Busborg
853bd3947b Merge branch 'markdowneditor-fix' of git://github.com/pynej/Umbraco-CMS into pynej-markdowneditor-fix 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
 2016-01-19 12:18:24 +01:00
Mads Rasmussen
9ea492f5b7 Fix tab indent 2016-01-19 11:51:49 +01:00
Mads Rasmussen
05044dc871 Fixes: U4-7683 Search on Property Editors/Data Types in new Content Type Editor should display two results - resuse / available 2016-01-19 11:49:52 +01:00
Simon Busborg
a6b7e26606 Fixes U4-7761 Typo on Allowed Templates label 2016-01-18 12:58:34 +01:00
Mads Rasmussen
2074df58fb Fixes: U4-7765 disable folder select + only allow images in grid image picker 2016-01-18 12:02:41 +01:00
Mads Rasmussen
e6ab111f4d Fixes: U4-7676 Don't show "Reorder" link in initial row-view for grid 2016-01-18 11:29:23 +01:00
Simon Busborg
c9936da37f Fixes U4-7759 Imagepicker setting in Grid broken in 7.4-beta2 2016-01-18 10:10:03 +01:00
Shannon
b776a32a64 fixes the models builder API controller URL 2016-01-15 16:54:38 +01:00
Sebastiaan Janssen
49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Shannon Deminick
efdeb757f6 Merge pull request #1023 from umbraco/temp-U4-7212 
U4-7212 All new text for content type editor needs to be localized.
 2016-01-15 12:05:38 +01:00
Shannon
b79c7407e6 Removes unecessary promise wrapping for localizing, fixes localization service so that it's not double requesting and fixes how it deals with promise returns. 2016-01-15 11:49:29 +01:00
Shannon
8399906c9a Merge branch '7.4.0' into temp-U4-7212 2016-01-15 11:17:28 +01:00
Mads Rasmussen
08e4f42974 do not show settings icon if there are no settings 2016-01-15 10:21:32 +01:00
Claus
54e3f0f9ec Fixes: U4-6297 Add Settings to Grid Controls 
Added settings to grid controls in v.7.4.
 2016-01-15 10:04:49 +01:00
Stephan
46f3d0c647 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 15:51:53 +01:00
Mads Rasmussen
b4bc0ca156 Fixes: RTE media picker 2016-01-14 14:07:46 +01:00
Simon Busborg
ed8847821d Added localizationService to user.controller 2016-01-14 11:44:32 +01:00
Mads Rasmussen
487d2c6ea1 localize property settings overlay 2016-01-14 11:44:31 +01:00
Mads Rasmussen
c66a6bb06f localize list view checkbox text 2016-01-14 11:44:31 +01:00
Mads Rasmussen
4bb4ce0ef4 localize header 2016-01-14 11:44:31 +01:00
Mads Rasmussen
b67b7c91a5 localize no compositions 2016-01-14 11:44:31 +01:00
Mads Rasmussen
a7627e3482 fix save list view button 2016-01-14 11:44:31 +01:00
Mads Rasmussen
2e6621f31b fix key for umbChildSelector directive 2016-01-14 11:44:31 +01:00
Mads Rasmussen
8a07f47077 add localizationService as dependency on ysod overlay 2016-01-14 11:44:31 +01:00
Simon Busborg
5cefd9ad20 localize property validation 2016-01-14 11:44:31 +01:00
Simon Busborg
cdcadab68b localize overlay titles 2016-01-14 11:44:30 +01:00
Simon Busborg
67112b640c localized component views 2016-01-14 11:44:30 +01:00
Simon Busborg
c9ad7659a8 localize components views 2016-01-14 11:44:30 +01:00
Simon Busborg
cc1764dc88 Added localization for controllers (member, media and document types) 2016-01-14 11:44:30 +01:00
Simon Busborg
3888853a40 Added localization to controllers 2016-01-14 11:44:30 +01:00
Simon Busborg
397a9bffb2 localized documentypes, memberstypes and mediatypes, only controllers missing 2016-01-14 11:44:30 +01:00
Simon Busborg
5965552494 localized documenttypes 2016-01-14 11:44:30 +01:00
Simon Busborg
f504a98bcd localized placeholders 2016-01-14 11:44:29 +01:00
Simon Busborg
e47d72a51f Added localize to dialogs 2016-01-14 11:44:29 +01:00
Mads Rasmussen
e334f669b8 localize member types create 2016-01-14 11:44:29 +01:00
Mads Rasmussen
679d9c1e0a translate media types create 2016-01-14 11:44:29 +01:00
Mads Rasmussen
a3d9cbb5fd translate document type editor create dialog 2016-01-14 11:44:29 +01:00
Mads Rasmussen
30c928a734 fix localize bug with reorder and compositions button in content type editor 2016-01-14 11:44:29 +01:00
Mads Rasmussen
9a5f8c2899 start localizing content type editor 2016-01-14 11:44:29 +01:00
Shannon
6ae1806615 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 11:40:06 +01:00
Shannon Deminick
4068c527bc Merge pull request #1019 from umbraco/temp-U4-7560 
Fixes: U4-7560 Default member properties should not be editable
 2016-01-14 11:29:56 +01:00
Shannon
c2c350a517 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
 2016-01-14 10:37:14 +01:00