Per Ploug
|
babcbd2f7a
|
Updates from dev-v7
|
2017-08-07 15:29:34 +02:00 |
|
Per Ploug
|
ba82885b6d
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike
# Conflicts:
# build/BuildBelle.bat
|
2017-08-07 14:05:53 +02:00 |
|
Per Ploug
|
e35a748c92
|
Fixes issues with missing angular modules and adds sourcemap support
|
2017-06-27 17:00:00 +02:00 |
|
Shannon
|
cb6f934792
|
fixes cache bust value
|
2017-06-27 19:40:24 +10:00 |
|
Shannon Deminick
|
7adbecf9a1
|
Merge pull request #2019 from lars-erik/U4-6695-internalsvisibleto-unittesting-adapter
U4-6695 Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter")
|
2017-06-27 10:06:36 +10:00 |
|
Claus
|
2fdf148610
|
localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250
|
2017-06-26 15:41:17 +02:00 |
|
Claus
|
9d9e5e8274
|
Merge branch 'rodyvansambeek-patch-1' into dev-v7
|
2017-06-26 15:33:27 +02:00 |
|
Claus
|
89895dd592
|
Merge branch 'patch-1' of git://github.com/rodyvansambeek/Umbraco-CMS into rodyvansambeek-patch-1
# Conflicts:
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
|
2017-06-26 15:32:47 +02:00 |
|
Lars-Erik Aabech
|
f9252372ea
|
Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters.
|
2017-06-26 12:39:57 +02:00 |
|
Claus
|
02a2178029
|
Merge branch 'benjaminketron-temp-U4-9464' into dev-v7
|
2017-06-26 11:33:27 +02:00 |
|
Claus
|
ee775a2fde
|
adding a few more tests.
|
2017-06-26 11:31:46 +02:00 |
|
Claus
|
22af206626
|
Merge branch 'temp-U4-9464' of git://github.com/benjaminketron/Umbraco-CMS into benjaminketron-temp-U4-9464
|
2017-06-26 11:23:24 +02:00 |
|
Sebastiaan Janssen
|
8a4d85771b
|
Merge pull request #2016 from mikecp/U4-10047
U4 10047
|
2017-06-23 11:14:49 +02:00 |
|
Sebastiaan Janssen
|
4688ac104e
|
Merge pull request #1494 from AndyButland/u4-8999
U4-8999 - health check, debug compilation mode is being reported in error when config missing
|
2017-06-23 08:31:29 +02:00 |
|
Michael Latouche
|
032dbe5bf5
|
Update fr.xml
|
2017-06-23 00:52:10 +02:00 |
|
Michael Latouche
|
a7695163b9
|
Update fr.xml
|
2017-06-23 00:21:33 +02:00 |
|
Michael Latouche
|
cb4569677e
|
Update fr.xml
|
2017-06-23 00:10:22 +02:00 |
|
Michael Latouche
|
4be704b968
|
Update fr.xml
|
2017-06-23 00:09:52 +02:00 |
|
Michael Latouche
|
b7a5cb046a
|
Update fr.xml
|
2017-06-22 23:56:33 +02:00 |
|
Sebastiaan Janssen
|
af382c171b
|
Merge pull request #2009 from umbraco/temp-U4-10034
U4-10034 Package install may not wait for app domain restart in all cases
|
2017-06-22 11:22:18 +02:00 |
|
Claus
|
54fdfdd639
|
adding grunt watch interval to prevent insane cpu load.
|
2017-06-22 11:05:42 +02:00 |
|
Claus
|
c4c99ef0b8
|
Merge pull request #2014 from umbraco/temp-deploy-348
deploy-348 - add support for languages
|
2017-06-22 10:53:31 +02:00 |
|
Stephan
|
0bd233815e
|
deploy-348 - add support for languages
|
2017-06-22 10:04:48 +02:00 |
|
Michael Latouche
|
4c9fd4029f
|
Merge pull request #3 from umbraco/dev-v7
Resync
|
2017-06-22 00:32:36 +02:00 |
|
Claus
|
3d65afabbf
|
Merge branch 'temp-U4-10043' into dev-v7
|
2017-06-21 14:27:34 +02:00 |
|
Claus
|
ef9bf155ef
|
typo.
|
2017-06-21 14:21:39 +02:00 |
|
Sebastiaan Janssen
|
e947f661a9
|
Merge pull request #2011 from akierczynska/patch-1
Updating pl.xml language version to cover en.xml
|
2017-06-21 14:20:19 +02:00 |
|
Claus
|
0eb8ebd82e
|
fixing up translations.
|
2017-06-21 14:04:15 +02:00 |
|
Claus
|
bc76fa8687
|
Merge branch 'localization-v764' of git://github.com/abryukhov/Umbraco-CMS into temp-U4-10043
|
2017-06-21 12:03:25 +02:00 |
|
Sebastiaan Janssen
|
8681d535f2
|
Merge pull request #2010 from umbraco/temp-U4-10035
Turns out when we empty the recycle bin we weren't removing associate…
|
2017-06-21 11:51:47 +02:00 |
|
Shannon
|
6d81705ece
|
fixes the restart check
|
2017-06-21 18:34:22 +10:00 |
|
Sebastiaan Janssen
|
b433af8611
|
Merge pull request #2013 from umbraco/temp-U4-10046
U4-10046 Stop resolving TreeController from the PluginManager for eve…
|
2017-06-21 10:15:07 +02:00 |
|
Shannon
|
b0f4d0e16b
|
U4-10046 Stop resolving TreeController from the PluginManager for every back office request
|
2017-06-21 18:11:03 +10:00 |
|
Shannon
|
2f24dfb8f0
|
changes name from versionHash to cacheBuster
(cherry picked from commit 439c30e2fd)
|
2017-06-21 08:26:44 +02:00 |
|
Shannon
|
ad63050078
|
Fixes issue of rendering the umb version in the html markup
(cherry picked from commit c13b2fae4b)
|
2017-06-21 08:26:20 +02:00 |
|
Alexander Bryukhov
|
552c2ed4dc
|
Localizing hardcoded strings
|
2017-06-21 02:45:18 +07:00 |
|
Alexander Bryukhov
|
d7e522132e
|
Localizing hardcoded strings
|
2017-06-21 02:45:12 +07:00 |
|
Alexander Bryukhov
|
ca7c43d944
|
Localizing hardcoded strings
|
2017-06-21 02:45:05 +07:00 |
|
Alexander Bryukhov
|
c35e842391
|
Localizing hardcoded strings
|
2017-06-21 02:44:59 +07:00 |
|
Alexander Bryukhov
|
dae20cc986
|
Localizing hardcoded strings
|
2017-06-21 02:44:52 +07:00 |
|
Alexander Bryukhov
|
c466514e7f
|
Localizing hardcoded strings
|
2017-06-21 02:44:45 +07:00 |
|
Alexander Bryukhov
|
5e2aa7fa68
|
Localizing hardcoded strings
|
2017-06-21 02:44:39 +07:00 |
|
Alexander Bryukhov
|
11ccc88bc8
|
Localizing hardcoded strings
|
2017-06-21 02:44:33 +07:00 |
|
Alexander Bryukhov
|
c83009c879
|
Localizing hardcoded strings
|
2017-06-21 02:44:26 +07:00 |
|
Alexander Bryukhov
|
d6b9b41776
|
Localizing hardcoded strings
|
2017-06-21 02:44:19 +07:00 |
|
Alexander Bryukhov
|
508a4c32b4
|
Localizing hardcoded strings
|
2017-06-21 02:44:12 +07:00 |
|
Alexander Bryukhov
|
dbf2538aae
|
Localizing hardcoded strings
|
2017-06-21 02:44:06 +07:00 |
|
Alexander Bryukhov
|
5293b3bcc7
|
Localizing hardcoded strings
|
2017-06-21 02:44:00 +07:00 |
|
Alexander Bryukhov
|
940caba2c4
|
Localizing hardcoded strings
|
2017-06-21 02:43:53 +07:00 |
|
Alexander Bryukhov
|
e31daef4fa
|
Localizing hardcoded strings
|
2017-06-21 02:43:47 +07:00 |
|