yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,846 Commits 4 Branches 7 Tags
646bfb02f2ceac5dc82652e9cd68c8b969e47bca
Commit Graph

30846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarne Fyrstenborg
646bfb02f2 Check if value is null or whitespace before reading grid configuration 2019-10-08 18:55:44 +02:00
Bjarke Berg
e7196d5edf Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
 2019-10-08 11:56:43 +02:00
Bjarke Berg
bbb1328f2c Merge branch 'v8/8.2-rc' into v8/8.2 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2019-10-08 11:41:14 +02:00
Bjarke Berg
70d162efb3 Merge remote-tracking branch 'origin/v8/8.2-rc' into v8/8.2-rc 2019-10-08 11:18:11 +02:00
Bjarke Berg
9d5f7a8a96 Removed rc from version 2019-10-08 11:17:54 +02:00
Bjarke Berg
570764d03c Merge pull request #6493 from umbraco/v8/bugfix/GridPropertyEditor-NullReference 
Fixes null reference caused in GridPropertyValueEditor when the value is empty
 2019-10-08 10:06:26 +02:00
Bjarke Berg
3e79f43ebe Merge remote-tracking branch 'origin/v8/8.2' into v8/bugfix/GridPropertyEditor-NullReference 2019-10-08 09:02:47 +02:00
Claus
1bc0c8bca2 Merge pull request #6556 from umbraco/v8/bugfix/AB2996-Fix-MediaFolderPickerPreValueEditor 
Only allow one media folder to be picked for RTE paste/drag image upload location
 2019-10-07 16:07:25 +02:00
Bjarke Berg
ccd4392c2a Merge pull request #6568 from umbraco/v8/bugfix/AB2997-RTE-img-button-throws-tempimg-correct-base 
Allow pasted & dragged images that are not yet saved to allow ALT text to be edited
 2019-10-07 15:00:36 +02:00
Bjarke Berg
1ad3103d94 https://github.com/umbraco/Umbraco-CMS/issues/6516 - Revert uncommenting stuff, without knowing why the code was their. 2019-10-07 13:21:31 +02:00
Søren Kottal
0e4727f5df Adds missing danish language keys, and changes a few others 2019-10-06 12:58:22 +02:00
Bjarke Berg
a87b72cd05 Merge pull request #6554 from umbraco/v8/bugfix/grid-editor-media-refs 
Fixes the media refs within the RTE in the Grid
 2019-10-03 10:40:38 +02:00
Shannon
03a4affbde Fixes order of parsing RTEs 2019-10-03 10:12:41 +02:00
Niels Lyngsø
05ff51575b Wait for image to load, for measuring size. Removed the 500ms timeout that was prone to error if image was'nt loaded within time. 2019-10-03 10:08:07 +02:00
Warren Buckley
76dd7a667a Remove console.logs 2019-10-03 10:08:07 +02:00
Warren Buckley
0e16d9cd33 WIP: Try and support images in the RTE that are pasted/dragged in and are NOT in media yet to be able to update the ALT text 2019-10-03 10:08:07 +02:00
Rachel Breeze
09df60455c Added missing syntax to controller 2019-10-03 01:16:52 +02:00
Warren Buckley
033780cb90 We only want to allow you to pick one folder in the media library for this prevalue editor 2019-10-02 13:50:00 +01:00
Shannon
6d9af75fbe Fixes the media refs within the RTE in the Grid 2019-10-02 13:49:50 +02:00
Niels Lyngsø
5669528253 fixing icon issue in PreValueEditor 2019-10-02 12:06:21 +02:00
Niels Lyngsø
72952db3b2 fixing toolbar issues when sticky and RTE width in grid. 2019-10-02 12:05:26 +02:00
Shannon
4918fa0868 added timeout 2019-10-02 12:05:11 +02:00
Shannon
b4c6930c11 Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2019-10-02 10:47:09 +02:00
Shannon
d0a1f96990 Merge branch 'v8/8.2-rc' into v8/8.2 2019-10-02 10:46:17 +02:00
Shannon
aed32afd0f Revert copy-paste property editors, will move to a diff branch 2019-10-02 10:41:00 +02:00
Rasmus John Pedersen
f65140854d Too much scope 2019-10-02 08:48:37 +02:00
Rasmus Kongshøj
7e0abeb6e5 Added missing class 2019-10-01 20:25:26 +02:00
Rasmus John Pedersen
41126c2c73 Allow editing name and saving on on list views 2019-10-01 20:09:21 +02:00
Anders Bjerner
9378316ed3 Marking the umb-overlay directive as deprecated 2019-10-01 19:52:19 +02:00
jmayntzhusen
85cc7d82d0 Update styles of API docs to match new identity (#6517) 2019-10-01 19:49:40 +02:00
Dennis Aaen
a025871b8c Added new translation for issue #6484 (#6515) 2019-10-01 19:42:17 +02:00
Shannon Deminick
392fd321e5 Merge pull request #6333 from umbraco/v8/bugfix/6127-soft-redirect-nav-fix 
Fixes V8: Can't navigate to another node when the editor is in "create" state #6127
 2019-10-01 18:39:28 +02:00
Shannon
76410632b6 Changes how soft redirecting works 2019-10-01 18:30:09 +02:00
Shannon
62ee1899ad Fixes Return 503 status code when in upgrade mode #6334 2019-10-01 18:26:36 +02:00
Kenn Jacobsen
29383f37e7 V8: Lazy load thumbnails in the media grid (#6510) 2019-10-01 18:21:46 +02:00
Shannon Deminick
293d50f400 Merge pull request #6051 from MicroTekAppDev/temp8-5484 
Fix for #5484 - V8 : Back office freeze when opening multiple content nodes
 2019-10-01 18:16:04 +02:00
Warren Buckley
e9b0d32401 Merge pull request #6497 from umbraco/v8/bugfix/0000-TinyMCE-CSS-corrections-for-grid 
fixing toolbar issues when sticky and RTE width in grid.
 2019-10-01 13:35:38 +01:00
Warren Buckley
4f5205615e Merge pull request #6498 from umbraco/v8/bugfix/0000-TinyMCE-CSS-icon-issue 
V8/bugfix/0000 tiny mce css icon issue
 2019-10-01 13:14:38 +01:00
Niels Lyngsø
c2b6e49ad3 fixing icon issue in PreValueEditor 2019-10-01 13:35:27 +02:00
Warren Buckley
ad2f3feb22 Merge pull request #6496 from umbraco/v8/bugfix/0000-TinyMCE-init-fix 
Fix initialization problem with TinyMCE 4
 2019-10-01 11:19:32 +01:00
Niels Lyngsø
6cfe689a69 fixing toolbar issues when sticky and RTE width in grid. 2019-10-01 12:17:23 +02:00
Carole Rennie Logan
77dc014b58 More inclusive language 2019-10-01 12:08:56 +02:00
Shannon
3a1078824d Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2019-10-01 12:02:29 +02:00
Shannon
3422f1c3cf Merge branch 'PerplexDaniel-6179+6180-read-write-segmented-property-values' into v8/dev 2019-10-01 12:01:57 +02:00
Niels Lyngsø
742bce039d added timeout 2019-10-01 10:25:50 +02:00
Bjarne Fyrstenborg
038e650e0f Adjust log viewer search layout (#6491) 2019-10-01 09:57:08 +02:00
Shannon
d677ea618c Fixes null reference caused in GridPropertyValueEditor when the value is empty 2019-10-01 09:48:46 +02:00
Shannon
d97101a14b Updates tests to rename assertion method parameters including code comments 2019-10-01 09:37:43 +02:00
Anders Bjerner
279efb0e85 Added missing translations for Danish 2019-09-30 23:34:44 +02:00
Anders Bjerner
968acb183f Added punctuation (#6489) 2019-09-30 23:32:56 +02:00