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

8305 Commits

Author SHA1 Message Date
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
Shannon
3eb6cd9e21 Macros are now working inline in the rte with both the Classic and Distraction free modes 2019-02-01 13:50:39 +11:00
Shannon
e79e07af77 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 2019-02-01 13:50:10 +11:00
Shannon
7614ba42df Fixes the tag editor and tag suggestions 2019-02-01 13:32:17 +11:00
Shannon
0c4712de56 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 
# Conflicts:
#	src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
 2019-02-01 11:33:13 +11:00
Shannon
d8fbbeccfe Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-02-01 11:27:53 +11:00
Shannon
452badab41 Fixes tag editor for proper dirty tracking and model updating, the models weren't being updated correctly 2019-02-01 11:27:40 +11:00
Shannon
f74a49f5a3 Gets the macros being able to be updated, now to fix the Classic mode, since this now only works in distraction free mode 2019-02-01 10:18:53 +11:00
Bjarke Berg
4a480ab391 #4068 - Added interceptor to remove $ variables from post data 2019-01-31 15:10:19 +01:00
Bjarke Berg
6bf3b19d86 #4068 - Fix for ordering of grid 2019-01-31 15:09:57 +01:00
Niels Lyngsø
d45d0a816e V8: UI — changed colors for selection state for rows in list-view 2019-01-31 12:58:17 +01:00
Kenn Jacobsen
1a64c0a803 Fix disappearing media thumbnails 2019-01-31 11:45:08 +01:00
Warren Buckley
14b97b6abe Fix up JS as the API model had changed 2019-01-31 10:24:15 +00:00
Bjarke Berg
92d53eb527 #3648 - Besides mculture also retain cculture in querystring on navigation 2019-01-31 11:10:27 +01:00
Kenn Jacobsen
26e0c6cb79 Don't break for root relations + minimize number of XHR 2019-01-31 10:43:34 +01:00
Niels Lyngsø
b65e042b4c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 10:13:11 +01:00
Niels Lyngsø
b558023f9e V8: UI interact vs. select 2019-01-31 10:13:07 +01:00
Bjarke Berg
228480a2ef Merge remote-tracking branch 'origin/temp8' into v8/bugfix/temp8-fe-infinityediting-fixing-contentapps-after-edit-doctype 2019-01-31 09:50:30 +01:00
Bjarke Berg
9d9597dbc3 Merge remote-tracking branch 'origin/temp8' into v8/bugfix/temp8-fe-infinityediting-fixing-contentapps-after-edit-doctype 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
 2019-01-31 09:39:43 +01:00
Niels Lyngsø
01ecd49256 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 09:37:14 +01:00
Niels Lyngsø
2ab391eb69 V8: UI select colors 2019-01-31 09:37:04 +01:00
Sebastiaan Janssen
a1f72826c7 Remove duplicate css class 2019-01-31 08:39:59 +01:00
Bjarne Fyrstenborg
3ba32dafa5 Localize edit link, remove duplicate class attributes and only make remove link red 2019-01-31 08:34:54 +01:00
Bjarne Fyrstenborg
d55262b322 Revert "Localize edit link, remove duplicate class attributes and only make remove link red" 
This reverts commit 63cc250c0f929b1f7e6f9f05fae2fd302682d418.
 2019-01-31 08:34:54 +01:00
Bjarne Fyrstenborg
7b3623a9d9 Localize edit link, remove duplicate class attributes and only make remove link red 2019-01-31 08:34:54 +01:00
Shannon
9abd72f623 gets macro content loading on rte load 2019-01-31 17:12:44 +11:00