yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,582 Commits 4 Branches 7 Tags
3940176f2338d069adb36423de1c55539f94de9a
Commit Graph

22582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
45d8d302c9 U4-11581 In rare cases the umbracoLanguage table has a constraint instead of an index, making the migration fail 2018-08-16 12:10:21 +02:00
Dave Woestenborghs
e0ce9f1a77 Removed files from solution that are not longer present in repo 2018-08-16 10:35:08 +02:00
Sebastiaan Janssen
d7a0886097 Fixes problem where we try to query a table that hasn't been updated with the new column yet, so we can't use the DTO 2018-08-16 10:32:10 +02:00
Sebastiaan Janssen
39e8a9fa67 Bump version to 7.12.1 2018-08-15 15:47:21 +02:00
Warren Buckley
1dbf509020 Merge pull request #2855 from umbraco/temp7-156 
fixes: 156: Update nested content css/markup so it doesn't collide with the old package
 2018-08-15 14:03:47 +01:00
Mads Rasmussen
8ce93055ef update colors to use variables and match the new color scheme 2018-08-15 13:00:40 +02:00
Mads Rasmussen
ee4b2adbd4 prefix all nested content css classes with "umb" 2018-08-15 11:59:06 +02:00
Jannik Anker
de73080e14 U4-11572 
Add border to selected icon in document type icon picker dialog
 2018-08-14 13:37:54 +02:00
Mads Rasmussen
6c0d14e0f4 add type="button" to toggle so it doesn't auto-submits a form 2018-08-14 13:14:49 +02:00
Chris Houston
ba682d95dc Small tweaks to the Getting Started tour text. 2018-08-12 01:16:57 -04:00
Sebastiaan Janssen
fd888cab4b Fixes U4-9095 - the textService.Localize always returns some string, either the translation or [alias] - so we need to make sure it actually translated something 2018-08-09 14:36:08 +02:00
Shannon Deminick
50597b5715 Merge pull request #2843 from umbraco/temp7-eslint 
Temp7 eslint
 2018-08-09 15:19:12 +10:00
Mads Rasmussen
f35110309a fix comma-dangle error 2018-08-08 19:52:31 +02:00
Mads Rasmussen
c73860d144 start eslint from scratch so we slowly can add more rules for easier merging to v8 2018-08-08 19:52:00 +02:00
leekelleher
92273f263b U4-11556 V8 - Removed metablogConfig.config 
http://issues.umbraco.org/issue/U4-11556

For v7, I've marked the `SystemFiles.MetablogConfig` strings as deprecated.
 2018-08-08 10:23:14 +01:00
Pavel Budik
3efbb47aed U4-11527 Fix concurrency issue 2018-08-08 10:38:53 +02:00
Warren
7397541259 Minor fixes to notification dialog after some feedback from Shan when merging this up into V8 2018-08-08 09:04:09 +01:00
Warren Buckley
abb88f20f9 Merge pull request #2839 from MMasey/U4-10801 
U4-10801 - Fix label UI bug and update Notification Settings UI to angular take 2.
 2018-08-07 11:00:55 +01:00
Warren
7c9652d966 Minor changes to controller methods 
* Renamed from SetNotificationOptions to PostNotificationsOptions
* Ditch CMSNode in the Get method - as we can use the content.path instead
* Use newer ActionsResolver instead of legacy BusinessLogic for getting Actions
 2018-08-07 10:36:09 +01:00
Warren
65571f4ee2 Change endpoint name to be inline with others prefixing with Post in the Controller method 2018-08-07 10:34:03 +01:00
Warren Buckley
b0756b0b0e Fix typo selectedSting to selectedString 2018-08-07 09:24:59 +01:00
Warren Buckley
b4de7fd64a Removes unused dependancies notificationService & localizationService 2018-08-07 09:23:45 +01:00
Warren Buckley
1f1a4ac15c Remove 64Bit IISExpress config in CSProj 2018-08-07 09:16:36 +01:00
Mike
2b6c6b3022 http://issues.umbraco.org/issue/U4-10801 
Fixes label ui issue on template editor ui.

Updated notification settings ui to use angular instead of web forms.
 2018-08-06 19:52:29 +01:00
Sebastiaan Janssen
5e9f73b114 Merge pull request #2837 from umbraco/temp-U4-11554 
Changed the Danish language file - added the Dictionary title
 2018-08-06 10:51:23 +02:00
elitsa
fc7db11c6c Changed the Danish language file - added the Dictionary title 2018-08-06 10:45:51 +02:00
James Coxhead
9a774c8f9e Added inactive state for users who haven't logged in 2018-08-02 22:01:45 +01:00
James Coxhead
f81dc16210 Specify which user states we want to include when getting all users 2018-08-02 21:55:04 +01:00
James Coxhead
c4a787331f Reverted previous commit to show disabled users in the status filter 2018-08-02 21:54:00 +01:00
Sebastiaan Janssen
af46e1a549 Merge pull request #2834 from andiih/TourWording 
Tour Step 7 Wording
 2018-08-02 14:45:54 +02:00
Andy Hawken (SP4)
afa27ce872 Tour Step 7 Wording 
Change wording of tour step 7 to "Now click on" to indicate that clicking on the avatar is a step in the tour, rather than a description of what it does at runtime
 2018-08-02 13:34:30 +01:00
Sebastiaan Janssen
89bdbf500e Revert "Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)" 
Revert "We need to create the template from it's alias, which is the safeAlias, which is the correct filename"
This reverts commit 9663cfde82 and commit 11aea0f515
 2018-08-02 11:48:12 +02:00
Sebastiaan Janssen
8c5e20c8fe Merge pull request #2830 from karltynan/dev-v7 
Updated some lang files grammar
 2018-08-01 10:59:59 +02:00
Karl Tynan
db2d7687e4 And updated the en_us.xml version too 2018-08-01 09:23:15 +01:00
Karl Tynan
c97311607d Improved text for email and capitalisation for URL 2018-08-01 09:22:45 +01:00
Karl Tynan
dbd9db780c Also updated the en_us.xml 2018-08-01 09:11:19 +01:00
Karl Tynan
04775098fe Updated some grammar on en.xml 2018-08-01 09:10:40 +01:00
Sebastiaan Janssen
f849ca38fc Merge pull request #2829 from readingdancer/U4-11551 
Fixing various broken links in the source code
 2018-08-01 08:04:20 +02:00
Sebastiaan Janssen
11aea0f515 We need to create the template from it's alias, which is the safeAlias, which is the correct filename 
Relates to: https://github.com/umbraco/Umbraco-CMS/pull/2828#issuecomment-409452155
 2018-08-01 07:18:44 +02:00
Sebastiaan Janssen
d803aeb205 Merge pull request #2827 from umbraco/temp-U4-11059 
Changing the document type alias before first save leads to YSOD
 2018-08-01 07:17:07 +02:00
Chris Houston
9663cfde82 Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828) 2018-08-01 07:16:38 +02:00
Sebastiaan Janssen
1d5a807e0d Merge pull request #2826 from bjarnef/dev-v7-U4-9025-3 
U4-9025 - Fix styling of prevalues
 2018-08-01 06:43:29 +02:00
Chris Houston
bb59c4708d Just triggering AppVeyor :) 
As per my other pull request, pretty sure the one unit test failed due to it running close to midnight on the last day of the month.
 2018-08-01 00:30:44 -04:00
Chris Houston
23fda3a0ed Fixing various broken links in the source code, some are just in comments and others are actually used within Umbraco, also added HTTPS where possible. 2018-07-31 23:00:46 -04:00
Shannon
55e1a792da Fixes migrations for 7.12.0 2018-08-01 12:15:18 +10:00
Bjarne Fyrstenborg
a6d9b4b260 Add text-overflow for long labels 2018-07-31 23:25:56 +02:00
Sebastiaan Janssen
4422c5ec52 Update AllowedTemplates list as well if the doctype alias is not the generated one 2018-07-31 22:39:22 +02:00
Bjarne Fyrstenborg
c4fc5a04f9 Adjust color picker prevalues to fit within overlay 2018-07-31 22:16:33 +02:00
Bjarne Fyrstenborg
63bbbbab31 Adjust multivalues styles 2018-07-31 22:15:30 +02:00
Sebastiaan Janssen
fc6dc25224 Merge pull request #2825 from readingdancer/U4-11472 
Fixes issue #U4-11472
 2018-07-31 22:03:49 +02:00