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

7953 Commits

Author SHA1 Message Date
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
3982732b7d Fix merge + cleanup 2019-01-18 15:05:20 +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
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
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
Kenn Jacobsen
aca14c14ca Add some comments 2019-01-17 15:12:20 +01:00
Kenn Jacobsen
56c4dbf77f Ensure that the link picker tree always loads 2019-01-17 15:12:20 +01:00
Niels Lyngsø
591d100726 Corrected paths 2019-01-17 15:07:18 +01:00
Kenn Jacobsen
bf9284089d Update a comment 2019-01-17 15:03:05 +01:00
Kenn Jacobsen
651006fbaf Make sure to update cculture to the last open culture when closing the split view 2019-01-17 15:03:05 +01:00
Sebastiaan Janssen
87a3350cd6 Merge pull request #4074 from kjac/v8-fix-select-content-app-for-split-view 
V8: Force select the content app for both views when opening split view
 2019-01-17 14:59:51 +01:00
Niels Lyngsø
d744d6aabe Gulp factoring 
- Moved tasks into separate files
- Moved all configuration into gulp/config.js
 2019-01-17 13:57:59 +01:00
Chris Houston
941ede776b Corrected all the miss spellings of: 
Seperator -> Separator
Seperate -> Separate
 2019-01-17 13:16:43 +01:00
Kenn Jacobsen
57b8a187b8 Add "Move" option for deleted items in the media tree 2019-01-17 12:27:42 +01:00
Kenn Jacobsen
77cf071e04 Add "Move" option for deleted items in the media tree (#3914) 2019-01-17 12:20:13 +01:00
Robert
4ff714ae94 Merge remote-tracking branch 'origin/temp8' into temp8-4037 2019-01-17 08:10:02 +01:00
Shannon
899bb812aa Creates RuntimeStateOptions and pre-loads the error page on the installer 2019-01-17 01:42:56 +11:00
Shannon
ddcead2658 Updates EntityController to support stylesheets, languages and dictionary items GetAll so we can use it for the packager without worrying about security access to sections 2019-01-17 00:29:43 +11:00
Shannon
7bb3588889 Adds the whole package definition to the scope model for devs to use, adds a custom query string parameter when redirecting to the angular view after install (so devs know its a new install) 2019-01-16 23:53:10 +11:00
Shannon
c4418185ec Gets the angular view loading and allows navigating back to the view, cleans up non used lang keys 2019-01-16 21:27:14 +11:00
Shannon
572c6989ce Changes control to view for the package view 2019-01-16 19:30:07 +11:00
Shannon
31545db91e Fixes routing with the packages section 2019-01-16 19:29:42 +11:00
Shannon
94da9a6681 Gets package upgrading working along with package uninstallation with multiple versions 2019-01-16 17:25:46 +11:00
Shannon
90be93d948 Got upgrade status showing in the ui, started implementing merging the package definitions for upgrades but have decided to have an element for each install like we currenlty have in case there are problems installing. 2019-01-16 16:27:51 +11:00
Shannon
b34582b35c Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
 2019-01-16 02:00:44 +11:00
Shannon
b7c15dc393 gets readme and our package install working 2019-01-16 01:53:08 +11:00
Robert
561ce94398 Merge pull request #3933 from umbraco/temo8-3895-infinite-editor-shortcut 
Close an infinite editor through Escape key
 2019-01-15 15:43:43 +01:00
Robert
f9cd22d908 Added a comment explaining why we need the delay 2019-01-15 15:43:10 +01:00
Bjarke Berg
0b9705ca3f Revert "Revert "Support IContentType.IsElement"" 
This reverts commit a5efc25c
 2019-01-15 15:13:10 +01:00
Shannon
db2a003444 change how the install status works, fixes infinite loop 2019-01-16 00:54:25 +11:00
Shannon
f6fdc9ae2d Updates test, fixes some other issues during testing 2019-01-15 23:46:58 +11:00
Shannon
430c95dfad Merge remote-tracking branch 'origin/temp8' into temp8-packages-ui 2019-01-15 22:59:49 +11:00
Shannon
a5ff29ccc7 Gets package uninstall working, fixes other UI issues with packages 2019-01-15 22:59:13 +11:00
Bjarke Berg
a5efc25c81 Revert "Support IContentType.IsElement" 
This reverts commit ba38b67b
 2019-01-15 12:23:14 +01:00
Bjarke Berg
5b1ca92184 Fixes for tag validation and build 2019-01-15 12:12:35 +01:00
Bjarke Berg
bdeee95300 Merge remote-tracking branch 'origin/temp8-40120tags-validation-bug' into temp8-40120tags-validation-bug 2019-01-15 12:09:41 +01:00