Stephan
|
ed9abcf181
|
Refactor build, better to build tests
|
2016-11-05 15:33:27 +01:00 |
|
Stephan
|
d33083a2e6
|
Refactor build, why build tests separately?
|
2016-11-05 13:44:03 +01:00 |
|
Stephan
|
8aa730d986
|
Ensure U4-8720 is properly merged into v8
|
2016-11-05 13:16:22 +01:00 |
|
Stephan
|
467ed87c3b
|
Ensure U4-8729 is properly merged into v8
|
2016-11-05 10:32:09 +01:00 |
|
Stephan
|
bbe1825847
|
Ensure U4-8663 is properly merged into v8
|
2016-11-05 10:23:39 +01:00 |
|
Stephan
|
a28b916534
|
Fix NPoco stuff
|
2016-11-04 19:19:16 +01:00 |
|
Stephan
|
c6e4e3b3ed
|
Merge origin/dev-v7-deploy into dev-v8-zbwip
|
2016-11-04 18:40:42 +01:00 |
|
Stephan
|
a4c3d3ec2d
|
Not supposed to have jquery.unobtrusive-ajax.min.js anymore?
|
2016-11-04 12:36:41 +01:00 |
|
Stephan
|
8fa1499a2f
|
Merge origin/dev-v7 into dev-v7-deploy
|
2016-11-04 12:18:39 +01:00 |
|
Stephan
|
f825ed6bb4
|
Post-merge fixing (running)
|
2016-11-04 12:14:42 +01:00 |
|
Stephan
|
3f4306a05f
|
Consolidate and update dependencies
|
2016-11-04 12:05:51 +01:00 |
|
Stephan
|
b29bc66026
|
Post-merge fixing & refactoring (tests ok)
|
2016-11-04 11:36:58 +01:00 |
|
Stephan
|
74e0a4d999
|
7.6 merge review fixes
|
2016-11-03 19:20:42 +01:00 |
|
Sebastiaan Janssen
|
0eeb481d85
|
Merge pull request #1586 from LottePitcher/U4-9068
Truncate should not finish halfway through a two word unicode character
|
2016-11-03 17:53:49 +01:00 |
|
Sebastiaan Janssen
|
ecbe058d00
|
Merge pull request #1591 from RachBreeze/U4-7239
U4-7239 Now trims the parameters
|
2016-11-03 17:16:22 +01:00 |
|
Lotte Pitcher
|
c8b23195f6
|
When truncating if the last characters was the first half of a two word unicode character, also include the second half to avoid YSOD
|
2016-11-03 14:30:38 +00:00 |
|
Sebastiaan Janssen
|
02840965d7
|
Merge pull request #1577 from Draga/U4-9055
U4-9055
|
2016-11-03 15:25:03 +01:00 |
|
Sebastiaan Janssen
|
5b13ab255a
|
Merge pull request #1575 from readingdancer/U4-9091
U4-9091 - Fixed the font being used in the Media Picker for files
|
2016-11-03 15:09:22 +01:00 |
|
CORP\Rachel.Breeze
|
ae659e3c84
|
U4-7239 Now trims the parameters so that if a default is set in a comma and space seperated list, the parameter is now populated.
|
2016-11-03 13:40:46 +00:00 |
|
Stefano Chiodino
|
c1ffefc6af
|
U4-9055 remove background-color on preview that was interfering with the website
style
|
2016-11-03 11:51:01 +00:00 |
|
Chris Houston
|
1b2d75ee52
|
Fixed the font being used in the Media Picker when a file has been selected.
|
2016-11-03 11:43:03 +00:00 |
|
Sebastiaan Janssen
|
d5b2ce9c09
|
Merge pull request #1571 from drpeck/U4-8183
(U4-8183) Changed the link picker dialog from Page Title to Link title
|
2016-11-03 12:25:27 +01: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 |
|
Claus
|
a06b920785
|
Merge pull request #1563 from umbraco/temp-u4-9137
U4-9137 - Fix PublishedMediaCache getting trashed media
|
2016-11-03 11:25:21 +01:00 |
|
Stephan
|
b26b415096
|
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
|
2016-11-03 10:31:44 +01:00 |
|
Stephan
|
c2d3d057a5
|
U4-9137 - Fix PublishedMediaCache getting trashed media
|
2016-11-02 13:59:04 +01:00 |
|
Claus
|
ef38808ba5
|
Merge branch 'merge-U4-8782' into dev-v7
|
2016-11-01 14:34:56 +01:00 |
|
Claus
|
7fe5f0c099
|
Merge branch 'Flaeng-Email-validation-on-user-form' into merge-U4-8782
Conflicts:
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
|
2016-11-01 14:28:38 +01:00 |
|
Claus
|
5f615d30b2
|
Merge branch 'Email-validation-on-user-form' of git://github.com/Flaeng/Umbraco-CMS into Flaeng-Email-validation-on-user-form
|
2016-11-01 13:35:04 +01:00 |
|
Claus
|
7ce2bbe9b1
|
Merge branch 'mikecp-temp-U4-8782' into merge-U4-8782
|
2016-11-01 13:34:19 +01: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 |
|
Sebastiaan Janssen
|
82a2f50d03
|
Merge pull request #1554 from umbraco/temp-u4-9121
U4-9121 - improve url perfs
|
2016-11-01 09:56:11 +01:00 |
|
Stephan
|
c500f98ad8
|
U4-9121 - improve url perfs
|
2016-10-28 14:33:44 +02:00 |
|
Sebastiaan Janssen
|
41a8dd10de
|
Merge pull request #1545 from umbraco/temp-u4-9090
U4-9090 - Upgrade to ModelsBuilder 3.0.5 (reuse compiled live dll on …
|
2016-10-28 10:37:13 +02:00 |
|
Sebastiaan Janssen
|
9283e57429
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2016-10-27 22:09:43 +02:00 |
|
Sebastiaan Janssen
|
3bdb3f8c1e
|
U4-9065 Update github readme from Kris's notes
#U4-9065 Fixed
|
2016-10-27 22:08:52 +02:00 |
|
Sebastiaan Janssen
|
3aee8b069d
|
Merge pull request #1547 from umbraco/temp-U4-9039
Fixes: U4-9039 No progress indication when uploading local package
|
2016-10-27 21:47:05 +02:00 |
|
Sebastiaan Janssen
|
3e79b65539
|
Merge pull request #1549 from umbraco/temp-u4-8995
U4-8995 - fix health check for trySkipIisError
|
2016-10-27 21:30:55 +02:00 |
|
Shannon
|
ba0ef3676d
|
U4-9109 changes all usage of automapper ResolveUsing<T> to instantiate the resolver explicitly - this prevents IoC frameworks registered against automapper to not explode if these resolvers have not been added to the container.
|
2016-10-27 18:32:16 +02:00 |
|
Stephan
|
7495d89a79
|
U4-9107 - enable bench on empty db
|
2016-10-26 19:26:10 +02:00 |
|
Stephan
|
15ad07f5db
|
Merge pull request #1544 from umbraco/temp-U4-9107
U4-9107 Change BulkInsertRecords to use BulkCopy or TableDirect (SQLCE)
|
2016-10-26 19:24:41 +02:00 |
|
Stephan
|
c95c4c359a
|
Merge branch 'dev-v7' into temp-U4-9107
|
2016-10-26 18:03:43 +02:00 |
|
Stephan
|
1a1dd99a89
|
Merge pull request #1550 from umbraco/temp-U4-9101
U4-9101 fix up how cache refresh instructions are read or written and to prevent duplicate processing
|
2016-10-26 18:01:58 +02:00 |
|
Stephan
|
71afe908b4
|
U4-9101 - comments and misc
|
2016-10-26 18:01:32 +02:00 |
|
Stephan
|
e3c3acfca9
|
Merge branch 'dev-v7' into temp-U4-9101
|
2016-10-26 17:48:41 +02:00 |
|
Shannon
|
7e81768abc
|
adds exception checking to ExamineExtensions
|
2016-10-26 14:25:32 +02:00 |
|
Stephan
|
6d0bca471e
|
U4-8995 - fix health check for trySkipIisError
|
2016-10-26 14:24:31 +02:00 |
|
Shannon
|
8e4e7e5b19
|
Ensures no duplicates are processed between rows
|
2016-10-26 12:19:36 +02:00 |
|
Shannon
|
c667627d2f
|
Changes max row retrieval to 100
|
2016-10-26 12:01:43 +02:00 |
|