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

24422 Commits

Author SHA1 Message Date
Kenn Jacobsen
712a260159 Fix wrong class name in media picker element selector 2019-02-01 13:01:42 +01:00
Bjarke Berg
bfc2d53fa4 Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent 
# Conflicts:
#	src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
 2019-02-01 12:52:20 +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
Warren Buckley
3fac16eda8 Fix count bug - so it works with two languages 2019-02-01 09:58:10 +00: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
Stephan
a6d04aa5bb Merge branch 'temp8' into temp8-3640 2019-02-01 10:47:34 +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
c0ab9d9e59 Merge branch 'temp8' into temp8-member-search-and-tags 
# Conflicts:
#	src/Umbraco.Web/Editors/MemberController.cs
 2019-02-01 16:43:03 +11:00
Shannon
bb64141207 removes obsolete method 2019-02-01 16:35:10 +11:00
Shannon
ad5b166f3f Fixes tests, simplifies constructors 2019-02-01 15:44:32 +11:00
Shannon
036ca7f1e5 fixing tests 2019-02-01 15:30:38 +11:00
Shannon
c2ff32aaab Fixing tests, don't expose UmbracoContext on UmbracoHelper, fixing all of the editor constructors 2019-02-01 15:24:07 +11:00
Shannon
493ee63cb9 Merge branch 'temp8' into temp8-macros-dont-render-and-other-macro-bugs 2019-02-01 14:57:13 +11:00
Shannon
e540902ee1 Merge branch 'v8-fix-copy-media-types' of https://github.com/kjac/Umbraco-CMS into kjac-v8-fix-copy-media-types 2019-02-01 14:51:42 +11: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
dae8dfdc59 fix merge 2019-02-01 11:34:28 +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
Kenn Jacobsen
eeaf8d594d Make NC resilient towards culture variance in elements 2019-01-31 19:43:57 +01: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
Stephan
3199aa6693 Support culture in content Saving and Publishing events 2019-01-31 15:06:24 +01:00
Warren Buckley
14c43d76c1 Adds OEmbedProviders to the composition extension to make it easier to add/append the collection 2019-01-31 13:37:47 +00:00
Warren Buckley
bc7748aed6 Adds in XML docs summary - still need assitance with a few keys so put in some TODOs 2019-01-31 12:37:54 +00:00
Warren Buckley
3f8f1a215e Merge remote-tracking branch 'origin/temp8' into temp8-appsetting-conventions-constants 2019-01-31 12:06:29 +00:00
Warren Buckley
69f7a1b7b9 Finish up remaining AppSetting keys as Constants 2019-01-31 12:05:56 +00:00
Niels Lyngsø
d59bddfe9a Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 12:58:21 +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
Warren Buckley
34be548aec Start work on adding AppSettings keys into a constants class & use new prefix of Umbraco.Core. 2019-01-31 10:56:09 +00: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
Warren Buckley
8d55340325 Fix up youtube URL regex matching 2019-01-31 10:23:54 +00:00
Bjarke Berg
92d53eb527 #3648 - Besides mculture also retain cculture in querystring on navigation 2019-01-31 11:10:27 +01:00
Stephan
a6f9598a23 Introduce IPublishedRouter 2019-01-31 11:07:45 +01:00
Kenn Jacobsen
26e0c6cb79 Don't break for root relations + minimize number of XHR 2019-01-31 10:43:34 +01:00
Warren Buckley
ad9c4ec9a5 Merge remote-tracking branch 'origin/temp8' into temp8-oembed-collection 2019-01-31 09:34:10 +00:00
Warren Buckley
a36b1962c6 Last of providers moved across & the old config file gone 2019-01-31 09:32:50 +00:00
Niels Lyngsø
b65e042b4c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-31 10:13:11 +01:00