Shannon
|
6f74fcf24a
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-07-18 13:27:03 +10:00 |
|
Sebastiaan Janssen
|
91fa583f62
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-07-17 22:15:24 +02:00 |
|
Sebastiaan Janssen
|
23d91fd350
|
Adds removed method back in case someone is using it (would be breaking otherwise)
|
2017-07-17 22:14:59 +02:00 |
|
Sebastiaan Janssen
|
d4714e1580
|
Merge pull request #2052 from umbraco/dev-v7.6
Oops was targeting old branch :)
|
2017-07-17 22:12:47 +02:00 |
|
Sebastiaan Janssen
|
2b22e6a784
|
Merge pull request #1940 from AndyButland/u4-9892
U4-9892 - ordered media types when returned for create dialog
|
2017-07-17 22:09:00 +02:00 |
|
Sebastiaan Janssen
|
59840926c8
|
Merge pull request #1952 from callumbwhyte/U4-9934
U4 9934: Fixes deleting members in list view using custom membership provider
|
2017-07-17 22:01:33 +02:00 |
|
Sebastiaan Janssen
|
338c7cc5a6
|
Merge branch 'callumbwhyte-U4-9934' into dev-v7
|
2017-07-17 21:31:43 +02:00 |
|
Sebastiaan Janssen
|
77850aea18
|
Merge branch 'U4-9934' of https://github.com/callumbwhyte/Umbraco-CMS into callumbwhyte-U4-9934
|
2017-07-17 21:31:25 +02:00 |
|
Sebastiaan Janssen
|
895f0a9dfe
|
Merge pull request #1982 from AndyButland/u4-9987
Extended HttpsCheck healthcheck to check for expiring SSL certificate
|
2017-07-17 21:26:03 +02:00 |
|
Sebastiaan Janssen
|
ec03a3dc42
|
Merge pull request #1989 from HarveyWilliams/patch-2
Fix for `IsDocumentTypeRecursive` - U4-9997
|
2017-07-17 21:23:18 +02:00 |
|
Sebastiaan Janssen
|
5a4dbba21b
|
Merge pull request #1998 from Jeavon/temp-U4-10013
U4-10013 Umbraco.MediaPicker value converter does not understand ints
|
2017-07-17 20:40:24 +02:00 |
|
Sebastiaan Janssen
|
04546dd827
|
Merge pull request #2035 from bjarnef/dev-v7-U4-9945
U4-9945 - Fix vertical separator color and height of icon in custom section
|
2017-07-17 20:22:43 +02:00 |
|
Sebastiaan Janssen
|
4ecf1f919e
|
Merge pull request #2038 from bjarnef/dev-v7-U4-4079
U4-4079 - Open context menu in member section, when clicking "do something else" button
|
2017-07-17 20:18:37 +02:00 |
|
Sebastiaan Janssen
|
bdc4e1ae6a
|
Merge pull request #2041 from blueboxes/dev-v7
U4-10143 - Improved error messages when we retrieve current xml node
|
2017-07-17 19:51:49 +02:00 |
|
Sebastiaan Janssen
|
3cb05870af
|
Merge pull request #2051 from mistyn8/U4-10171
Update treepicker.html [U4-10171] add ability to remove picker item
|
2017-07-17 18:15:23 +02:00 |
|
Sebastiaan Janssen
|
95b0c342bb
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2017-07-17 17:51:39 +02:00 |
|
Sebastiaan Janssen
|
3a5584a1c1
|
Some updates to description and code style
|
2017-07-17 17:50:38 +02:00 |
|
Sebastiaan Janssen
|
b425edbb45
|
Merge branch 'srmooney-U4-10088' into dev-v7
|
2017-07-17 17:30:56 +02:00 |
|
Sebastiaan Janssen
|
b403283368
|
Merge branch 'U4-10088' of https://github.com/srmooney/Umbraco-CMS into srmooney-U4-10088
|
2017-07-17 17:30:32 +02:00 |
|
Mike Chambers
|
cb1d347769
|
Update treepicker.html
resolves U4-10171 can't click remove icon, to remove picker item.
|
2017-07-17 15:54:11 +01:00 |
|
Warren Buckley
|
4d0a2c85b7
|
Merge pull request #2049 from umbraco/temp-U4-5672
U4-5672 Properties and Tabs moving/incorrect when Enable list view se…
|
2017-07-17 09:41:37 +01:00 |
|
Sebastiaan Janssen
|
e1957b895f
|
U4-5672 Properties and Tabs moving/incorrect when Enable list view selected
|
2017-07-17 09:46:30 +02:00 |
|
Stephan
|
c696c62185
|
More fsTreeController cleanup
|
2017-07-13 15:12:14 +02:00 |
|
Warren Buckley
|
0dfbb95033
|
Merge branch 'madjor5-U4-4413_-_maxlength' into dev-v7
|
2017-07-13 13:39:20 +01:00 |
|
Stephan
|
2bff1bfbb6
|
U4-10121 - properly dispose context
|
2017-07-13 14:20:29 +02:00 |
|
Warren Buckley
|
17969e4537
|
Merge branch 'U4-4413_-_maxlength' of https://github.com/madjor5/Umbraco-CMS into madjor5-U4-4413_-_maxlength
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
|
2017-07-13 13:09:06 +01:00 |
|
Stephan
|
ab1dade468
|
U4-10121 - properly dispose context
|
2017-07-13 13:11:46 +02:00 |
|
mikkelhm
|
374fdcf29e
|
Bumps version to 7.6.5
|
2017-07-13 12:14:32 +02:00 |
|
Claus
|
bcb19eea35
|
Merge pull request #1678 from PeteDuncanson/patch-2
Fixed error label showing when you do a retry
|
2017-07-12 15:47:32 +02:00 |
|
Claus
|
0acb0d48a1
|
Merge pull request #1858 from Jeavon/RelatedLinks-Tweaks
Tweaks to RelatedLinks
|
2017-07-12 15:26:53 +02:00 |
|
Claus
|
da00ad1444
|
Merge branch 'abryukhov-temp-U4-10139' into dev-v7
|
2017-07-12 15:10:51 +02:00 |
|
Claus
|
7bc52b3948
|
localization fixes.
|
2017-07-12 15:06:29 +02:00 |
|
Claus
|
a77aec4156
|
Merge branch 'temp-U4-10139' of git://github.com/abryukhov/Umbraco-CMS into abryukhov-temp-U4-10139
|
2017-07-12 14:36:47 +02:00 |
|
Claus
|
f7f3dccfc8
|
Merge pull request #2042 from umbraco/temp-fsTreeController
filesystem controller compatibility
|
2017-07-12 14:27:00 +02:00 |
|
Claus
|
ab3469d703
|
cleanup.
|
2017-07-12 14:26:44 +02:00 |
|
Claus
|
c78ea90cf5
|
cleaning up a bit.
|
2017-07-12 14:24:09 +02:00 |
|
Sebastiaan Janssen
|
3de0b85ae3
|
Merge pull request #2001 from umbraco/temp-u4-9993
U4-9993 - fix upgrade issues
|
2017-07-12 12:59:19 +02:00 |
|
Stephan
|
87b51d1418
|
Merge branch dev-v7 into temp-fsTreeController
|
2017-07-11 19:06:01 +02:00 |
|
John Kilmister
|
8ea1af56ab
|
U4-10143 - Improved error messages when we retrieve current xml node
|
2017-07-11 16:22:21 +01:00 |
|
Stephan
|
219eb61194
|
Merge branch 'dev-v7' into temp-u4-9993
|
2017-07-11 14:47:54 +02:00 |
|
Claus
|
7f98f99eaa
|
Merge pull request #2039 from umbraco/temp-u4-10121
U4-10121 - Scheduled Publishing as background task
|
2017-07-11 11:37:46 +02:00 |
|
Robert
|
1d3279fe07
|
Merge pull request #2036 from bjarnef/dev-v7-U4-10130
U4-10130 - Equal height of input and button
|
2017-07-11 10:48:23 +02:00 |
|
Robert
|
88bb796f4d
|
Merge branch 'dev-v7' into dev-v7-U4-10130
|
2017-07-11 10:41:58 +02:00 |
|
Robert
|
97878ac25a
|
Merge pull request #2037 from bjarnef/dev-v7-U4-9933
U4-9933 - Update datepicker styles
|
2017-07-11 09:56:48 +02:00 |
|
Alexander Bryukhov
|
c87e880b64
|
Minor localization issues U4-10139
|
2017-07-11 14:15:07 +07:00 |
|
Stephan
|
79df75c415
|
U4-10121 - Scheduled Publishing as background task
|
2017-07-10 13:39:40 +02:00 |
|
Bjarne Fyrstenborg
|
e28ba446a0
|
Open context menu when clicking "Do something else"
|
2017-07-08 01:20:26 +02:00 |
|
Bjarne Fyrstenborg
|
c645a2cf15
|
Update styles of datepicker
|
2017-07-08 00:45:18 +02:00 |
|
Bjarne Fyrstenborg
|
5fb8d990f8
|
Include original missing changes
|
2017-07-07 23:52:20 +02:00 |
|
Bjarne Fyrstenborg
|
8626e4337f
|
Adjust search icon position
|
2017-07-07 23:40:02 +02:00 |
|