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

22438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
c1bf8259ef Merge branch 'rasmusjp-fix/linkpicker-url-empty' into dev-v7 2018-08-23 21:34:06 +02:00
Sebastiaan Janssen
1b1df84863 Populates the anchor when found 
Also fixes one of the JS files where .model was seemingly used randomly, but the view doesn't want a .model in there
 2018-08-23 21:31:31 +02:00
Sebastiaan Janssen
05fdfc6b34 Merge branch 'fix/linkpicker-url-empty' of https://github.com/rasmusjp/Umbraco-CMS into rasmusjp-fix/linkpicker-url-empty 2018-08-23 20:52:14 +02:00
Sebastiaan Janssen
18b690f11a Bump the version to 7.12.2 2018-08-23 20:45:49 +02:00
Sebastiaan Janssen
d3b577fe37 Merge pull request #2867 from BatJan/features/temp-U4-11587 
U4-11587 Media link does not update when the file is swapped
 2018-08-23 20:37:45 +02:00
Sebastiaan Janssen
720409ef54 Merge pull request #2871 from leekelleher/U4-11595 
umb-node-preview directive - corrected the title of the "Edit" button
 2018-08-23 19:21:30 +02:00
Sebastiaan Janssen
919a63d0ea Merge pull request #2848 from readingdancer/U4-11569 
Small tweaks to the Getting Started tour text.
 2018-08-23 18:53:40 +02:00
Mads Rasmussen
ef6822e15b Merge pull request #2873 from kjac/media-picker-update 
Media picker: Minor style update + add help text.
 2018-08-23 09:29:05 +02:00
Lee Kelleher
06e99c3b33 Corrected the title of the "Edit" button 
umb-node-preview directive - corrected the title of the "Edit" button
 2018-08-22 09:13:43 +01:00
Mads Rasmussen
f7201a70bd add colored border 2018-08-21 21:20:38 +02:00
Mads Rasmussen
ec67ab83af Merge branch 'patch-1' of git://github.com/jannikanker/Umbraco-CMS into jannikanker-patch-1 2018-08-21 21:10:01 +02:00
Rasmus John Pedersen
a725ddae5a Only remove ? or # if it's part of the url 2018-08-21 17:10:46 +02:00
Jan Skovgaard
8f2c253138 Refactort the scope.nodeUrl to be updated whenever save is hit in the existing update watcher 2018-08-21 14:52:00 +02:00
Sebastiaan Janssen
e6597d47e3 Fixes U4-11574 - return an empty string if the datatype is in "single" mode and nothing is selected 2018-08-20 16:12:23 +02:00
Nathan Woulfe
89f69bd2a8 U4 4732 - fix regressions in 7.12 (#2862) 2018-08-20 16:10:36 +02:00
Sebastiaan Janssen
8087fc4c9a Merge pull request #2858 from umbraco/temp-U4-11579 
U4-11579 Take startNodeId into account before picking the current nod…
 2018-08-20 12:06:45 +02:00
Radu Orleanu
f665f8af89 fixing U4-11570 (#2860) 2018-08-17 14:04:35 +02:00
Kenn Jacobsen
de8a24c691 Add "info" style to upload button + add help text when the dropzone is hidden. 2018-08-17 12:22:54 +02:00
Sebastiaan Janssen
c4163e94c0 Merge pull request #2856 from dawoe/remove-deleted-scripts-from-solution 
Removed files from solution that are not longer present in repo
 2018-08-17 08:25:50 +02:00
Sebastiaan Janssen
62855d021f Merge pull request #2857 from umbraco/temp-U4-11581 
U4-11581 In rare cases the umbracoLanguage table has a constraint ins…
 2018-08-17 08:24:43 +02:00
Shannon
49430ca0a5 fixes logic order of dropping indexes 2018-08-17 16:07:53 +10:00
Shannon
9d75e36eb4 Ensures that checking for constraints/indexes is done within the transaction before dropping anything instead of before the transaction. 2018-08-17 15:20:12 +10:00
Shannon
5068b8ae9f Fixes DB schema validation 2018-08-17 11:16:10 +10:00
Shannon
cdf3581721 code simplification 2018-08-17 10:53:45 +10:00
Shannon
0c6cca44d8 Fixes SQL providers for returning the correct results for constraints 2018-08-17 10:53:21 +10:00
Sebastiaan Janssen
f18b0aa774 U4-11579 Take startNodeId into account before picking the current node to sync to 2018-08-16 13:53:42 +02:00
Sebastiaan Janssen
b9e8dd8b86 Removes unused import statement 2018-08-16 13:47:20 +02:00
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
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