yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,128 Commits 4 Branches 7 Tags
3d006f1e086f59320105ec5f8a12788fc90af7dc
Commit Graph

4714 Commits

Author SHA1 Message Date
pijemcolu
74e16c0f8d fix link to training in Settings->Dashboard 2017-07-21 10:14:07 +02: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
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
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
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
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
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
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
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
Robert
88bb796f4d Merge branch 'dev-v7' into dev-v7-U4-10130 2017-07-11 10:41:58 +02:00
Alexander Bryukhov
c87e880b64 Minor localization issues U4-10139 2017-07-11 14:15:07 +07: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
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
Bjarne Fyrstenborg
dd041a6f09 Ensure it override injected styles from custom font icon 2017-07-07 19:16:42 +02:00
Bjarne Fyrstenborg
733aab6eb5 Fix vertical separator color and height of icon in custom section 2017-07-07 18:57:57 +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
Robert
7053c175f8 Removed "remove paragraph tags" field 2017-07-03 13:44:37 +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
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
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
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
AndyButland
67e109c0e6 Preserved line breaks in property descriptions when rendering in content area 2017-06-23 11:40:43 +02:00
Claus
eb52dafb33 U4-9839 Media Picker: If I only upload one photo then select it as a part of the upload process 2017-06-22 13:01:29 +02:00
Sebastiaan Janssen
af382c171b Merge pull request #2009 from umbraco/temp-U4-10034 
U4-10034 Package install may not wait for app domain restart in all cases
 2017-06-22 11:22:18 +02:00
Claus
54fdfdd639 adding grunt watch interval to prevent insane cpu load. 2017-06-22 11:05:42 +02:00
Claus
0eb8ebd82e fixing up translations. 2017-06-21 14:04:15 +02:00
Claus
bc76fa8687 Merge branch 'localization-v764' of git://github.com/abryukhov/Umbraco-CMS into temp-U4-10043 2017-06-21 12:03:25 +02:00
Shannon
6d81705ece fixes the restart check 2017-06-21 18:34:22 +10:00
Shannon
2f24dfb8f0 changes name from versionHash to cacheBuster 
(cherry picked from commit 439c30e2fd)
 2017-06-21 08:26:44 +02:00
Shannon
ad63050078 Fixes issue of rendering the umb version in the html markup 
(cherry picked from commit c13b2fae4b)
 2017-06-21 08:26:20 +02:00
Alexander Bryukhov
552c2ed4dc Localizing hardcoded strings 2017-06-21 02:45:18 +07:00
Alexander Bryukhov
d7e522132e Localizing hardcoded strings 2017-06-21 02:45:12 +07:00
Alexander Bryukhov
ca7c43d944 Localizing hardcoded strings 2017-06-21 02:45:05 +07:00
Alexander Bryukhov
c35e842391 Localizing hardcoded strings 2017-06-21 02:44:59 +07:00
Alexander Bryukhov
dae20cc986 Localizing hardcoded strings 2017-06-21 02:44:52 +07:00
Alexander Bryukhov
c466514e7f Localizing hardcoded strings 2017-06-21 02:44:45 +07:00
Alexander Bryukhov
5e2aa7fa68 Localizing hardcoded strings 2017-06-21 02:44:39 +07:00
Alexander Bryukhov
11ccc88bc8 Localizing hardcoded strings 2017-06-21 02:44:33 +07:00
Alexander Bryukhov
c83009c879 Localizing hardcoded strings 2017-06-21 02:44:26 +07:00