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

27313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Abi Noda
76bece07ef add pull reminders badge to readme 2019-01-20 21:10:02 +01:00
Matthew Wise
ba85681f8c updated css file location 2019-01-20 21:07:58 +01:00
Kenn Jacobsen
09cc3f89ed Make sure the decimal field value converter can handle double values when converting 2019-01-20 21:05:20 +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
Callum Whyte
f8b382ea0a Eliminating bower (#4146) 2019-01-20 20:43:47 +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
Stephan
ed97dbc1a0 Merge branch 'temp8-appCaches' into temp8 2019-01-18 15:51:39 +01:00
Stephan
1506d8c3fa Kill AppCaches.StaticCache 2019-01-18 15:49:54 +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
Stephan
876056f0bb Merge branch temp8 into temp8-appCaches 2019-01-18 14:54:08 +01:00
Kenn Jacobsen
5b285f71fa Remove hardcoded "Root" when restoring to tree root 2019-01-18 14:39:54 +01:00
Stephan
cdf38af171 Bugfix the installer 2019-01-18 14:39:39 +01:00
Bjarke Berg
e637854149 Merge pull request #4057 from umbraco/temp8-4037 
Manual tested, all tests are green, and code changes at fine :) Merged
 2019-01-18 13:49:16 +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
Niels Lyngsø
4fbeac48eb Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2019-01-18 13:17:12 +01:00
Niels Lyngsø
8f64d8d70c correction of editorconfig for *.js and *.less 2019-01-18 13:16:59 +01:00
Stephan
01e70648ba Merge branch 'temp8-packaging-view-3996' into temp8 2019-01-18 13:04:04 +01:00
Dave Woestenborghs
7fd7d7a582 #3417 also send id of parameter with api response 2019-01-18 12:37:04 +01:00
Stephan
6f9a63d035 Merge branch 'temp8' into temp8-packaging-view-3996 2019-01-18 11:04:28 +01:00
Stephan
07238b54e1 Merge branch 'temp8-tree-sections-no-more-xml' into temp8 2019-01-18 10:59:04 +01:00
Stephan
437385fd61 Bit of cleanup 2019-01-18 10:53:51 +01:00
Callum Whyte
cee1171d39 Removing masterpages support from V8 (#3971) 2019-01-18 10:53:38 +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
Stephan
a7a3fca8a8 Merge branch 'temp8' into temp8-tree-sections-no-more-xml 2019-01-18 09:23:55 +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
Stephan
ec58532f7b More renaming of caches 2019-01-18 08:29:16 +01:00
Stephan
f952fe7aeb More renaming of caches 2019-01-18 08:14:08 +01:00
Stephan
5aba1a6bd2 IAppPolicedCache is IAppPolicyCache 2019-01-18 07:56:38 +01:00
Mikkel Holck Madsen
6e3618f627 Merge pull request #4129 from umbraco/temp8-gridcellvalueconnector 
Redecided on renaming
 2019-01-17 21:38:21 +01:00
Kenneth Jakobsen
9fed610902 Redecided on renaming 2019-01-17 21:32:08 +01:00