Warren Buckley
|
0dfbb95033
|
Merge branch 'madjor5-U4-4413_-_maxlength' into dev-v7
|
2017-07-13 13:39:20 +01: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 |
|
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
|
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 |
|
Stephan
|
219eb61194
|
Merge branch 'dev-v7' into temp-u4-9993
|
2017-07-11 14:47:54 +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 |
|
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 |
|
Bjarne Fyrstenborg
|
0f22c41eee
|
Update height of input in header
|
2017-07-07 23:21:19 +02:00 |
|
Bjarne Fyrstenborg
|
e73fda14b5
|
Adjust height of input fields
|
2017-07-07 23:16:11 +02:00 |
|
Bjarne Fyrstenborg
|
a04df8070a
|
Revert "Make examine search input and button more consistent with UI"
This reverts commit 60c1052db1.
|
2017-07-07 22:51:32 +02:00 |
|
Bjarne Fyrstenborg
|
60c1052db1
|
Make examine search input and button more consistent with UI
|
2017-07-07 22:12:27 +02:00 |
|
Sebastiaan Janssen
|
0445588c6b
|
Merge pull request #2033 from umbraco/temp-revert-newstarterkitdefault
Reverts the change for the installer screen which needs to be ready f…
|
2017-07-06 15:31:45 +02:00 |
|
mikkelhm
|
4d316cf0ce
|
Reverts the change for the installer screen which needs to be ready for the new starterkit and Lessons
|
2017-07-06 15:06:55 +02:00 |
|
Mikkel Holck Madsen
|
864650193a
|
Merge pull request #2032 from umbraco/temp-U4-10124
U4-10124 Update IFileService to handle MacroScripts and UserControls
|
2017-07-06 12:58:17 +02:00 |
|
Claus
|
cfa7b0a092
|
U4-10124 Update IFileService to handle MacroScripts and UserControls
|
2017-07-06 10:44:51 +02:00 |
|
Mikkel Holck Madsen
|
5726420848
|
Merge pull request #2030 from umbraco/temp-U4-10098
U4-10098 Update FileService to support legacy MacroScript and UserCon…
|
2017-07-06 09:15:18 +02:00 |
|
Claus
|
ca752f74bc
|
updating array length.
|
2017-07-04 17:29:32 +02:00 |
|
Claus
|
b840a0992c
|
adding shadow filesystems.
|
2017-07-04 14:47:29 +02:00 |
|
Claus
|
51997d0651
|
U4-10098 Update FileService to support legacy MacroScript and UserControl folders
|
2017-07-04 14:28:15 +02:00 |
|
Shannon Deminick
|
9482104ec5
|
Merge pull request #2028 from umbraco/temp-U4-4905
Removed "remove paragraph tags" field
|
2017-07-04 12:33:25 +10:00 |
|
Robert
|
7053c175f8
|
Removed "remove paragraph tags" field
|
2017-07-03 13:44:37 +02:00 |
|
Claus
|
b2116480fc
|
fix formatting.
|
2017-07-03 11:17:05 +02:00 |
|
Claus
|
caef6cc623
|
Merge pull request #2026 from wanddy/dev-v7
Improve Chinese translation
|
2017-07-03 08:32:47 +02:00 |
|
wanddy
|
280ad246ab
|
Merge remote-tracking branch 'remotes/origin/dev-v7' into dev-v7
|
2017-06-30 19:46:09 +08:00 |
|
Stephan
|
43e0ef2472
|
Merge branch 'dev-v7' into temp-u4-9993
|
2017-06-30 11:02:43 +02:00 |
|
Claus
|
44cfe5da84
|
missing nullcheck.
|
2017-06-30 10:46:44 +02:00 |
|
Claus
|
d5fd266b19
|
missing semicolon.
|
2017-06-30 10:34:58 +02:00 |
|
wanddy
|
5768992ccc
|
Improve Chinese translation to match the newest version based on en.xml file.
Signed-off-by: wanddy <wanddy@163.com>
|
2017-06-30 12:10:59 +08:00 |
|
Mads Rasmussen
|
81aae79b42
|
Merge pull request #2015 from umbraco/temp-U4-9839
U4-9839 Media Picker: If I only upload one photo then select it as a …
|
2017-06-29 14:54:49 +02:00 |
|
Claus
|
9edbb3fc26
|
Merge pull request #1634 from soreng/patch-2
use already defined variable, instead of mapping the path twice
|
2017-06-29 14:47:21 +02:00 |
|
Claus
|
7fdd2bcdfc
|
Merge pull request #2018 from AndyButland/u4-4090
Fixes U4-4090 - by preserved line breaks in property descriptions...
|
2017-06-29 14:43:13 +02:00 |
|
Claus
|
ba90fdeb56
|
Merge pull request #1778 from bjarnef/dev-v7-U4-9585
Allow leading whitespace in textstring prevalue editor
|
2017-06-29 14:40:10 +02:00 |
|
Claus
|
d6bae1b58f
|
Merge pull request #1958 from poornimanayar/U4-9661
U4-9661 Remove "move" button in member section
|
2017-06-29 14:37:00 +02:00 |
|
Claus
|
ef53db52f7
|
Merge pull request #1850 from pijemcolu/temp-U4-9710
U4-9710 ImageCropDataSet.HasImage returns wrong value
|
2017-06-29 14:07:59 +02:00 |
|
Claus
|
863b97039c
|
Merge pull request #1632 from bjarnef/dev-v7-U4-9181
U4-9181 - Fix sorting of grid editor config
|
2017-06-29 13:55:12 +02:00 |
|
Claus
|
1a1adbf647
|
Merge pull request #2024 from greystate/drobar-partialviews
Updates to partialviews
|
2017-06-29 13:47:54 +02:00 |
|
Claus
|
5c745565da
|
Merge pull request #2025 from umbraco/temp-U4-8970
U4-8988 Adding translations for Chinese (Taiwan)
|
2017-06-29 13:28:06 +02:00 |
|