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

17397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Per Ploug
12e48d069b Fixes issue with DateTime values and strongly typed queries 2017-01-05 11:34:38 +01:00
Per Ploug
dbdb1cbd06 Merge branch 'temp-template-editor' of https://github.com/umbraco/Umbraco-CMS into temp-template-editor 2017-01-05 08:45:28 +01:00
Per Ploug
8b479b57e5 Change query condition from name to alias 2017-01-05 08:45:04 +01:00
Warren Buckley
663b0f3931 Merge pull request #1674 from umbraco/temp-U4-9338 
fixes: U4-9338 Add focus to code editor on load and after closing dia…
 2017-01-04 15:17:13 +00:00
Warren Buckley
1300764770 Adding in server side validation - but need to clarify that this is the 'right' way to do it that wires up correctly/magically back to the UI components 2017-01-04 14:12:45 +00:00
Mads Rasmussen
18d8223d7e fixes: U4-9338 Add focus to code editor on load and after closing dialogs 2017-01-04 13:04:48 +01:00
Warren Buckley
1a215f3176 Merge pull request #1648 from umbraco/temp-U4-9273 
Fixes: U4-9273 Add date picker to query builder
 2017-01-04 11:16:10 +00:00
Mads Rasmussen
42841824bf add client side validation 2017-01-04 11:31:46 +01:00
Mads Rasmussen
ddad642a88 fix callbacks 2017-01-04 10:45:40 +01:00
Mads Rasmussen
339957bd91 remove unnecessary dependencies 2017-01-04 10:43:56 +01:00
Per Ploug
051801f337 Couple of copy updates for the render section 2017-01-03 13:10:54 +01:00
Shannon Deminick
46922dd259 Merge pull request #1664 from umbraco/temp-U4-9328 
Fixes: U4-9328 UI: It shouldn’t be possible to select the current tem…
 2017-01-03 14:41:28 +11:00
Shannon Deminick
e2adb25da0 Merge pull request #1665 from umbraco/temp-U4-9325 
fixes: U4-9325 New template editor stays in a $dirty state if you cha…
 2017-01-03 14:38:30 +11:00
Mads Rasmussen
5146658e0f fixes: U4-9325 New template editor stays in a $dirty state if you change and then save 2017-01-02 13:03:15 +01:00
Mads Rasmussen
dece680221 Fixes: U4-9328 UI: It shouldn’t be possible to select the current template or the selected master template in the master template picker. 2016-12-30 11:36:20 +01:00
Mads Rasmussen
48ee9d6b0e Merge pull request #1663 from umbraco/temp-U4-9274 
fixes: U4-9274 Master template is not saved
 2016-12-30 10:53:10 +01:00
Shannon
3e82a48f4d Fixes tree syncing and fixes server side code to reset the master template if it's cleared 2016-12-30 11:38:27 +11:00
Shannon
bd448ef05a U4-9326 Removing a master template from a Template does not update the Template's path correctly 2016-12-30 11:27:55 +11:00
Mads Rasmussen
82efa14b7a add UI to remove master template 2016-12-29 13:50:57 +01:00
Mads Rasmussen
61f25edafc sync tree 2016-12-29 13:50:11 +01:00
Shannon
436875e8ec fixes null check with setting master template 2016-12-29 14:02:15 +11:00
Shannon
ac087a87d3 Merge branch 'refs/heads/dev-v7.6' into temp-template-editor 2016-12-29 13:58:14 +11:00
Shannon
903ce09426 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2016-12-29 13:57:55 +11:00
Shannon
02dc510078 Merge branch 'refs/heads/dev-v7.6' into temp-template-editor 2016-12-29 13:56:11 +11:00
Shannon
ffefe417db bumps version 2016-12-29 12:23:30 +11:00
Per Ploug
00adffc8b3 Merge remote-tracking branch 'origin/temp-template-editor' into temp-template-editor 
# Conflicts:
#	src/Umbraco.Web/Editors/TemplateQueryController.cs
#	src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
 2016-12-29 02:16:58 +01:00
Per Ploug
2ec3278637 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-template-editor 2016-12-29 01:51:10 +01:00
Per Ploug
1f52a0c186 Changes the querybuilder to use the correct Where syntax 2016-12-29 01:50:43 +01:00
Shannon
40f7d820a6 publicizes a few APIs and adds more API docs 2016-12-29 11:36:39 +11:00
mikkelhm
19f7e6bd88 When Querying we need to use the Alias to search for, in stead of the name, this is due to names like "Created Date" and "Last Updated Date", who has aliases like "CreateDate", and "UpdateDate" 2016-12-28 14:07:22 +01:00