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

17489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Hartvig
a162f21a70 Fixing missing mapping - let the green build lights appear 2017-01-16 19:49:57 +01:00
Niels Hartvig
ace111aefb Adding support for get, save and rename to new Partial View editor 2017-01-16 16:50:22 +01:00
Niels Hartvig
dfe3798aab More merge 2017-01-16 09:59:00 +01:00
Niels Hartvig
975535a9e2 Merge of insert overlay view 2017-01-13 13:33:55 +01:00
Niels Hartvig
e7f7631d1e Fixes merge conflicts (needs updated ng-if in insert overlay) 2017-01-13 13:22:43 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Mads Rasmussen
04f79ffaf1 lazy load ace editor source file - change to an isolated scope and don't rely on ngModel to get it working 2017-01-12 15:31:21 +01:00
Per Ploug
32abebd0a0 Main template editor translated 2017-01-12 11:33:31 +01:00
Mads Rasmussen
34b06dc350 update docs for template resource 2017-01-12 11:07:37 +01:00
Mads Rasmussen
16d8c55fa7 tree picker search only works for content, media and members so hide for everything else 2017-01-12 10:11:03 +01:00
Per Ploug
2085063231 Fixes issue with creating template below a parent template 2017-01-12 10:07:44 +01:00
Per Ploug
73f77df5ad Ensures VirtualPath is reset if a template alias is changed 2017-01-12 09:47:42 +01:00
Shannon
8a11b0f7a8 publisizes a constant (moves it to where it should be), publicizes another required class for deploy, bumps version 2017-01-12 17:33:30 +11:00
Shannon
5a2836eb6d bumps version 2017-01-12 13:45:17 +11:00
Shannon
cfd8d39878 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-01-12 13:39:15 +11:00
Mads Rasmussen
e8e0b10559 fix issue with inserting partials from folders 2017-01-11 14:26:56 +01:00
Mads Rasmussen
98279052e6 remove lorem ipsum from the sections dialog 2017-01-11 10:07:43 +01:00
Per Ploug
0b7f60c0f8 Fixes to issues with query generation 
Ensures its typed content and children is called as a method
 2017-01-10 16:55:30 +01:00
Per Ploug
d563eb07a2 Adds .FirstChild(string alias) extension to Model.Content 2017-01-10 16:55:03 +01:00
Per Ploug
f036bc90c3 Fixes failing mapper test 2017-01-10 16:54:46 +01:00
Mads Rasmussen
23304aca0b add unit tests for template helper 2017-01-10 15:16:16 +01:00
Mads Rasmussen
845dd4673c Add client side file for partial view editor 2017-01-10 15:15:56 +01:00
Mads Rasmussen
0a53f7636c remove orange color from discard changes button 2017-01-10 15:01:45 +01:00
Mads Rasmussen
6e6d552441 Merge pull request #1662 from marcemarc/patch-2 
Add some green to 'stay' option - U4-9323
 2017-01-10 14:59:08 +01:00
Niels Hartvig
14e402878a Merge conflict fixes 2017-01-10 14:49:19 +01:00
Niels Hartvig
5a2687d520 Merge of temp-template-editor 2017-01-10 14:47:33 +01:00
Claus
905eed518f Merge pull request #1677 from umbraco/temp-deploy-102 
deploy-102 - guid the relation types
 2017-01-10 14:08:46 +01:00
Mads Rasmussen
c46f38c73b Merge pull request #1673 from umbraco/temp-U4-9324 
Fixes: U4-9324 New template editor is lacking all validation (both client side and server side)
 2017-01-10 12:23:35 +01:00
Mads Rasmussen
9718324e6e add check for master not being equal to template 2017-01-10 12:22:18 +01:00
Mads Rasmussen
4c461a733b remove inline validation on name 2017-01-10 12:16:12 +01:00
Mads Rasmussen
82ab7c4a01 Merge branch 'temp-template-editor' into temp-U4-9324 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-10 11:52:03 +01:00
Sebastiaan Janssen
358dd7f32b Move ImageProcessor.Web.Config to not be in the .Core NuGet, it's not a dll 2017-01-10 07:30:35 +01:00
Shannon
77d47f0b28 fixes error with server side validation + data tyep editor, ensures template controller and data type controller inherit from BackOfficeNotificationsController, ensures BackOfficeNotificationsController is attributed with PrefixlessBodyModelValidator 2017-01-10 12:29:30 +11:00
Shannon
d66c57cfd0 Ensures that the Name field shows validation correctly with server side validation - needs Mads to verify this is ok. 2017-01-10 12:05:48 +11:00
Shannon
6531d027fc fixes error with server side validation + data tyep editor 2017-01-10 11:55:36 +11:00
Shannon
d11e787624 updates Nuspec with IP version 2017-01-10 11:37:31 +11:00
Shannon
055ae0d126 updates latest IP mem leak fixes 2017-01-10 11:36:35 +11:00
Niels Hartvig
4c330c8654 Implements CodeFileController 2017-01-09 22:54:28 +01:00
Stephan
2074affd5e Merge branch 'dev-v7.6' into temp-deploy-102 2017-01-09 17:50:29 +01:00
Stephan
17c9d19ebb deploy-150 - wire GetSize in services 2017-01-09 17:50:06 +01:00
Stephan
cfd8435d68 deploy-150 - wire GetSize in services 2017-01-09 17:49:12 +01:00
Sebastiaan Janssen
52b1a08912 Merge pull request #1671 from umbraco/temp-U4-9337 
Perf improvements especially around URLs and node path
 2017-01-09 16:12:26 +01:00
Stephan
844d6c9972 Merge branch 'dev-v7.6' into temp-deploy-102 2017-01-09 15:35:54 +01:00
Stephan
5e6f1a92ca Merge branch origin/dev-v7 into dev-v7.6 2017-01-09 15:31:41 +01:00
Warren Buckley
b2815d5e63 Remove commented code 2017-01-09 13:34:20 +00:00
Warren Buckley
5b88c57d94 Replace RequiredForPersistance with Required 2017-01-09 13:05:20 +00:00
Stephan
9ba08f275e Merge branch 'temp-U4-9337' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9337 2017-01-06 09:15:43 +01:00
Stephan
aadd0c9129 U4-9337 - asymmetric route caching 2017-01-06 09:12:25 +01:00
Shannon
b3b79a792f Merge branch 'refs/heads/dev-v7' into temp-U4-9337 2017-01-06 17:40:40 +11:00
Shannon
59cd4b5c5c Fixes more allocations at the config level 2017-01-06 17:40:03 +11:00