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

7998 Commits

Author SHA1 Message Date
Stephan
c840895f90 Deal with more fixme 2019-01-22 09:49:35 +01:00
Stephan
0c07af9a41 Merge branch temp8 into temp8-remove-mysql 2019-01-22 08:15:24 +01:00
Stephan
6fb41e364b Fix query builder 2019-01-21 18:50:27 +01:00
Stephan
358a36dd87 Merge branch temp8 into temp8-3668-query-builder-snippits 2019-01-21 16:07:20 +01: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
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
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
Bjarne Fyrstenborg
a502be606b v8: Fix package localization (#4159) 2019-01-20 21:27:32 +01:00
Sebastiaan Janssen
0b19c07756 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	.github/README.md
#	src/Umbraco.Core/Constants-PropertyEditors.cs
#	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
#	src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
 2019-01-20 21:23:51 +01:00
Bjarne Fyrstenborg
d6855d18f9 v8: Nicer delete language confirm (#4108) 2019-01-20 21:19:06 +01:00
Rasmus John Pedersen
e1c9b1818e Add Multi Url Picker to core (#2323) 2019-01-20 21:12:00 +01:00
Matthew Wise
ba85681f8c updated css file location 2019-01-20 21:07:58 +01:00
Kenn Jacobsen
2c1ba1d23d Make sure the style preview text does not overlap for large font sizes 2019-01-20 21:01:32 +01:00
Bjarne Fyrstenborg
07329103b1 v8: Fix doctype iconpicker (#4053) 2019-01-20 20:56:49 +01:00
Dave Woestenborghs
7729dc946e Fix 4058 : restore from recycle bin when item has multiple relations (#4073) 2019-01-20 20:47:13 +01:00
Callum Whyte
da58673b44 Removing unused insertMasterpage dialog language dictionary keys 2019-01-20 20:44:57 +01:00
Kenn Jacobsen
abbd45c476 Remove hardcoded "Root" when restoring to tree root 2019-01-20 20:34:36 +01:00
Sebastiaan Janssen
c56e84af2d Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
 2019-01-20 20:28:52 +01:00
Sebastiaan Janssen
9e7eb2ad75 Remove MySQL support 2019-01-18 15:47:22 +01:00
Stephan
3982732b7d Fix merge + cleanup 2019-01-18 15:05:20 +01:00
Dave Woestenborghs
2dc9eb3a90 #3417 handle saving of general macro data 2019-01-18 15:02:18 +01:00
Kenn Jacobsen
5b285f71fa Remove hardcoded "Root" when restoring to tree root 2019-01-18 14:39:54 +01:00
Bjarke Berg
6fce8810fc Merge remote-tracking branch 'origin/temp8' into temp8-4037 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs
 2019-01-18 13:28:57 +01:00
Stephan
6f9a63d035 Merge branch 'temp8' into temp8-packaging-view-3996 2019-01-18 11:04:28 +01:00
Niels Lyngsø
6dd4d7f475 V8 FE Gulp Fastdev script 2019-01-18 10:12:24 +01:00
Dave Woestenborghs
a83ac4a24d #3417 retreive data for edit screen 2019-01-18 09:31:38 +01:00
Bjarke Berg
59fe603ef7 Merge remote-tracking branch 'origin/temp8' into temp8-3668-query-builder-snippits 
# Conflicts:
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2019-01-18 08:34:14 +01:00
Bjarke Berg
7a74a329ab Merge remote-tracking branch 'origin/bugfix/temp8-media-could-not-be-moved-to-root' into bugfix/temp8-media-could-not-be-moved-to-root 2019-01-18 08:32:21 +01:00
Bjarke Berg
0daca21b51 Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root 2019-01-18 08:31:54 +01:00
Niels Lyngsø
89a2c1b32d Fix merge of pull request #4120 2019-01-17 17:02:12 +01:00
Warren Buckley
e1f1336205 Merge branch 'temp8' into temp8-gulp-refactoring 
# Conflicts:
#	src/Umbraco.Web.UI.Client/gulpfile.js
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-01-17 15:46:53 +00:00
Niels Lyngsø
b9812ca5c4 Added processJs 2019-01-17 16:37:33 +01:00
Niels Lyngsø
9d2c4d7b08 Stick to the same approach on as used on media move dialog 2019-01-17 15:57:43 +01:00
Callum Whyte
e60417925b Consistency is king! Fix up " vs ' in installer service facts array 2019-01-17 15:41:44 +01:00
Callum Whyte
5a78c000a0 Correcting punctuation in installer screen facts 2019-01-17 15:41:44 +01:00
Callum Whyte
54faeee837 Updating number of active Umbraco sites in installer screen facts 2019-01-17 15:41:44 +01:00
Kenn Jacobsen
b6f6a4015a Style the content links in the info app 2019-01-17 15:33:17 +01:00
Kenn Jacobsen
adc9957504 Show the media link in the info app 2019-01-17 15:32:04 +01:00
Bjarne Fyrstenborg
74a7fd50dd v8: Fix validation error label (#4094) 2019-01-17 15:25:07 +01:00
Kenn Jacobsen
2ac175135a Fix linkpicker overlay issues - manual merge of #3718 to V8 2019-01-17 15:18:49 +01:00
Kenn Jacobsen
367fceb3cb Handle selection from treepicker search result 2019-01-17 15:15:26 +01:00
Kenn Jacobsen
2f408e1a01 Style the dialog search results 2019-01-17 15:14:17 +01:00
Kenn Jacobsen
8b178d1be7 Allow linkpicker to select items from search/list view 2019-01-17 15:13:41 +01:00