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

5514 Commits

Author SHA1 Message Date
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
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
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
9718324e6e add check for master not being equal to template 2017-01-10 12:22:18 +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
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
8b479b57e5 Change query condition from name to alias 2017-01-05 08:45:04 +01: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
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
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
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
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
mikkelhm
dea3553885 Change back to using CurrentPage.Site() when queuing with the Query Builder, as Model.Content.Site(), doesnt support the queries the Query Builder creates 2016-12-28 14:04:40 +01:00
Stephan
ef28173511 U4-9250 - fixes 2016-12-21 15:23:23 +01:00
Sebastiaan Janssen
f2f4c23c80 Merge pull request #1652 from umbraco/U4-9301 
Updates login controller to not accept non local urls
 2016-12-20 13:55:31 +01:00
Shannon
39505cd868 U4-9262 CleanForXss breaks rgba() values set as grid background color style 2016-12-20 13:27:53 +11:00
Niels Hartvig
da27108d0d Updates login controller to not accept non local urls 2016-12-19 10:44:22 +01:00
Per Ploug
17011a1e76 Fixes issue with saving master 2016-12-15 13:55:59 +01:00
Shannon
7254db40eb publicizes ExamineExtensions.ConvertSearchResultToPublishedContent 2016-12-15 17:44:32 +11:00
Stephan
cb09681cb0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-13 10:36:33 +01:00
Sebastiaan Janssen
c607ceda48 Merge pull request #1557 from tompipe/U4-9127-SortMemberProperties 
Fixed issue with member properties sort order
 2016-12-09 08:59:52 +01:00
Claus
960040e51e U4-9255 Not having access to settings section causes backoffice user to be logged out when browsing media list views 2016-12-07 12:57:29 +01:00
Stephan
b8ff4a5906 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-05 11:58:00 +01:00
Shannon
4823235bf5 Ensures the cleaned value isn't double html encoded 2016-12-05 17:21:24 +11:00
Shannon
90f30c3f3c Ensures tag values are Html encoded both on the client side and on the server side to prevent any xss 2016-12-05 17:13:07 +11:00
Stephan
f79e63a13b Fix background-thread-safe database usage 2016-12-02 18:15:42 +01:00
Stephan
467b12491c Merge dev-v7 into dev-v7.6 2016-12-02 12:01:31 +01:00
Stephan
22397ded9b Be more tolerant with Xml cache document 2016-12-02 11:53:37 +01:00
Stephan
de1da4b060 Merge pull request #1635 from umbraco/temp-startuphandler-ordering 
This allows for sorting startup handlers and modifying the list of startup handlers before they execute
 2016-12-02 11:48:57 +01:00
Stephan
13f7f96101 Refactor app event resolver weights 2016-12-02 08:45:36 +01:00
Stephan
3e8f85a4b4 Be more tolerant with Xml cache document 2016-12-01 14:30:50 +01:00
Stephan
bdb6b48e3f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-11-28 13:08:22 +01:00
Stephan
309081cccf Merge branch origin/dev-v7 into temp-U4-9222 2016-11-28 13:06:06 +01:00
Stephan
f97bc0fbb6 Merge origin/dev-v7 into dev-v7.6 2016-11-28 12:57:20 +01:00
Shannon
1221c0e416 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-11-28 12:04:06 +01:00
Shannon
c505cc689b Obsoletes access to ApplicationContext from UmbracoContext 2016-11-28 12:03:46 +01:00
Stephan
48dbd5c570 Ensure CacheRefresherEventHandler triggers first 2016-11-28 11:00:58 +01:00
Sebastiaan Janssen
51397d7c28 Merge branch 'dev-v7' into dev-v7.6 2016-11-28 10:49:37 +01:00
Stephan
3a216c055e U4-9222 - use HasPublishedVersion test 2016-11-28 09:52:45 +01:00