swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,583 Commits 73 Branches 219 Tags
a4274ba76727273eb8d7cfb02b97fc5bdcd3e9cc
Commit Graph

5066 Commits

Author SHA1 Message Date
Shannon b49db0e941 Initial commit for member type sensitive data, this adds the db and model requirements and updates the normal property editor for a member type which saves the isSensitive data to the db. 2018-01-23 13:01:31 -07:00
Shannon e25f6e82ed Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
 2018-01-23 11:42:14 -07:00
Shannon d104525a50 Updates core to use latest CDF version 2018-01-23 11:15:37 -07:00
Pete Duncanson ca86385269 Prevent Pinterest messing with media in the back office 
Fixes: http://issues.umbraco.org/issue/U4-10865
 2018-01-23 15:10:09 +00:00
Warren Buckley d298388a7b Update the UI.Release XML too 2018-01-23 11:47:59 +00:00
Warren Buckley 4463abe9bb Added in the create XML for the legacy UserControl based Create Dialog 2018-01-23 11:39:12 +00:00
Ian Houghton 60ce36a7f2 U4-10864 add button when search returns no results, to clear the search 2018-01-22 22:03:35 +00:00
Anders Bjerner 4285102422 Minor casing change 2018-01-22 18:08:37 +01:00
Mads Rasmussen 8007c8869f Merge pull request #2401 from umbraco/temp-U4-10835 
U4-10835 Adds context menu items to the User tree
 2018-01-22 13:25:59 +01:00
Stephan 2f7f22961b Version alpha.31 with ModelsBuilder alpha.14 2018-01-20 10:21:01 +01:00
Warren Buckley f2d6b47e47 Update labels for context menu items to be just 'Create' & 'Invite' to keep the same consistency throughout the UI as other context menu items do not include the verb 2018-01-19 14:24:57 +00:00
Claus 936e94789d adding to tinyMceConfig.Release.config. 2018-01-19 12:21:57 +01:00
Claus 468ec8824a Merge branch 'dev-v7' of git://github.com/karltynan/Umbraco-CMS into karltynan-dev-v7 2018-01-19 11:11:13 +01:00
Sebastiaan Jansssen cad913b7a1 U4-10857 Update to ClientDependency 1.9.5 2018-01-19 08:26:34 +01:00
Sebastiaan Jansssen 382103d99d Bump version to 7.7.9 2018-01-19 08:26:33 +01:00
Mads Rasmussen 9d780a2e8f fixes: U4-10837 CMS getting started tour can't create Home page 2018-01-17 15:50:01 +01:00
Shannon b3cbcebf5b Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-15 16:27:29 +11:00
Sebastiaan Janssen 23be0134e7 Merge pull request #1605 from jobf/dev-v7 
fix U4-8792 override overflow
 2018-01-13 17:57:49 +01:00
Shannon Deminick effa984bdc Merge pull request #2371 from umbraco/temp-U4-10707 
fixes: U4-10707 Config to order tour groups
 2018-01-11 22:04:24 +11:00
Mads Rasmussen 3b9d56f557 Merge branch 'dev-v7.8' into temp-v8-UI 2018-01-10 20:08:50 +01:00
Stephan ad882ab5be Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10789 2018-01-10 15:58:18 +01:00
Ilham Boulghallat 700b71f9fb Merge pull request #2377 from abjerner/patch-32 
A few fixes for the Danish translation
 2018-01-10 15:14:27 +01:00
Claus ce11a377e6 refactor 2018-01-10 11:37:37 +01:00
Claus fd8317493e Merge branch 'dev-v7.8' into temp-U4-10707 
# Conflicts:
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2018-01-10 10:10:19 +01:00
Claus 2dec03f441 Merge pull request #2374 from umbraco/temp-U4-10810 
U4-10810 Update CDF to support storing TEMP files in environment %tem…
 2018-01-10 09:04:58 +01:00
Claus 9ada0d9c97 reverting committed iis settings. 2018-01-10 09:03:35 +01:00
Shannon 11fa015b64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2018-01-10 15:08:10 +11:00
Shannon df553140e8 Updates to latest 1.9.4 of CDF and updates Nuspec 2018-01-10 12:25:24 +11:00
Anders Bjerner 0b898f2e32 A few fixes for the Danish translation 2018-01-09 22:54:48 +01:00
Anders Bjerner 1aad4e50d5 Start node -> Startnode 2018-01-09 21:25:36 +01:00
Claus a5ec5f46ac filtering out tours. 2018-01-09 15:49:19 +01:00
Mads Rasmussen ea70e18a91 set "Getting Started"-tour group to order 100 so it is possible be add groups before and after 2018-01-09 14:13:27 +01:00
Mads Rasmussen b15def99c7 format as json 2018-01-09 11:53:21 +01:00
Shannon bc828fc6f3 U4-10810 Update CDF to support storing TEMP files in environment %temp% location 2018-01-09 13:52:52 +11:00
Sebastiaan Jansssen 3e8fb11abd Update to latest modelsbuilder 2018-01-08 08:39:01 +01:00
Shannon a9713dc6fc Converts the xslt tree to a controller, ensures all config for trees is correct and transforms for upgrades applied 2018-01-05 13:44:57 +11:00
Sebastiaan Jansssen d2f3e162f1 Bump version to 7.7.8 2018-01-04 16:45:00 +01:00
Claus 7404e20a19 Merge pull request #2331 from JackPenney/JackPenney-patch-1 
Removed CMS Import keys from hebrew translation
 2018-01-04 14:05:43 +01:00
Claus 744ff0cf33 Merge pull request #2328 from akierczynska/patch-3 
Update pl.xml
 2018-01-04 14:04:47 +01:00
Shannon bd9adffaa5 Converts macro tree to use a proper controller so we can disable it 2018-01-03 13:33:33 +11:00
Shannon 773ef1d168 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2018-01-02 15:28:30 +11:00
Mads Rasmussen f56bd731b7 Merge pull request #2227 from abryukhov/U4-10481 
U4-10481 - v7.7.x - RU localization of the last added keys
 2017-12-27 13:24:42 +01:00
Ilham Boulghallat f4f99c2922 Merge pull request #2336 from MrCosmo/temp-U4-10722 
U4-10722 fix in Dutch localization
 2017-12-18 10:32:33 +00:00
Mads Rasmussen b29f591084 start on moving sections to new top bar 2017-12-14 11:24:37 +01:00
Shannon 9e2c7d16a6 Merge branch 'dev-v7' into dev-v7.8 2017-12-14 18:35:34 +11:00
Shannon 44db4e7a48 updates nuspec and references to use latest Examine 2017-12-14 18:34:48 +11:00
Shannon 8053cea92d Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/UdiEntityType.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/umbraco.cms/umbraco.cms.csproj
 2017-12-14 16:24:25 +11:00
Robert 1ff66d0c3a Merge pull request #2345 from umbraco/temp-U4-10735 
U4-10735 Examine update to better manage appdomain shutdowns
 2017-12-13 10:52:56 +01:00
Sebastiaan Jansssen b6b7b9f433 Bump version to 7.7.7 2017-12-11 13:57:31 +01:00
Shannon 131fea3ba4 updates some proj refs 2017-12-06 15:38:00 +01:00