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

22397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Budik
3efbb47aed U4-11527 Fix concurrency issue 2018-08-08 10:38:53 +02: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
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
Sebastiaan Janssen
fe914dc339 Also make sure the alias gets generated from the full name and not just the part before the & 2018-07-31 22:01:35 +02:00
Chris Houston
a2cb5fac98 Fixes issue #U4-11472 
Document type, Media Type & Data Type folders did not support Ampersands in their names, now they do.
 2018-07-31 11:06:06 -04:00
Mundairson
9cd2db5018 U4-11546 [v7] Clean up to remove compiler warnings (#2823) 2018-07-31 10:41:15 +02:00
Sebastiaan Janssen
3a0c872587 Merge pull request #2631 from poornimanayar/U4-8617 
check for recursive value
 2018-07-30 17:30:47 +02:00
Steven Harland
92b11bf966 Increase z-index of .umb-nav-tabs (#2566) 
This lowers the chances of property editors overlapping the tab overflow menu.
More info here: http://issues.umbraco.org/issue/U4-11185
 2018-07-30 17:10:50 +02:00
Steven Harland
a7f68fa3d3 Add margin and padding to tabs dropdown (#2560) 
This reduces the space between the active tab and tab content so that they bleed into each other.
More info here: http://issues.umbraco.org/issue/U4-11181
 2018-07-30 17:03:53 +02:00
Sebastiaan Janssen
86acf0c1ad Revert "enable use of radiobuttonlist pre editor" 
This reverts commit 80412f56ee.
 2018-07-30 15:46:34 +02:00
Sebastiaan Janssen
2ea5a7a293 Make radiobuttonlist work with configs as well 
Re: https://github.com/umbraco/Umbraco-CMS/pull/2763#issuecomment-408848485
 2018-07-30 15:46:02 +02:00
Sebastiaan Janssen
8dc3b032b7 Removes unmaintained cleanup scripts and unused git installer 2018-07-30 13:34:45 +02:00
Sebastiaan Janssen
7aa9ae8771 Cleanup: remove Teamcity test runner 2018-07-30 13:34:10 +02:00
Sebastiaan Janssen
4a77afd3c8 Cleanup tests that don't work and have been ignored for years 
Also means we don't need ctt.exe any more
 2018-07-30 13:24:46 +02:00
Sebastiaan Janssen
fd6582f066 Removes unused Umbraco.MSBuild.Tasks 2018-07-30 13:20:13 +02:00
Sebastiaan Janssen
09d65a5aae Merge pull request #2815 from Mundairson/dev-v7-U4-11540 
U4-11540 Removing Warning CS0105 - The using directive appeared previously in this namespace
 2018-07-30 12:27:27 +02:00
Sebastiaan Janssen
cd601d8ada Revert whitespace changes 2018-07-30 12:25:18 +02:00
Sebastiaan Janssen
29ae78b1a0 Merge branch 'dev-v7-U4-11540' of https://github.com/Mundairson/Umbraco-CMS into Mundairson-dev-v7-U4-11540 2018-07-30 12:17:52 +02:00
Sebastiaan Janssen
4cefd355ec Merge pull request #2811 from imranhaidercogworks/update-our-umbraco-url-references 
Update our umbraco url references [v8hackaton]
 2018-07-30 11:42:25 +02:00
Sebastiaan Janssen
8404efc521 Adds a few updates from PR #2820 and updates feedProxy to allow both .org and .com 2018-07-30 11:38:51 +02:00
Sebastiaan Janssen
c8cc5278f3 Merge branch 'update-our-umbraco-url-references' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-update-our-umbraco-url-references 2018-07-30 11:20:32 +02:00
BatJan
60c66823f8 Fix for PR #2792 - Selected color does not show in document type (#2817) 2018-07-30 10:11:57 +02:00