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

8280 Commits

Author SHA1 Message Date
Robert
a9b7c649ae Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-07 15:44:42 +01:00
Robert
1095948c27 Sets prop's prefixed with "$" to undefined. 2019-02-07 15:44:17 +01:00
Warren Buckley
7bd0a8edc2 Merge pull request #4429 from umbraco/temp8-4398 
#4398 - Added validation to the grid editor, such that columns must b…
 2019-02-07 14:38:59 +00:00
Warren Buckley
2c0fc737a7 Merge pull request #4421 from umbraco/temp8-4405-reload-history-on-rollback 
#4405 - Load history on init if the active tab is info
 2019-02-07 13:29:52 +00:00
Bjarke Berg
f6da7e4444 JS error, handle user dialog in the same way as help dialog. Don't close on change of section. Before was a js error with missing method 2019-02-07 08:19:44 +01:00
Shannon
1703c918d9 test pass now 2019-02-07 17:06:50 +11:00
Shannon
d76f7db700 fixes the runTest build so that it properly builds the babel js and fixes one of the tests 2019-02-07 16:59:25 +11:00
Shannon
261ddfbcd6 Gets unit tests running again and added a task runTests 2019-02-07 16:22:29 +11:00
Shannon
86b31c2782 fixes test.js to point to the correct karma config 2019-02-07 15:41:20 +11:00
Warren Buckley
4c79269081 Merge pull request #4422 from umbraco/temp8-ui-refactoring-infinity-editing-to-css-animation 
V8: UI refactoring infinity editing to css animation
 2019-02-05 15:49:49 +00:00
Warren Buckley
a1a3267c0b Merge pull request #4366 from kjac/v8-fix-icon-picker-color-selection 
V8: Doctype icon color picker selection is broken
 2019-02-05 15:15:23 +00:00
Bjarke Berg
6f9be482be #4398 - Added validation to the grid editor, such that columns must be at least as large as the layouts. 2019-02-05 14:52:02 +01:00
Bjarke Berg
4290249719 #4405 - Load history on init if the active tab is info 2019-02-05 11:55:10 +01:00
Niels Lyngsø
ff497b413e V8: UI, refactoring of infinity editing to use CSS to fix issue regarding stacking of layers. 2019-02-05 11:54:23 +01:00
Robert
ea95b4f454 Merge pull request #4345 from kjac/v8-fix-relation-types-editor 
V8: Relation type editor crashes for root relations and is using excessive XHR
 2019-02-05 10:35:25 +01:00
Robert
bec61a00c9 Merge pull request #4336 from kjac/v8-fix-disappearing-thumbnails 
V8: Fix disappearing thumbnails in the media grid
 2019-02-05 10:05:14 +01:00
Robert
4054e0ab72 Merge pull request #4357 from kjac/v8-fix-media-picker-upload-button 
V8: Media picker upload button does nothing
 2019-02-05 09:54:01 +01:00
Stephan
f07a2715b4 Add assembly-level composer attributes 2019-02-05 08:37:48 +01:00
Warren Buckley
cd566a6397 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-04 17:21:16 +00:00
Warren Buckley
0061f997e9 Fix up logviewer - search error/mesage drodpwon button to search on Goggle, GitHub, Our.Umb etc 2019-02-04 17:12:41 +00:00
Sebastiaan Janssen
d3eb48cef9 Fixes #4388 File uploads no longer has dragover styles 2019-02-04 13:29:02 +01:00
Bjarke Berg
825b07b823 Merge pull request #4332 from umbraco/temp8-macros-dont-render-and-other-macro-bugs 
v8 Macros don't render in the RTE and various
 2019-02-04 13:23:46 +01:00
Niels Lyngsø
b13be6840b Merge pull request #3485 from dawoe/temp-3434 
V8 - #3434 - change checkboxes on property type settings to toggle
 2019-02-04 10:19:25 +01:00
Niels Lyngsø
93dbbd6bbe Merge pull request #4384 from kjac/v8-fix-actions-menu 
V8: Fix the editor actions menu
 2019-02-04 08:37:10 +01:00
Niels Lyngsø
72f6b2fd11 removing comments from temp8-4257-refactoring-of-infinite-editor-layers 2019-02-04 08:12:27 +01:00
Shannon
30452f0b17 Fixes rte toolbar pinning in the grid 2019-02-04 14:00:01 +11:00
Shannon
c5819ca702 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
 2019-02-04 12:42:07 +11:00
Shannon
9be6acf449 Oops forgot to remove the IconClosed and IconOpen TreeAttribute props 2019-02-04 12:09:04 +11:00
Kenn Jacobsen
6141d88407 Don't set the menu state until the action is about to be carried out. 2019-02-03 17:05:27 +01:00
Kenn Jacobsen
4b69a7859d Make sure the app menu state is set 2019-02-03 13:56:00 +01:00
Kenn Jacobsen
6874a5486b Fix selected color 2019-02-01 20:28:27 +01:00
Kenn Jacobsen
90a282c083 Fix the icon color picker 2019-02-01 20:09:54 +01:00
Stephan
3a0f80fc7e Merge branch 'temp8' into temp8-oembed-collection 2019-02-01 17:44:53 +01:00
Warren Buckley
0a9bc82551 Merge pull request #4347 from umbraco/temp8-4068-grid-fixes 
Grid fixes
 2019-02-01 14:13:23 +00:00
Niels Lyngsø
d4b2ac3f1e V8: UI — changed color for focus point on medias 2019-02-01 14:54:49 +01:00
Warren Buckley
fec046347b Merge pull request #4352 from umbraco/temp8-4257-refactoring-of-infinite-editor-layers 
Temp8 4257 refactoring of infinite editor layers
 2019-02-01 12:43:31 +00:00
Niels Lyngsø
7261432461 V8: UI — changed look of media-picker upload button 2019-02-01 13:23:09 +01:00
Niels Lyngsø
b645cc8e54 Merge pull request #4355 from umbraco/temp8-4354-publish-fix 
Fix for javascript's strict equality
 2019-02-01 13:21:40 +01:00
Kenn Jacobsen
712a260159 Fix wrong class name in media picker element selector 2019-02-01 13:01:42 +01:00
Niels Lyngsø
0c34de4524 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 12:38:59 +01:00
Niels Lyngsø
f5d904c88c V8: add spacing around tabs 2019-02-01 12:38:12 +01:00
Bjarke Berg
ab5c33e340 #4354 - Fix for stupid javascript's strict equality 2019-02-01 12:34:56 +01:00
Warren Buckley
a6d0449671 Merge pull request #4335 from umbraco/temp8-3648-retain-cculture-in-urls 
#3648 - Besides mculture also retain cculture in querystring on navig…
 2019-02-01 10:40:17 +00:00
Warren Buckley
d1edc45d4d Merge pull request #4304 from umbraco/temp8-3645-change-culture-in-preview 
Allow changing culture in the preview bar
 2019-02-01 10:27:37 +00:00
Niels Lyngsø
0bb69aeeee V8: preview colors changed for brandcolors 2019 2019-02-01 11:10:20 +01:00
Niels Lyngsø
979f7b404c V8: refactoring of layers add and removal methods 2019-02-01 10:51:14 +01:00
Niels Lyngsø
4ab42e0dc7 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 10:49:22 +01:00
Niels Lyngsø
fc6e17f3f9 V8: UI — umb-content-grid color change 2019-02-01 10:49:09 +01:00
Bjarke Berg
045020e739 #4068 - Changed save event triggered when save dialog is opened. save is still broadcasted on the actual save. 
Changed the grid event listener to only execute on `save` events
 2019-02-01 08:37:06 +01:00
Shannon
d7d82ea98d Allows grid rte to be distraction-free, the parameter was not being passed but it can be configured 2019-02-01 14:02:45 +11:00