Commit Graph

16741 Commits

Author SHA1 Message Date
Shannon Deminick
44eb491cd9 Merge pull request #1364 from umbraco/temp-U4-8624
U4-8624 umbracoCacheInstructions is slowing server response
2016-07-11 09:48:38 +02:00
Shannon
7858ad5634 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-07-11 09:40:04 +02:00
Shannon
ca0ffe23ba U4-8718 Latest ClientDependency release 2016-07-11 09:39:54 +02:00
Stephan
554b943931 Fix tests after merge 2016-07-08 19:20:57 +02:00
Stephan
e19471fea7 Build - cleanup build.bat 2016-07-08 19:10:34 +02:00
Stephan
be056869f0 Fix build after merge 2016-07-08 18:31:37 +02:00
Stephan
3c7245f9ba Merge origin/dev-v7 into dev-v8 2016-07-08 16:32:06 +02:00
Sebastiaan Janssen
2a67e2eb46 YAML files need white lines to denote a new command, else they just get concatenated 2016-07-08 15:09:16 +02:00
Sebastiaan Janssen
444c431527 Improving Build.bat and appveyor build output 2016-07-08 14:51:02 +02:00
Stephan
f8b315dad0 Build - fix warnings 2016-07-08 14:17:49 +02:00
Stephan
9792aebf00 Build - fix InstallGit.cmd 2016-07-08 14:16:36 +02:00
Sebastiaan Janssen
7d6cbee9e6 Add msbuild.log to artifacts so we can easily figure out build errors if they occur 2016-07-08 14:15:03 +02:00
Stephan
263109d6ad Can we fix build.bat? 2016-07-08 13:47:32 +02:00
Sebastiaan Janssen
45e48c483d Makes the build of the Tests project quiet too
Do not PAUSE if the build fails, the build server will get stuck or an hour
2016-07-08 13:47:19 +02:00
Sebastiaan Janssen
423df156c1 Makes the build output only show warnings and errors so it's easier to pinpoint problems 2016-07-08 13:47:07 +02:00
Stephan
853e2c7888 Build - cleanup InstallGit 2016-07-08 13:46:23 +02:00
Sebastiaan Janssen
5ebcdce557 Merge pull request #1374 from umbraco/temp-u4-8682
U4-8682 - manage cache in tests
2016-07-07 17:54:39 +02:00
Sebastiaan Janssen
f2d50866d9 Merge pull request #1370 from umbraco/temp-u4-8361
u4-8361 From ids to guids
2016-07-07 17:52:41 +02:00
Stephan
6f6c7ede0a U4-8361 - fixing migrations 2016-07-07 16:56:52 +02:00
Sebastiaan Janssen
85c7b102b9 Revert C#6 notation 2016-07-07 16:22:55 +02:00
Sebastiaan Janssen
05cb2050e7 Revert C#6 notation 2016-07-07 16:17:01 +02:00
Warren Buckley
a494ea8dc8 Merge pull request #1350 from umbraco/temp-U4-8640
U4-8640 Deleting a content type with children only emits a deleted ev…
2016-07-07 14:40:56 +01:00
Sebastiaan Janssen
d0e47fe1ff Merge pull request #1339 from dannydrogt/temp-u4-8613
U4-8613 Link to DocType from "Properties" tab is not localized
2016-07-07 15:38:00 +02:00
Sebastiaan Janssen
7c485dcd50 Forgot password email sent as raw text, but contains html
#U4-8703 Fixed
2016-07-07 15:24:53 +02:00
Warren Buckley
a319aa9503 Merge pull request #1365 from umbraco/temp-packaging
U4-8670 Ensure the create package system in the back office allows for specifying correct metadata
2016-07-07 13:08:19 +01:00
Warren Buckley
e02fbd0bbe Merge pull request #1355 from umbraco/temp-U4-8561
Properly URL Encodes stylesheet properties
2016-07-07 10:47:48 +01:00
Stephan
560c0fbb33 U4-8361 - fixing and perfs 2016-07-06 21:53:08 +02:00
Stephan
c5a346d70f Merge branch 'dev-v7' into temp-u4-8361 2016-07-06 20:00:17 +02:00
Stephan
c1f6708b21 Fix 2016-07-06 18:08:19 +02:00
Stephan
4531bf6c30 U4-8682 - manage cache in tests 2016-07-06 18:01:59 +02:00
Sebastiaan Janssen
c7967dc4f2 Merge pull request #1363 from umbraco/temp-U4-8472
U4-8472 Add web.config file to media folder path to prevent all execu…
2016-07-06 16:49:00 +02:00
Sebastiaan Janssen
0f19937aec Making sure the media/web.config is correctly installed from nuget 2016-07-06 16:48:30 +02:00
Warren Buckley
b3259e5d3c Merge pull request #1371 from umbraco/temp-u4-8675
u4-8675
2016-07-06 11:42:16 +01:00
Sebastiaan Janssen
620800b448 Merge branch 'dev-v7' into temp-U4-8561 2016-07-06 12:32:06 +02:00
Sebastiaan Janssen
f057eca45a Scratch that.. the Alias is actually the Name. Consistency FTW! 2016-07-06 11:14:59 +02:00
Sebastiaan Janssen
b395d1a049 Alias is already running through ToSafeAlias, doesn't need UrlEncoding 2016-07-06 11:04:27 +02:00
Sebastiaan Janssen
46cd7cae38 Make sure to encode/decode the property name everywhere 2016-07-06 11:02:51 +02:00
Sebastiaan Janssen
b2e9fb1534 Need to UrlDecode the parts[1] part so that we can find and properly delete properties with ampersands 2016-07-06 11:00:34 +02:00
Shannon
1f041f17c1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-07-06 09:38:00 +02:00
Shannon
ee27264a72 Ensures all instances of SqlCeEngine are in a using claus so native objects are disposed properly 2016-07-06 09:37:52 +02:00
Stephan
1f40043740 Hopefull fixing tests 2016-07-05 15:11:10 +02:00
Stephan
a7ae9e66cd U4-8624 - throttle pruning instr. and optimize query 2016-07-05 12:29:16 +02:00
Stephan
a0f00efcef Merge branch 'dev-v7' into temp-U4-8624 2016-07-05 12:00:29 +02:00
Stephan
ac44079044 Merge branch 'dev-v7' into temp-U4-8627 2016-07-05 11:45:42 +02:00
Stephan
f799938989 Revert "Merge branch 'U4-8588' ..."
This reverts commit 1bfb32dcdc.
2016-07-05 11:44:41 +02:00
Stephan
cec456d672 U4-8675 - minor fixes 2016-07-05 11:31:53 +02:00
Stephan
b9e886c0bc Merge branch 'U4-8675' of https://github.com/benjaminketron/Umbraco-CMS into temp-u4-8675 2016-07-05 10:30:53 +02:00
Stephan
3d2a0b4a29 U4-8361 - from ids to guids 2016-07-04 18:22:06 +02:00
Stephan
6897ee1d14 U4-8469 - bugfix content cache 2016-07-04 18:21:36 +02:00
Shannon
b1b5352e26 updates to latest Markdown version 2016-07-04 14:38:45 +02:00