yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,498 Commits 4 Branches 7 Tags
6d6828eaaf8ae412e3d9bbf742542e810b0e931d
Commit Graph

27498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
6d6828eaaf Merge branch 'temp8-pr4102' into temp8 2019-01-22 15:04:32 +01:00
Stephan
fd0ee6bb11 Merge branch 'v8-fix-nested-content-only-elements' of https://github.com/kjac/Umbraco-CMS into temp8-pr4102 2019-01-22 14:30:38 +01:00
Stephan
9628d6f761 Merge branch 'temp8-pr4117' into temp8 2019-01-22 14:28:47 +01:00
Stephan
c1e81fe40c Merge branch 'v8-fix-remove-element-type-template-assignment' of https://github.com/kjac/Umbraco-CMS into temp8-pr4117 2019-01-22 14:22:36 +01:00
Stephan
e349ead8b5 Better error message 2019-01-22 13:08:47 +01:00
Bjarke Berg
4981f0e828 Merge pull request #2926 from umbraco/temp8-logviewer 
Merged V8 LogViewer
 2019-01-22 12:04:32 +01:00
Bjarke Berg
7b0acf9844 Merge pull request #4179 from umbraco/tem8-logviewer-review 
Temp8 logviewer review fixes
 2019-01-22 11:29:51 +01:00
Warren Buckley
626b9e8f7b Remove a TODO comment that was hanging around 2019-01-22 10:07:56 +00:00
Warren Buckley
62617537fa Change icon from scary bug to box-alt 2019-01-22 10:05:14 +00:00
Bjarke Berg
70315d4a5f Make as must of the log viewer internal as possible 2019-01-22 10:36:44 +01:00
Bjarke Berg
c8daf1d8db Merge branch 'temp8-logviewer' into tem8-logviewer-review 2019-01-22 10:20:26 +01:00
Bjarke Berg
70010bc344 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
 2019-01-22 10:19:43 +01:00
Bjarke Berg
025d0eae18 Logviewer code cleanup. 2019-01-22 10:14:07 +01:00
Stephan
c840895f90 Deal with more fixme 2019-01-22 09:49:35 +01:00
Stephan
a53a15f4d8 Merge branch 'temp8-remove-mysql' into temp8 2019-01-22 08:30:35 +01:00
Stephan
04a4e2d00e cleanup 2019-01-22 08:30:08 +01:00
Bjarke Berg
2c86e87917 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-22 08:23:07 +01:00
Stephan
0c07af9a41 Merge branch temp8 into temp8-remove-mysql 2019-01-22 08:15:24 +01:00
Stephan
53d767e978 Fix clearing property values #4119 2019-01-22 08:09:21 +01:00
Stephan
afd6236406 Merge pull request #4164 from umbraco/temp8-broken-view-fixes 
Fixes for broken views..
 2019-01-21 18:55:24 +01:00
Stephan
6fb41e364b Fix query builder 2019-01-21 18:50:27 +01:00
Stephan
76d2421f0c Restore some InternalsVisibleTo that we do need 2019-01-21 18:02:31 +01:00
Warren Buckley
6d0f505e2d Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2019-01-21 16:39:51 +00:00
Stephan
706b865a5f Merge branch 'temp8-3668-query-builder-snippits' into temp8 2019-01-21 17:38:39 +01:00
Stephan
9e811ddd50 Fix fallback 2019-01-21 17:38:06 +01:00
Warren Buckley
dda9c5183c Updates the composer/registration of JSONLogViewer - Can't use default parameters with DI hence needed to use factory & new up an instance 2019-01-21 16:36:47 +00:00
Warren Buckley
8ab5142357 Moves tree into Settings group as opposed to third party trees & positions last 2019-01-21 16:36:00 +00:00
Warren Buckley
3af859e020 Updates default log levels that we ship out of the box for V8 - It was a very chatty Verbose, now set to Info 2019-01-21 16:29:59 +00:00
Stephan
358a36dd87 Merge branch temp8 into temp8-3668-query-builder-snippits 2019-01-21 16:07:20 +01:00
Stephan
ee0c868687 Misc fixes for PR and Fallback 2019-01-21 16:02:16 +01:00
Stephan
9522ee826f Deal with fixme in Umbraco.Web 2019-01-21 16:01:37 +01:00
Stephan
4a0b969777 Deal with fixme in Umbraco.Core 2019-01-21 16:01:37 +01:00
Warren Buckley
9407c85d71 Remove TreesAndSection tests (must have been a funky merge gone wrong) 2019-01-21 12:40:19 +00:00
Niels Lyngsø
735c2ccfd7 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-21 13:30:55 +01:00
Niels Lyngsø
dd29deec6a V8 Gulp — only run imagemin in production mode. 2019-01-21 13:30:49 +01:00
Warren Buckley
1d39c177cc Adds in private method EnsureFileExists as it was removed from IOHelper 2019-01-21 11:48:55 +00:00
Warren Buckley
f6154a38d9 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 
# Conflicts:
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Web.UI.Client/gulpfile.js
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
 2019-01-21 11:17:14 +00:00
Bjarke Berg
a32c8b3a68 Merge pull request #4167 from umbraco/temp8-3417-macro-crud 
Macro delete stuff
 2019-01-21 11:36:10 +01:00
Niels Lyngsø
82d6af2013 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 
# Conflicts:
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
 2019-01-21 11:13:08 +01:00
Bjarke Berg
57902892f9 Constructor injection 2019-01-21 10:55:48 +01:00
Stephan
d4664fbae6 Merge branch 'temp8' into temp8-3668-query-builder-snippits 2019-01-21 10:50:40 +01:00
Bjarke Berg
252d31a5f5 Delete macros 2019-01-21 10:44:11 +01:00
Bjarke Berg
269273f294 Merge pull request #4165 from umbraco/temp8-3417-macro-crud 
Macro CRUD angularized
 2019-01-21 09:55:26 +01:00
Matthew-Wise
2744afab00 Disable LastPass on page heading (#4153) 2019-01-21 09:49:00 +01:00
Bjarke Berg
566895d3cd Merge branch 'temp8' into temp8-3417-macro-crud 2019-01-21 09:14:40 +01:00
Bjarke Berg
3fd8c63542 - Show Ids 
- Hide "Render in rich text editor and the grid" if "Use in rich text editor and the grid" is false
 2019-01-21 09:10:39 +01:00
Bjarke Berg
d5c6e0c6e7 - Saving paramters 2019-01-21 09:10:08 +01:00
Bjarke Berg
ec57f35374 Named arguments cannot precede positional 2019-01-21 08:03:12 +01:00
Bjarke Berg
333c143005 GetPropertyValue change to Value 2019-01-21 07:59:05 +01:00
Bjarke Berg
46f7c76c0b Fixes for broken view.. 
- Create new UmbracoHelper (Missing parameter)
- string.replace can't handle string and IHtmlString
 2019-01-21 07:54:35 +01:00