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

4453 Commits

Author SHA1 Message Date
Stephan
f4aad94505 Fix build batch (is it real?) 2016-07-20 15:10:33 +02:00
Stephan
d6462370fc Fix after merge 2016-07-20 11:31:20 +02:00
Stephan
c9152e3aca Fix build after merge 2016-07-18 15:00:08 +02:00
Stephan
77c2766d55 Merge branch origin/dev-v7 into dev-v8 2016-07-18 14:42:06 +02:00
Stephan
d04efbf5a4 Retarget migrations after merge 2016-07-18 10:54:27 +02:00
Stephan
a66cf484e8 Fix more tests after merge 2016-07-18 10:37:37 +02:00
Sebastiaan Janssen
a758688c52 U4-8730 MigrationRunner should check for migrations params to already be null 
#U4-8730 Fixed
 2016-07-15 12:03:15 +02:00
Shannon
4469e6bf11 fixes migration to actually execute for mysql 2016-07-15 09:45:03 +02:00
Sebastiaan Janssen
91b8f4dcce Merge pull request #1380 from umbraco/temp-U4-8522 
U4-8522 cmsPropertyData needs unique constraint indexes and index refactoring
 2016-07-15 09:22:31 +02:00
Shannon
52e2cbab90 updates delete query to work with MySql 2016-07-14 18:00:43 +02:00
Shannon
e7b26ad949 updates migratoin to run a single delete statement during execution 2016-07-14 17:51:18 +02:00
Shannon
bd306295c2 Ensures the correct index is installed by default, fixes a test that didn't take this index into account 2016-07-12 19:39:22 +02:00
Shannon
1eef30710d U4-8522 cmsPropertyData needs unique constraint indexes and index refactoring 2016-07-12 17:34:11 +02:00
Shannon
0450cdd550 removes some old notes 2016-07-12 13:36:08 +02:00
Shannon
856de5b9f3 Ensures Stylesheet tables are not re-added on install, and re-removes them for upgrades. 2016-07-11 15:32:22 +02:00
Shannon
ff0711f786 bumps version txt file 2016-07-11 10:09:17 +02:00
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
Stephan
554b943931 Fix tests after merge 2016-07-08 19:20:57 +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
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
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
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
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
4531bf6c30 U4-8682 - manage cache in tests 2016-07-06 18:01:59 +02:00
Warren Buckley
b3259e5d3c Merge pull request #1371 from umbraco/temp-u4-8675 
u4-8675
 2016-07-06 11:42:16 +01: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
Shannon
a67020ec31 Ensures that the package Icon is displayed for installed packages. Cleans up lots of try/catch/swallows in the packaging logic, adds better xml error handling (we really need a lot more though), ensures that if any part of the package installation fails, that angular bails and doesn't keep trying to install - same logic for installing forms. 2016-06-28 20:14:12 +02:00
Benjamin Ketron
42ef6d3d76 An attempt to speed up sorting a large set of nodes when a large set of users exist. Our sorts were failing in azure because the user notifications were taking long enough that azure would kill the thread. 2016-06-28 12:03:36 -06:00
Shannon
81a4130f46 U4-8624 umbracoCacheInstructions is slowing server response 2016-06-28 16:31:24 +02:00
Claus
4423f965d1 Merge pull request #1359 from umbraco/temp-U4-8592b 
U4-8592 - fix property conversions
 2016-06-28 11:13:22 +02:00
Stephan
db79690501 U4-8592 - fix decimal scaling factor issue 2016-06-28 10:09:11 +02:00
Stephan
09526e6db4 U4-8592 - fix property conversions 2016-06-27 15:33:08 +02:00
Shannon
eec0e4f946 Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/packages.config
 2016-06-27 14:20:13 +02:00
Shannon
1c40d9d0d8 U4-8627 Umbraco.Core.Sync.DatabaseServerMessenger - No last synced Id found when '0' is stored and there are no instructions 2016-06-23 16:55:04 +02:00
Shannon
1bfb32dcdc Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-U4-8588 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Web.UI/packages.config
 2016-06-23 16:55:04 +02:00
Claus
b75578c889 U4-8640 Deleting a content type with children only emits a deleted event on the parent content type 
service now includes all deleted content types including children, in the DeletedContentType event arguments.
tests to ensure the correct number of deleted entities are sent in events.
 2016-06-22 19:30:31 +02:00
Sebastiaan Janssen
402b2b082f Merge pull request #1347 from umbraco/temp-U4-8433 
This ensures we are using the latest code from Log4Net.Async for thes…
 2016-06-22 17:25:11 +02:00
Stephan
ab973fd4df U4-8410 - fix build 2016-06-22 13:33:52 +02:00