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

14674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
a9411aa246 change grid items settings dialog to new overlay component 2015-12-15 15:18:31 +01:00
Mads Rasmussen
cfbfa2f5c9 umb-overlay: block styling of form elements 2015-12-15 15:06:45 +01:00
Mads Rasmussen
e163fefd7d use new media picker component in grid media picker 2015-12-15 15:06:45 +01:00
Mads Rasmussen
dc59b5b674 rename "rteembed" to "embed", save data to other property, add changes to tinymce + use new overlay component in grid embed 2015-12-15 15:06:45 +01:00
Mads Rasmussen
778522cad7 add copy of user dialog and help dialog for new overlay component 2015-12-15 15:06:45 +01:00
Mads Rasmussen
ea3942f151 umb-overlay: add support for left side positioned dialogs 2015-12-15 15:06:45 +01:00
Mads Rasmussen
7ed9e9e665 decrease umb-overlay subtitle font size a bit 2015-12-15 15:06:45 +01:00
Mads Rasmussen
2302bb5438 umb-overlay: remove close from header + add support for a subtitle 2015-12-15 15:06:45 +01:00
Mads Rasmussen
74636c7d5a Fixes: U4-7490 Update umb-photo-folder to use umb-media-grid in the media picker + hide drop zone if there are images in a folder and add upload button from old media picker 2015-12-15 15:06:44 +01:00
Mads Rasmussen
fba740141a copy rte embed to new overlay component 2015-12-15 15:06:44 +01:00
Mads Rasmussen
0b1854e73e switch markdown editor media picker dialog with overlay component 2015-12-15 15:06:44 +01:00
Mads Rasmussen
e54a478458 Switch rich text editor media picker dialog with new overlay component 2015-12-15 15:06:44 +01:00
Mads Rasmussen
9a8273b784 Fixes: U4-7541 umbAutoResize does not work in Microsoft Edge 2015-12-15 14:51:51 +01:00
Sebastiaan Janssen
c813eccb45 Merge branch 'dev-v7' into 7.4.0 2015-12-15 13:53:50 +01:00
Sebastiaan Janssen
eacc7f7fb3 Whoops, was supposed to be en-US by default 2015-12-15 13:50:19 +01:00
Sebastiaan Janssen
80f597a7eb U4-7424 - Also update all other errors displayed in the frontend 2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
d069da8a4f Make LocalizedTextService fall back to en-GB if the key is not found in the current file 2015-12-15 12:51:03 +01:00
Sebastiaan Janssen
44ebd8d9ea Proper formatting of this file, only whitespace changes 2015-12-15 12:18:23 +01:00
Sebastiaan Janssen
2fd6dc3603 Merge branch 'engern-U4-7424' into dev-v7 2015-12-15 12:14:07 +01:00
Sebastiaan Janssen
0629b49112 Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424 2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
198ba0db83 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:25:09 +01:00
Sebastiaan Janssen
4958c5a59a Merge branch 'jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header' into dev-v7 2015-12-15 11:21:23 +01:00
Sebastiaan Janssen
523501db8c Merge branch 'U4-7503-Disable-X-AspNetMvc-Version-Header' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header 2015-12-15 11:21:11 +01:00
Sebastiaan Janssen
6ce4354ef3 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:14:15 +01:00
Sebastiaan Janssen
23cd2b09ca Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-12-15 11:13:22 +01:00
Sebastiaan Janssen
a1ff1d4543 Merge branch 'TimoPerplex-dev-v7' into dev-v7 2015-12-15 11:12:57 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Shannon Deminick
8ce8455773 Merge pull request #950 from umbraco/temp-U4-7373 
Fixes U4-7373 Error notifications shown are hidden underneath the dialogs
 2015-12-15 10:53:55 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Shannon
8598ab565c Fixes: U4-7536 Sign-out in back office will call all ASP.Net identity middleware sign out methods 
publicises a few things too.
 2015-12-15 10:34:11 +01:00
Simon Busborg
31147fa8d1 missing comma 2015-12-15 10:26:22 +01:00
Simon Busborg
d75f8bf1bd added wrapper to directive 2015-12-15 10:24:38 +01:00
Simon Busborg
ecb6c8e52c Fix for U4-7373 Error notifications shown are hidden underneath the dialogs 
http://issues.umbraco.org/issue/U4-7373
 2015-12-15 10:08:19 +01:00
Claus
3cdd650b66 Merge pull request #940 from umbraco/temp-U4-7445 
Temp u4 7445
 2015-12-14 11:31:02 +01:00
Simon Busborg
8bd3b25a66 Fix for: http://issues.umbraco.org/issue/U4-7518 
New list view (umb-table) misses published/unpublished state
 2015-12-11 14:26:17 +01:00
Rune Strand
10b828379b Element hinzufügen! 2015-12-09 09:31:38 +01:00
James Coxhead
739ff33ce1 Removed X-AspNet-Version and X-AspNetMvc-Version headers 2015-12-08 21:44:40 +00:00
James Coxhead
f27a726a6e Disabled the X-AspNetMvc-Version header 2015-12-08 21:19:41 +00:00
Sebastiaan Janssen
220446afec Adds some more dependencies so we upgrade those properly when necessary 2015-12-08 14:24:52 +01:00
Sebastiaan Janssen
a101367292 This would've stayed here for years and be irrelevant, we can link to twitter profiles in the docs on Our 2015-12-08 14:02:43 +01:00
Sebastiaan Janssen
e90fedb835 Bumps version 2015-12-08 13:54:57 +01:00
Sebastiaan Janssen
d5f9dfecc4 U4-7496 Backoffice dropdowns quit working in Chrome after update to v47.0.2526.73 
#U4-7496 Fixed
 2015-12-08 13:54:56 +01:00
Rune Strand
7431ed4db1 Better wording 2015-12-08 13:42:05 +01:00
Claus
cbb84f79d1 Merge pull request #799 from esn303/patch-1 
Major revamp with keys added and texts fixed everywhere
 2015-12-08 11:40:42 +01:00
Rune Strand
cb07ec3157 Add dialog localization and new keys to all lang 2015-12-07 18:07:08 +01:00
Sebastiaan Janssen
7a4b7c25dd Can't use higher versions of angular-dynamic-locale 
See: https://github.com/lgalfaso/angular-dynamic-locale/issues/82
 2015-12-07 13:00:57 +01:00
Sebastiaan Janssen
a162974bf9 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 11:51:34 +01:00
Sebastiaan Janssen
a7377d0686 Merge pull request #939 from hartvig/dev-v7 
Fixing a little typo as reported by Chris Houston
 2015-12-07 11:49:28 +01:00
hartvig
68a4749917 Fixing a little typo 2015-12-07 11:11:02 +01:00
Sebastiaan Janssen
ff61112c18 Updates installer background 2015-12-07 10:32:24 +01:00