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

561 Commits

Author SHA1 Message Date
Shannon Deminick
034aa6d8f9 Fixes merge issue 2013-04-20 03:58:15 +06:00
Shannon Deminick
1484fba1ad Merge with 4.11.7 2013-04-20 03:51:22 +06:00
Shannon Deminick
82fc1a5304 updated proj file 2013-04-20 03:47:57 +06:00
Shannon Deminick
f0aab6ae81 Fixes: U4-2089 - sort dialog behavior when clicking on column headers. Updated to latest version of table sorting, had to create a custom sort parser 
upgraded the sort.aspx to have the proper code behind structure and updated the page to have proper css and js files instead of inline. Fixes missing images.
 2013-04-20 03:42:47 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
6c9e82e735 fixed typo 2013-04-19 04:31:55 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
e9c4a031c9 Fixes up directory browser and removes legacy request params which are prone to xss 2013-04-19 04:10:35 +06:00
Shannon Deminick
12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Shannon Deminick
25b9262cf1 Merge with 4.11.7 2013-04-10 03:51:53 +06:00
Shannon Deminick
436322f58c updates #U4-2070 for directoryBrowser.aspx 2013-04-10 02:34:44 +06:00
Shannon Deminick
30be665a40 Merge with 4.11.7 2013-04-09 07:41:55 +06:00
Shannon Deminick
29bf61b1f2 Starts on #U4-2078, mostly just some initial code cleanup 2013-04-09 06:07:25 +06:00
Shannon Deminick
3d51dd767b Fixed merge issues. 2013-04-06 00:27:44 +06:00
Shannon Deminick
e22988e435 Merged with 4.11.7 2013-04-06 00:21:06 +06:00
Shannon Deminick
bf3fa20a53 Cleaned up the code fro rsd and wlwmanifest and ensures wlwmanifest actually returns the results in xml format. 2013-04-06 00:04:23 +06:00
Shannon Deminick
1bd20c9b06 Fixes: #U4-2059 and removes un-needed ping.aspx files, cleans up some code 2013-04-05 23:28:43 +06:00
Shannon Deminick
165d9c7dff Fixed nonodes to now show version information and updated it so that it redirects to root if there 
is actually content so the page is actually not accessible unless you actually have no nodes.
 2013-04-05 21:58:13 +06:00
Shannon Deminick
7edbc34e6c Merge with 4.11.7 2013-04-05 06:46:13 +06:00
Shannon Deminick
60b6608289 patch for fix #U4-2027 2013-04-05 06:42:52 +06:00
Sebastiaan Janssen
bea50f4562 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:50:27 -02:00
Sebastiaan Janssen
ff337457f8 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:31:03 -02:00
Shannon Deminick
13e555f50b Fixed merge issue based on overlap with class + namespace name. 2013-03-29 23:52:40 +06:00
Shannon Deminick
48c809a797 Merge with 4.11.7 2013-03-29 23:22:18 +06:00
Shannon Deminick
55c7f72d8e Converts create.aspx to have the correct webforms file/class structure, fixed logging for userTask, 
fixed issue with last regex fix for xss
 2013-03-29 23:14:42 +06:00
Shannon Deminick
37a97a2e7c Merge with 4.11.7 2013-03-29 21:34:56 +06:00
Shannon Deminick
5f4eaef4a2 Fixes: #U4-2022 2013-03-29 21:31:27 +06:00
Sebastiaan Janssen
44f5c3a34f Fixes U4-2019 Create new Document Type dialog displays poorly in Chrome 2013-03-29 09:13:44 -01:00
Shannon Deminick
1db7f808c9 Merge with 4.11.6 2013-03-22 21:59:52 +06:00
Morten Christensen
4b87a5c2d3 Adding safe alias cast to Templates. 
Updating doc type create dialog to verify alias before saving.
Updating ContentTypeRepository to Mandate that the alias is not empty.
Fixes the cause for U4-1976
 2013-03-22 09:56:21 -01:00
Morten Christensen
63de9e6691 Refactoring package installer to use the new PackagingService. 
Refactoring ImportDocumentType dialog to import through the PackagingService.
Making a few corrections to the ProppertyGroup and PropertyType classes to support bulk saving.
 2013-03-21 12:34:10 -01:00
Sebastiaan Janssen
259fbcb8f0 Fixed U4-1934 Error in comments of config files 2013-03-18 08:50:24 -01:00
Shannon Deminick
23146cb12a Merge with 4.11.6 2013-03-15 08:06:26 +04:00
Shannon Deminick
04b9607741 Fixes: #U4-1916 and another issue for vdirs, added unit tests, changed UI web project to always 
launch in a VDIR.
 2013-03-15 08:03:19 +04:00
Shannon Deminick
7404a1f93d Merge with 4.11.6 2013-03-12 00:14:50 +04:00
Sebastiaan Janssen
b8e4a73c3b Revert Casey's mistakenly added files 2013-03-11 15:55:35 -01:00
Shannon Deminick
c6f29a50d6 Merge with 4.11.6 2013-03-11 21:17:57 +06:00
Shannon Deminick
d07212c89b Fixed changes with new MacroErrors config and how macros are rendered so it supports all macro types and also fixes up a bit of code 
in the umbraco.macro class.
 2013-03-11 21:06:02 +06:00
Shannon Deminick
fd58017e97 imported patches for pull request spudstuff/u4497 2013-03-11 18:49:45 +06:00
Morten Christensen
928d92fce4 Making the Sql Syntax Providers public and changing a few names and bits for consistency. 
Adding resolver for the syntax providers and wiring it up in the boot manager.
 2013-03-09 10:43:34 -01:00
Casey Neehouse
09408b898e Merge 2013-03-08 19:38:33 +05:00
Morten Christensen
2b8a6e532e Fixing U4-1820 2013-03-03 11:25:48 -01:00
Sebastiaan Janssen
5b00501d21 trySkipIisCustomErrors was defined twice in the Release config 2013-02-27 14:38:15 -01:00
Sebastiaan Janssen
902cfc5a22 Merge with 4.11.5 2013-02-27 12:43:52 -01:00
Sebastiaan Janssen
2cb544591b Pull in new translations 2013-02-27 12:43:21 -01:00
Sebastiaan Janssen
eda9ba07f4 Wrongly doing an append where I meant to just replace the html 2013-02-27 09:53:45 -01:00
Shannon Deminick
4b29d7ba2e Merge with 4.11.5 2013-02-26 21:11:20 +06:00
Shannon Deminick
d503deb8c5 reverted member index config, for pre 6.1 we will still need to manually set the member fields. 2013-02-26 21:07:59 +06:00