yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,759 Commits 4 Branches 7 Tags
592de8bebcba97441a0996f32bbc09102bbadea3
Commit Graph

23759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AndyButland
592de8bebc Model, retrieval, mapping and display for fall back language editing 2018-07-08 16:14:47 +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
ef28f23c61 Renormalize 2018-07-06 12:27:39 +02:00
Stephan
860def507b Fix .editorconfig line endings 2018-07-06 12:26:14 +02:00
Mads Rasmussen
b63af8b56f convert the last pickers in the user section to infinite editors 2018-07-05 20:22:27 +02:00
Mads Rasmussen
10207a1c50 remove unused overlay 2018-07-05 10:59:33 +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
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
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
Mads Rasmussen
3587039406 add save and close button - show the correct button based on permissions 2018-07-03 15:55:29 +02:00
Mads Rasmussen
3750ebf882 add publish and close button to infinite content editor 2018-07-03 13:07:39 +02:00
Mads Rasmussen
fccd0b4f42 Don't allow to change the content variant when using infinite editing. 2018-07-03 11:10:19 +02:00
Mads Rasmussen
b10c0e7f4c don't sync the content tree when in infinite mode 2018-07-03 10:24:17 +02:00
Mads Rasmussen
c23d6f12ac Hide content actions button when in infinite mode 2018-07-03 10:19:22 +02:00
Mads Rasmussen
e6e619b967 open regular content editor instead of mini content editor 2018-07-02 15:57:16 +02:00
Mads Rasmussen
a5467bc277 delete old tree picker 2018-07-02 14:16:41 +02:00
Mads Rasmussen
c0af8de493 use treepicker infinite editor instead of overlay verson 2018-07-02 14:15:39 +02:00
Mads Rasmussen
9bc1f1e468 add tree picker infinite editor files 2018-07-02 14:14:52 +02:00
Mads Rasmussen
d181ab193f add content picker to editorService 2018-07-02 14:14:04 +02:00
Mads Rasmussen
b6b44e30f6 Merge pull request #2732 from umbraco/temp8-83 
fixes: infinite editing - change doc type from content node
 2018-07-02 12:50:27 +02:00
Mads Rasmussen
41a3dc862e fix js error 2018-07-02 12:44:53 +02:00
Mads Rasmussen
451f894976 Merge branch 'temp8' into temp8-83 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2018-07-02 10:07:50 +02:00
Stephan
c95340ab78 Merge branch 'ismailmayat-convert-model-factories-to-static-classes' into temp8 2018-06-30 11:09:41 +02:00
Stephan
9cd9470f87 Merge branch 'temp8' into ismailmayat-convert-model-factories-to-static-classes 2018-06-30 11:09:07 +02:00
Stephan
cc4815200e Revert "Removed obsolete method from WebProfileProvider" (needed!) 
This reverts commit 5d3309dbf1.
 2018-06-30 11:08:30 +02:00
Stephan
3c1b8de323 Fix projects 2018-06-30 11:07:10 +02:00
Stephan
2386845347 Merge branch 'convert-model-factories-to-static-classes' of https://github.com/ismailmayat/Umbraco-CMS into ismailmayat-convert-model-factories-to-static-classes 2018-06-29 20:05:11 +02:00
Stephan
619d24ec3c Merge branch temp8 into ismailmayat-convert-model-factories-to-static-classes 2018-06-29 19:58:39 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Stephan
c1f3de7e5c Umbraco.Web.UI/Umbraco not /umbraco 2018-06-29 19:51:59 +02:00
Ismail Mayat
98eae84d56 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into convert-model-factories-to-static-classes 
# Conflicts:
#	src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
 2018-06-29 18:30:51 +01:00
Stephan
0364e1b176 Remove unused using statement 2018-06-29 17:17:18 +02:00
Stephan
c2cfdfd746 Merge branch 'convert-model-factories-to-static-classes' of https://github.com/ismailmayat/Umbraco-CMS into ismailmayat-convert-model-factories-to-static-classes 2018-06-29 16:54:09 +02:00
Stephan
d12fa45571 Merge branch 'ed-parry-hackathon-obsolete-action-constructors' into temp8 2018-06-29 16:52:07 +02:00
Stephan
ee87d00ffe Merge branch 'hackathon-obsolete-action-constructors' of https://github.com/ed-parry/Umbraco-CMS into ed-parry-hackathon-obsolete-action-constructors 2018-06-29 16:49:12 +02:00