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

4815 Commits

Author SHA1 Message Date
Alexander Bryukhov
45988d4f0c Localizing hardcoded strings 2017-06-21 02:42:02 +07:00
Alexander Bryukhov
db330b3223 Localizing hardcoded strings 2017-06-21 02:41:54 +07:00
Alexander Bryukhov
03fd06cfa7 Localizing hardcoded strings 2017-06-21 02:41:45 +07:00
Alexander Bryukhov
775148d241 Localizing hardcoded strings 2017-06-21 02:41:37 +07:00
Alexander Bryukhov
8e65ecdc4a Localizing hardcoded strings 2017-06-21 02:41:27 +07:00
Alexander Bryukhov
6a43dd41c6 Localizing hardcoded strings 2017-06-21 02:41:19 +07:00
Alexander Bryukhov
82ae6a1aef Added localizationService 
and localized two hardcoded strings
 2017-06-21 02:41:04 +07:00
Claus
ef32eda874 Merge branch 'temp-U4-8664' into dev-v7 
fixing language selection.
 2017-06-20 14:09:43 +02:00
Claus
01ccf8a6a6 Merge branch 'U4-8664' of https://github.com/DoctaJonez/Umbraco-CMS into temp-U4-8664 2017-06-20 12:59:28 +02:00
Sebastiaan Janssen
c27ca1fb0d U4-9724 Tiny MCE error when adding a link "Cannot read property 'href' of undefined" 2017-06-20 10:16:00 +02:00
Shannon
68e287cf12 fixes $q reference 2017-06-20 18:11:26 +10:00
Shannon
ad6946aa26 fixes error handler reference 2017-06-20 18:07:17 +10:00
Shannon
d885265818 Changes restart tracking to use code we used to have in there which is an in memory marker for the app domain, this is a little cleaner 2017-06-19 23:40:51 +10:00
Shannon
7920383904 U4-10034 Package install may not wait for app domain restart in all cases 2017-06-19 23:02:06 +10:00
Shannon Deminick
2654f9189f Merge pull request #1973 from marcemarc/marcemarc-u4-9480 
Revised fix for issue: U4-9489 - Just fix logResource.js parameters
 2017-06-19 20:33:37 +10:00
Sebastiaan Janssen
d7453b5a6e Updating the CG link so we can modify it without releasing a new version 
Updated links to our/tv to be https
 2017-06-19 09:49:15 +02:00
Sebastiaan Janssen
5ed8ceb85e Merge pull request #2000 from umbraco/updates-installer-764 
Update installer photo + tlc on starter kit install screen
 2017-06-19 09:34:40 +02:00
Mikkel Holck Madsen
b3ea0c83f9 Merge pull request #1832 from leekelleher/issue/U4-8098 
Fixes U4-8900 - XPath: "$current" on Multinodetreepicker gives error in Document Type editor
 2017-06-15 15:02:14 +02:00
Niels Hartvig
a2c5c35394 Update installer photo + tlc on starter kit install screen 2017-06-14 11:45:03 +02:00
Mads Rasmussen
e559a6d485 add key as hover on name 2017-06-12 14:55:12 +02:00
Claus
160518e977 adding guids to backoffice. 2017-06-12 12:12:14 +02:00
Sebastiaan Janssen
92a507bc87 New CG year 2017-06-05 16:02:04 +02:00
Niels Hartvig
1b844421fc Updates to installer to use the new starter kit (and updates core version) 2017-06-04 20:47:33 +02:00
Niels Hartvig
df9c6baed7 Updates a few numbers in the installer 2017-06-04 18:10:29 +02:00
Brian Powell
70a0bbbe61 Change font references: icomoon -> tinymce 2017-06-03 12:49:42 -04:00
Marc Goodson
cf3343749f Revert fix to umbrequesthelper.service it was NEVER meant to be able to receive an array of a single dictionary item - actual fix is to change logResource to not pass params in this way 2017-06-02 21:04:12 +01:00
Marc Goodson
079df4a8b7 Pass logType and SinceDate as an array of key value pairs and not an array of a single dictionary - the logapi was never meant to be able to receive a dictionary... see comments on http://issues.umbraco.org/issue/U4-9489 for details 2017-06-02 21:02:46 +01:00
Brian Powell
24d9c60bdf Update fonts and stylesheet to include table icons missing per U4-9977 2017-06-01 21:59:31 -04:00
Shannon
5b3c2178a2 Revert "Merge pull request #1729 from marcemarc/marcemarc-U4-9480" 
This reverts commit 145f789631, reversing
changes made to 78bc38fe1b.
 2017-05-31 15:26:22 +02:00
Shannon Deminick
145f789631 Merge pull request #1729 from marcemarc/marcemarc-U4-9480 
U4-9489 - dictonaryToQueryString only returns first dictionary item
 2017-05-31 15:17:11 +02:00
Claus
4a735770e2 Merge pull request #1961 from umbraco/temp-U4-9937 
fixes: U4-9937 RTE Media Picker - Cannot add image to RTE after searching
 2017-05-29 11:42:05 +02:00
Bjarne Fyrstenborg
5a4e6df99c Merge remote-tracking branch 'upstream/dev-v7' into dev-v7-U4-9571 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/tree.less
 2017-05-24 09:40:14 +02:00
Bjarne Fyrstenborg
22f8a4c5dd Fix overwriting background repeat and position on legacy tree icons 2017-05-24 09:24:26 +02:00
Mads Rasmussen
dc5089a9d6 fix svg preview 2017-05-23 14:38:52 +02:00
Mads Rasmussen
45a246d8b6 handle entity and full media objects in media grid 2017-05-23 14:38:34 +02:00
Mads Rasmussen
65bcd78872 add helper to get file extension 2017-05-23 14:37:51 +02:00
Mads Rasmussen
a0fd7001e9 fixes image select in details overlay 2017-05-23 14:37:26 +02:00
Sebastiaan Janssen
cf7c0dffb0 Merge branch 'u4-9558' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9558 2017-05-20 11:48:47 +02:00
Shannon Deminick
c09cd95eb6 Merge pull request #1951 from umbraco/temp-U4-9919 
U4-9919 Updated media files are deleted
 2017-05-19 13:17:35 +10:00
Callum Whyte
4b945f355a Modifying Members list view to use key instead of Id 2017-05-18 22:54:44 +01:00
Callum Whyte
3cf8ef9513 Including key property in model when selecting items in list view 2017-05-18 22:54:19 +01:00
Claus
79844154fb U4-9919 Updated media files are deleted 2017-05-18 11:30:11 +02:00
Claus
067a1ba8e6 U4-9646 RTE Link dialog should auto focus on url 2017-05-18 10:02:46 +02:00
Shannon
765decf3b1 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
#	src/Umbraco.Web/Trees/PartialViewsTree.cs
 2017-05-17 20:00:29 +10:00
AndyButland
eb35791003 Reverted media picker behaviour when selecting images to use just configured image types 2017-05-16 21:16:11 +01:00
Claus
d146df43e6 Merge pull request #1903 from HarveyWilliams/dev-v7 
U4-9806 Media Picker media hover should show full title
 2017-05-15 10:19:04 +02:00
AndyButland
3cc0df0273 Fixed media picker calculation of intersection of allowed whitelist and images list 2017-05-09 23:44:31 +02:00
AndyButland
712cd29fea Upload checks to utilise whitelist. Refactored check on white and black list to common extension method. 2017-05-09 23:29:30 +02:00
mikkelhm
745252341f Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
 2017-05-08 13:58:08 +02:00
Shannon Deminick
d012d8e8b6 Merge pull request #1925 from SaDa1337/dev-v7 
fixed console error on media picker
 2017-05-08 17:11:28 +10:00