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

3078 Commits

Author SHA1 Message Date
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
Shannon Deminick
62dffedc02 Merge pull request #1491 from umbraco/temp-U4-9001 
U4-9001 Health Check, HTTPS Configuration is missing a message when c…
 2016-10-05 10:53:49 +02:00
michael
f0db4824ec Solve issue U4-8782 : E-mail validation when editing user + update error message when creating new user to use localized text 2016-09-30 23:20:17 +02:00
Stephan
e477c8b0b3 Merge branch origin/dev-v7 into dev-v7-deploy 2016-09-29 09:03:56 +02:00
Shannon Deminick
2c9bc5135c Merge pull request #1483 from umbraco/temp-U4-8984 
U4-8984 Upgrade AutoMapper to latest 3.x
 2016-09-28 15:41:38 +02:00
Shannon
248177f518 Ensures Nuspec has correct AutoMapper, ensures config transform is correct (we cannot remove something that isn't there since it never existed before) 2016-09-28 15:33:32 +02:00
Darren Ferguson
78524398b7 U4-9012 The word "Oops" should probably be removed, because we can cancel publish by API, it may be deliberate. http://issues.umbraco.org/issue/U4-9012 2016-09-23 18:43:55 +01:00
michael
2d0725fbad update with latest labels from en_us.xml 2016-09-22 12:15:13 +02:00
michael
1a0ced4f15 Merge remote-tracking branch 'umbraco/dev-v7' into dev-v7 2016-09-22 01:07:01 +02:00
Stephan
7176c99264 Merge branch origin/dev-v7 into dev-v7-deploy 2016-09-21 16:03:17 +02:00
Sebastiaan Janssen
9d9c36b253 U4-9001 Health Check, HTTPS Configuration is missing a message when certificate is valid 2016-09-21 13:04:06 +02:00
Alexander Bryukhov
e60d5c8f2c U4-8985 Label for row configurations in the grid editor 2016-09-20 20:39:31 +07:00
Stephan
7784dfbbcb Upgrade ModelsBuilder to 8.0.0-alpha0005 2016-09-19 16:33:49 +02:00
Stephan
5c2232aa3b Refactor logging and profiling, boot reporting 2016-09-19 16:33:47 +02:00
Stephan
0597eea72b Resvolution - Components, Runtime & Booting 2016-09-19 16:33:43 +02:00
Claus
efc2a8e2ea U4-8985 Label for row configurations in the grid editor 2016-09-16 23:20:47 +02:00
Claus
d725f1362f U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:23:31 +02:00
Claus
e79427619b Revert "U4-8984 Upgrade AutoMapper to latest 3.x" 
This reverts commit 4887302b51.
 2016-09-16 21:22:35 +02:00
Claus
4887302b51 U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:21:14 +02:00
Warren Buckley
8091d9a098 Resetting UmbracoSettings file in this PR back to what it was previously - seems to have been committed by mistake 2016-09-16 11:04:50 +01:00
Stephan
ab3b04c165 Fix SqlHelper so it uses to current db connection 2016-09-15 12:14:25 +02:00
Michael Latouche
6407c24977 Update fr.xml 2016-09-10 01:51:45 +02:00
michael
fb8d71fc63 Merge remote-tracking branch 'umbraco/dev-v7' into dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
 2016-09-10 01:45:47 +02:00
michael
8ee98ebdf9 Review and add translation labels to language file fr.xml (sync with latest en version) 2016-09-09 13:37:24 +02:00
michael
d74a30e4e4 Review and add translation labels to language file fr.xml 2016-09-09 13:17:53 +02:00
Claus
2eb050e663 removing a checkbox that didnt do anything at all. 2016-09-09 12:49:08 +02:00
Stephan
22a62421f0 Merge branch origin/dev-v7 into dev-v7-deploy 2016-09-08 16:58:57 +02:00
Stephan
c2eeff6e47 U4-8954 - fix WhereIn issue with non-value-types 2016-09-08 10:37:03 +02:00
Alexander Bryukhov
3bb991edd3 Missing key 'signInWith' added 2016-09-06 11:52:19 +07:00
Alexander Bryukhov
dd0373b855 Localizing URL tracker dashboard 2016-09-06 11:36:00 +07:00
Sebastiaan Janssen
28b4945d36 No longer need this now that it's part of JsJQueryCore 2016-09-05 14:59:22 +02:00
Sebastiaan Janssen
a20b7f9303 Merge pull request #1457 from umbraco/temp-u4-8917 
U4-8719 - bugfix the redirect dashboard
 2016-09-05 12:48:30 +02:00
Sebastiaan Janssen
02cef43815 Localizing the URL tracker dashboard 2016-09-04 13:09:37 +02:00
Sebastiaan Janssen
8ee8b52832 Bumps version 2016-09-03 13:26:40 +02:00
Stephan
fa45cd1a88 tmp 2016-09-02 14:44:16 +02:00
Stephan
0e7ac68c24 Deploy - clear dashboard.config 2016-09-01 16:52:12 +02:00
Stephan
41fafaf7ae Merge branch origin/dev-v7 into dev-v7-deploy 2016-08-26 13:20:53 +02:00
Stephan
0789295701 Temp - 7.6.0-alpha003 - even with internals visible to, need IBackgroundTask to be public 2016-08-24 10:11:38 +02:00
Sebastiaan Janssen
af5455a500 Bumps version 2016-08-23 10:52:29 +02:00
Sebastiaan Janssen
be57692a62 Change some event handlers back to .live instead of .on 
#U4-8884 Fixed
 2016-08-23 10:48:15 +02:00
Stephan
bb81298e84 Temp - 7.6.0-alpha002 + internals visible to deploy 2016-08-23 09:40:02 +02:00
Sebastiaan Janssen
172895f17f U4-8884 Users editor doesn't work any more in 7.5.0 
#U4-8884 Fixed
 2016-08-22 15:18:04 +02:00
Sebastiaan Janssen
f76fd360f1 Bumps version 2016-08-20 10:29:49 +02:00
Sebastiaan Janssen
39ebb9545d Merge pull request #1442 from umbraco/temp-U4-8868 
U4-8868 Ensuring all usages of .live() is updated
 2016-08-18 15:32:03 +02:00