Commit Graph

23812 Commits

Author SHA1 Message Date
Sebastiaan Janssen
39b2e6543c Merge pull request #2757 from Mundairson/temp8-U4-11492
U4-11492 Clean Umbraco.Web.UmbracoHelper [v8]
2018-07-11 15:14:27 +02:00
Mundairson
85c9e66cee Implemented changes from first PR code review. 2018-07-11 00:12:18 +01:00
Stephan
2607e5b5a1 ContentVariation is not a Flag enum 2018-07-10 11:01:52 +02:00
Stephan
9ca298543f Merge branch 'hackathon-automapper-update' of https://github.com/mzajkowski/Umbraco-CMS into temp8-2747 2018-07-10 09:37:54 +02:00
Stephan
ad633c7606 Merge branch 'temp8-2758' into temp8 2018-07-10 09:36:28 +02:00
Stephan
47cfe9c6c0 Merge branch 'temp8' into temp8-2758 2018-07-10 09:34:25 +02:00
Shannon
37871f4de5 updated package-lock 2018-07-10 13:19:13 +10:00
Shannon Deminick
7132ccdd99 Merge pull request #2760 from umbraco/temp8-variants
Variants Refactoring [v8]
2018-07-10 13:05:13 +10:00
Shannon
7250b3d491 Fixes null checks on all parts of VariationContextAccessor.VariationContext.Culture and fixes translations with tokens for url collisions 2018-07-10 12:43:07 +10:00
Stephan
02de09eaf7 Explain last merge 2018-07-09 18:26:15 +02:00
Stephan
7c43fbd0c6 Merge pull request #2761 from mzajkowski/hackathon-publishing
Removed bulk publishing action from the content tree (temp) [v8hackaton]
2018-07-09 18:24:43 +02:00
Stephan
6f139cd72a Misc cleanup of PR 2018-07-09 18:08:03 +02:00
Stephan
97d4d48c4d Merge branch 'v8hack-delete-obselete' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp8-2758 2018-07-09 17:35:41 +02:00
Stephan
e644b63ba6 Misc cleanup of PR 2018-07-09 17:29:50 +02:00
Stephan
52be2d7864 Merge branch 'v8hackathon-library-media-remove' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp-2748 2018-07-09 16:34:44 +02:00
Stephan
1f37fb2c67 Merge branch 'v8hackathon-library-delete' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp8-2746 2018-07-09 13:02:25 +02:00
Stephan
00bcef3ba6 Misc cleanup of PR 2018-07-09 12:40:57 +02:00
Stephan
f4983a2b21 Merge branch 'hackathon-remove-imediaserviceoperation' of https://github.com/AndyFelton/Umbraco-CMS into temp8-mediaserviceops 2018-07-09 11:49:56 +02:00
Warren Buckley
2bae3e2eda Merge pull request #2759 from umbraco/temp8-82
fixes: Infinite editing support for content picker
2018-07-06 14:43:07 +01:00
Mads Rasmussen
3caafc03f1 Merge branch 'temp8' into temp8-82
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
2018-07-06 15:41:08 +02:00
Stephan
6bcf1e4cd8 Merge branch temp8 into temp8-variants 2018-07-06 12:29:18 +02:00
Stephan
ef28f23c61 Renormalize 2018-07-06 12:27:39 +02:00
Stephan
860def507b Fix .editorconfig line endings 2018-07-06 12:26:14 +02:00
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Stephan
e9a31437e1 Fix .editorconfig line endings 2018-07-06 12:20:05 +02:00
Mads Rasmussen
b63af8b56f convert the last pickers in the user section to infinite editors 2018-07-05 20:22:27 +02:00
Stephan
75d685ef43 NuCache - fix parent published 2018-07-05 17:08:40 +02:00
Stephan
0af18b2376 Fix publishing 2018-07-05 17:07:40 +02:00
Mads Rasmussen
10207a1c50 remove unused overlay 2018-07-05 10:59:33 +02:00
Marcin Zajkowski
8f7bc1a083 Merge remote-tracking branch 'origin/temp8' into hackathon-publishing 2018-07-04 22:16:02 +02:00
Mads Rasmussen
a9fd88567e update treePickers on user group to use infinite editing 2018-07-04 20:19:54 +02:00
Mads Rasmussen
cabc3b7567 fix up infinite trees in insert overlay and change insert overlay to infinite editing 2018-07-04 19:47:06 +02:00
Mads Rasmussen
579dc058aa ues infinite tree picker in prevalue editors 2018-07-04 14:28:37 +02:00
Warren Buckley
a57658b274 Merge pull request #2737 from umbraco/temp8-w80
Fixes - Create user confirmation page gives angulajs error
2018-07-04 13:24:52 +01:00
Mads Rasmussen
8dbc4cb2c5 use infinite tree picker in member picker property editor 2018-07-04 13:46:09 +02:00
Mads Rasmussen
e74112ee2a use infinite tree picker in related links property editor 2018-07-04 13:44:20 +02:00
Mads Rasmussen
be9db43e21 use infinite tree for partial view picker 2018-07-04 13:17:37 +02:00
Mads Rasmussen
8b86c372dc use infinite tree picker in media picker prevalues 2018-07-04 13:04:20 +02:00
Mads Rasmussen
06d813736d rename queryBuilder controller 2018-07-04 12:56:14 +02:00
Mads Rasmussen
c087f09071 fix check for member section in treePicker 2018-07-04 10:57:52 +02:00
Mads Rasmussen
6637cc47ee use infinite treePicker in when editing a user 2018-07-04 10:57:27 +02:00
Stephan
0d3ea107c5 Deal with some FIXME 2018-07-04 10:41:08 +02:00
Mads Rasmussen
b7f187b69a use infinite queryBuilder and treePicker in partial views 2018-07-04 09:54:20 +02:00
Mads Rasmussen
534788cc38 use infinite queryBuilder and treePicker in template editor 2018-07-04 09:48:40 +02:00
Mads Rasmussen
5466287063 use infinite treePicker and queryBuilder in the macro partial views editor 2018-07-04 09:45:23 +02:00
Mads Rasmussen
49e35367f1 add infinite query builder and tree picker 2018-07-04 09:43:41 +02:00
Stephan
e8aa6701ef Renormalize 2018-07-04 09:03:59 +02:00
Stephan
b3696c29cc Refactor Variants at service level 2018-07-04 08:59:50 +02:00
Mads Rasmussen
afd8e7d404 remove code for content mini editor 2018-07-03 16:06:37 +02:00
Mads Rasmussen
14365e3894 remove function to open old mini content editor 2018-07-03 15:59:16 +02:00