yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,377 Commits 4 Branches 7 Tags
47d08e69a4d09e7d89a50c5eb8afcd6893c24379
Commit Graph

3445 Commits

Author SHA1 Message Date
Sebastiaan Jansssen
c63156fcd8 Bump version to 7.7.11 
(cherry picked from commit 0c25c36af0)
 2018-02-09 09:53:52 +01:00
Sebastiaan Janssen
78c289a559 Merge pull request #2425 from umbraco/mittonp-dev-v7 
Mittonp dev v7
 2018-02-01 08:59:35 +01:00
Sebastiaan Jansssen
646abb3aea Merge branch 'dev-v7' of https://github.com/mittonp/Umbraco-CMS into mittonp-dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
 2018-02-01 08:57:47 +01:00
Sebastiaan Jansssen
da0b1c2f23 Merge branch 'U4-10864_close_back_office_search_results' of https://github.com/redmorello/Umbraco-CMS into redmorello-U4-10864_close_back_office_search_results 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-24 17:43:19 +01:00
Sebastiaan Janssen
8057d09fc2 Merge pull request #2416 from PeteDuncanson/patch-1 
Prevent Pinterest messing with media in the back office
 2018-01-24 15:53:40 +01:00
Sebastiaan Jansssen
abdd117264 Fixes bug in MB 3.0.9 2018-01-24 15:26:40 +01:00
Sebastiaan Jansssen
7a4b5fa796 Bump version to 7.7.10 2018-01-24 14:34:03 +01:00
Sebastiaan Jansssen
c962132ee0 Update to ModelsBuilder 3.0.9 2018-01-24 14:33:32 +01: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
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
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
Sebastiaan Janssen
23be0134e7 Merge pull request #1605 from jobf/dev-v7 
fix U4-8792 override overflow
 2018-01-13 17:57:49 +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
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
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
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
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
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
Shannon
44db4e7a48 updates nuspec and references to use latest Examine 2017-12-14 18:34:48 +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
Shannon
b0661218a0 U4-10735 Examine update to better manage appdomain shutdowns 2017-12-06 15:21:38 +01:00
Marco
158e40d7f6 U4-10722 fix in Dutch localization 2017-11-29 08:25:04 +01:00
Jack Penney
1c4e1db054 Removed CMS Import keys from hebrew translation 2017-11-23 12:28:17 +00:00
Karl Tynan
ce58ad91b5 Added `small` to allowed TinyMCE valid elements 
We use ``small`` a lot in the RTE, and ``small`` is now considered a really useful tag in HTML5. I would like to see this in the default valid elements list for people to use out-of-the box.
 2017-11-21 15:18:42 +00:00
bjarnef
2f3d9c9509 localize texts 2017-11-20 12:32:09 +01:00
akierczynska
f3ba1fa7ed Update pl.xml 
Adding translations and adjusting pl.xml to en.xml format.
 2017-11-15 18:07:31 +00:00
Sebastiaan Janssen
7eca99e249 Bump version to 7.7.6 2017-11-15 15:21:25 +01:00
Sebastiaan Janssen
dad77fc506 Bump version to 7.7.5 2017-11-14 07:17:19 +01:00
Sebastiaan Janssen
000ba73887 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/UmbracoExamine/packages.config
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-11-13 15:38:59 +01:00
Sebastiaan Janssen
08b81d991b Update to latest ImageProcessor 2017-11-13 15:33:54 +01:00
Sebastiaan Janssen
4937f87c0d Update to latest Examine 2017-11-13 15:27:15 +01:00
Shannon
9290f61f94 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Core/Security/MembershipProviderExtensions.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-11-08 17:36:27 +11:00
Sebastiaan Janssen
51fec0c7d3 Remove misleading text, nothing bad will happen when you close the sort panel, sorting is a background task. 2017-11-07 14:03:17 +01:00
Sebastiaan Janssen
87ace12a4f Prevent double clicks of the Save button 
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
 2017-11-07 13:49:02 +01:00