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

17717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus
2f3d926c08 Merge pull request #1638 from enkelmedia/dev-v7 
Fixed english typo for modelsbuilder
 2017-01-16 08:11:45 +01:00
Claus
594c3b8a85 Merge pull request #1630 from abjerner/patch-14 
Typo (sorta)
 2017-01-16 08:11:09 +01:00
Shannon
3ad729824e Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-01-16 18:08:34 +11:00
Shannon Deminick
41244485b1 Merge pull request #1684 from umbraco/temp-U4-9377 
U4-9377 It is possible to create/save entities with a blank names by …
 2017-01-16 17:40:12 +11:00
Shannon
ede342feba Finds all other instances where a reader would be executed inside another reader's loop and fixes 2017-01-16 16:38:23 +11:00
jamiepollock
a15bdba5d7 View fix for icons not appearing in the installed package list 2017-01-15 18:26:20 -05:00
Mads Rasmussen
361f5093c7 align width with input fields 2017-01-13 14:42:36 +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
Per Ploug
99f66fe6a3 The danish language files - WIP 
The danish language has such elements when used to discusssed
semi-technical-english terms
 2017-01-13 13:21:37 +01:00
Per Ploug
b413a6eeae English translations 2017-01-13 13:20:49 +01:00
Per Ploug
9b9db23461 Replaces the last static strings with language keys 2017-01-13 13:20:38 +01:00
Mads Rasmussen
4fa36cd424 fine tuning 2017-01-13 13:16:47 +01:00
Claus
7d4a9998ca U4-9377 It is possible to create/save entities with a blank names by using the services directly 
ensuring that when trying to save an entity with an empty name, directly through a service, an exception will be thrown.
 2017-01-13 11:45:49 +01:00
Mads Rasmussen
eba8181d0c use new umb node preview component in member picker 2017-01-13 11:17:28 +01:00
Mads Rasmussen
21714f0eac use new umb node preview component in member group picker 2017-01-13 11:16:59 +01:00
Mads Rasmussen
8e79e15c71 use new umb node preview component in content picker 2017-01-13 11:16:15 +01:00
Mads Rasmussen
0c709d144b move mini editor launch logic to helper service so we can open it without the directive - it is needed for the content picker 2017-01-13 10:40:03 +01:00
Mads Rasmussen
4e7d2f668b add node preview component 2017-01-13 10:26:43 +01:00
Shannon
bde439d102 fixes tests 2017-01-13 12:34:58 +11:00
Shannon
ba501dbbb8 U4-9371 Examine indexes inherited unpublished nodes on index rebuild part 2 2017-01-13 10:43:34 +11: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
Niels Hartvig
f75e0cf4ba Updates to PR based on Review 2017-01-10 12:47:00 +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
0dc3bff01a Merge branch 'dev-v7' into master-v7 2017-01-10 07:31:08 +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