yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,154 Commits 4 Branches 7 Tags
35aac2cdec86c4c8ee29bf6eb804e49aef3bc4a5
Commit Graph

2874 Commits

Author SHA1 Message Date
Stephan
35aac2cdec Merge origin/dev-v7 into dev-v7.6 2016-11-18 09:52:45 +01:00
Sebastiaan Janssen
0a883ae109 Make sure Umbraco runs in Visual Studio 2017 2016-11-16 18:55:12 +01:00
Warren Buckley
02bfe3ad72 Merge pull request #1603 from rjabreu/U4-9036 
added finish button so page only reloads after user input. also added…
 2016-11-16 16:14:53 +00:00
Stephan
ddf29c5875 Merge dev-v7.6 into dev-v7-deploy 2016-11-15 13:59:19 +01:00
Sebastiaan Janssen
26a04ca7e9 Merge pull request #1610 from umbraco/temp-U4-9134 
U4-9134 XSS security issue in the grid
 2016-11-15 12:56:21 +01:00
Claus
6f39439e3d removing string.empty checks for attributes. 
removing the redundant clean for outputting model.value in TextString.cshtml.
 2016-11-15 12:10:36 +01:00
Stephan
2b9ffdb6b9 Merge branch origin/dev-v7 into dev-v7-deploy 2016-11-14 18:53:53 +01:00
Sebastiaan Janssen
5b714572e3 Bump version 2016-11-14 17:04:55 +01:00
Claus
7018969d14 removing unused language keys. 2016-11-09 09:29:43 +01:00
Claus
4a42bfa9bb U4-9160 Headline in the "Republish entire site" dialog is not translated 2016-11-08 10:53:29 +01:00
Claus
8bb069e996 U4-9134 XSS security issue in the grid 
exposing xss clean method on templateutilities.
making the clean xss string extensions public instead of internal.
ensuring the included grid renderers clean for xss.
ensuring the included grid editors using html.raw with value directly, cleans for xss.
 2016-11-08 09:55:24 +01:00
Claus
a0c672eb91 Merge pull request #1568 from rasmusfjord/dev-v7 
Translated dialogs to DK/EN
 2016-11-08 08:44:01 +01:00
Claus
eddd996ed6 Merge pull request #1601 from piotrwegner/dev-v7-pl-translation 
added PL translation
 2016-11-08 08:38:34 +01:00
Claus
b93c3d9caa Merge pull request #1564 from abryukhov/patch-6 
Update ru.xml UI language file
 2016-11-07 11:56:44 +01:00
Claus
4d2aba2577 Merge pull request #1599 from AndyFelton/U4-9147 
Modified grammar on health check dashboard
 2016-11-07 11:26:02 +01:00
Claus
ce780ee4f4 Merge pull request #1595 from AndyFelton/U4-9146 
Health check data integrity colons missing
 2016-11-07 11:24:25 +01:00
Claus
a6134bfacd Merge pull request #1569 from AronGreen/dev-v7 
Danish translations related to Redirect URL Management
 2016-11-07 11:20:43 +01:00
Stephan
8fa1499a2f Merge origin/dev-v7 into dev-v7-deploy 2016-11-04 12:18:39 +01:00
ricardo abreu
4f211aaf48 added finish button so page only reloads after user input. also added localization for en/en_us 2016-11-03 17:13:27 +00:00
Piotr Wegner
4d2bf19891 added PL translation 2016-11-03 17:09:01 +00:00
Andy Felton
b198ecbc02 Modifed grammer as follows 
MacroErrors are set to 'throw' which will prevent some or all pages in your site from loading completely when there's any errors in macros. Rectifying this will set the value to 'inline'. modifed to  "when there's any errors in macros" should be replaced with "if there are any errors in macros"
 2016-11-03 16:51:06 +00:00
Andy Felton
22f37d02dc Added missing colon 2016-11-03 16:00:04 +00:00
David Peck
9162575b35 (U4-8183) Changed the casing to match other labels 2016-11-03 10:53:33 +00:00
David Peck
0ff26aa442 (U4-8183) Changed the link picker dialog from Page Title to Link title in en and en_us 2016-11-03 10:50:10 +00:00
AronGreen
7b345d6cb0 Danish translations related to Redirect URL Management 2016-11-02 22:02:47 +01:00
Rasmus Fjord
71f3948de2 Translated copy dialog (relate to and include descendants) to dk 2016-11-02 21:23:02 +01:00
Rasmus Fjord
cc5f127dcf Translated "openInNewWindow" to a better sound in danish. 2016-11-02 20:57:17 +01:00
Rasmus Fjord
e015e73abe Translation of Moving item(media / content) 2016-11-02 20:55:15 +01:00
Rasmus Fjord
0624d224a9 Translated set permissions windows 2016-11-02 20:30:05 +01:00
Rasmus Fjord
030708194a Oversat publish events 2016-11-02 20:15:55 +01:00
Alexander Bryukhov
5a5be024e4 Update ru.xml UI language file 
Dictionary item editor keys added
 2016-11-03 00:12:44 +07:00
Claus
4c408eb1b7 Merge branch 'temp-U4-8782' of git://github.com/mikecp/Umbraco-CMS into mikecp-temp-U4-8782 2016-11-01 13:32:09 +01:00
Stephan
e330d40005 U4-9090 - Upgrade to ModelsBuilder 3.0.5 (reuse compiled live dll on restart) 2016-10-25 12:40:27 +02:00
Claus
f753dfa2a7 minor updates and a little reformatting. 2016-10-20 13:56:52 +02:00
Claus
8fa02913be Merge branch 'U4-205' of git://github.com/sniffdk/Umbraco-CMS into sniffdk-U4-205 2016-10-20 12:53:44 +02:00
Stephan
e8538cc035 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-20 12:23:22 +02:00
Sebastiaan Janssen
c2d33f3301 Merge pull request #1532 from richarth/patch-1 
Update noNodes.aspx
 2016-10-18 22:12:52 +02:00
Sebastiaan Janssen
097f5355e2 U4-9050 Update to latest Examine 0.1.70.0 2016-10-18 18:03:43 +02:00
Sebastiaan Janssen
7b5670f275 U4-9076 Update to latest ImageProcessor 2016-10-18 16:45:16 +02:00
Stephan
dda988f0ea Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-18 12:25:31 +02:00
richarth
08733d7351 Update noNodes.aspx 
Grammar correction
 2016-10-17 14:28:16 +01:00
Stephan
ac42c8ae26 Fix 2eb050e, broke Xslt edit 2016-10-17 14:06:08 +02:00
leekelleher
c839285f90 Grid: Quote editor - wrong CSS style rule for italic 
[Issue #U4-9073](http://issues.umbraco.org/issue/U4-9073)

In `grid.editors.config.js`, the style config for the Quote editor has an incorrect CSS style rule for italic, it has...

```css
font-variant: italic;
```

It should be...

```css
font-style: italic;
```

I wasn't sure which `grid.editors.config.js` to change, so I did them all.
 2016-10-14 16:37:06 +01:00
Mads Rasmussen
a0a861370b Merge pull request #1499 from darrenferguson/dev-v7 
U4-9012 The word "Oops" should probably be removed, because we can ca…
 2016-10-13 15:20:59 +02:00
Alexander Bryukhov
06132fcdaf Update UI language ru.xml 
New key in healthCheck area added
 2016-10-12 11:17:04 +07:00
Mads Rasmussen
fba4b91bec Merge pull request #1465 from abryukhov/patch-6 
Localizing URL tracker dashboard
 2016-10-11 14:42:37 +02:00
Mads Rasmussen
0ef987207b Merge pull request #1489 from abryukhov/patch-7 
U4-8985 Label for row configurations in the grid editor
 2016-10-11 14:21:06 +02:00
Ivar
95b2ef0f3c Styled toolbar buttons in ChangeDocType dialog 2016-10-10 23:27:42 +00:00
Shannon
b3e6f0fd22 Merge branch 'refs/heads/dev-v7' into dev-v7-deploy 
# Conflicts:
#	src/Umbraco.Core/IO/FileSystemExtensions.cs
 2016-10-06 10:35:45 +02:00
Sebastiaan Janssen
061f1ae0b1 U4-9005 Update comments in urlrewriting.config to note it's obsolete 2016-10-05 17:49:09 +02:00