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

463 Commits

Author SHA1 Message Date
Morten@Thinkpad-X220
0c34b1a4ef Merge with 4.10.0 2012-10-18 11:54:32 -02:00
Sebastiaan Janssen
d2fd02315a Fix skin configurator in Chrome not working after install. 
SORRY for the commit to both files, still need to dive into the ASCX seperation
 2012-10-18 07:46:46 -02:00
Sebastiaan Janssen
9b28214c3e Merge 2012-10-18 06:44:20 -02:00
Sebastiaan Janssen
6a665efd7e Styles dropdown is not updated when styled text is highlighted in the rich text editor 
#U4-659 Fixed
 2012-10-18 06:41:16 -02:00
Shannon Deminick
c0f7493e70 Merge 2012-10-18 07:17:20 +05:00
Shannon Deminick
7d8524dd55 Added additional namespace imports for MVC views in the views web.config. 2012-10-18 06:55:41 +05:00
Sebastiaan Janssen
4c667a6a3e Set web.config output to none because it might not exist when running automated 
builds like build.bat or teamcity
 2012-10-17 06:11:31 -02:00
Shannon Deminick
ce06a30e64 added additional timeout to installer to ensure DOM is updated before redirecting. 2012-10-17 09:28:02 +05:00
Shannon Deminick
90aa8c3b5a reverted web.config back to standard (without user defined values) and added it to .ignore so that 
user changes don't keep changing it and 'forgot' it in the source control.
 2012-10-17 07:30:08 +05:00
Shannon Deminick
ea217edaae Merge 2012-10-17 07:25:15 +05:00
Shannon Deminick
3cf9a45724 Finalized initial refactor of package installation for the installer, ensures the app pool is properly restarted 
before installing Business Logic.
 2012-10-17 07:08:35 +05:00
Shannon Deminick
cc34208871 More work on installer update for packages, nearly there. 2012-10-16 03:12:16 +05:00
Shannon Deminick
6f778c26d1 Initial commit of refactoring of package installer for the installer process. Converted a few webforms pages/controls to the new format, created 
new JS class to manage the installation, created new MVC controller for managing the ajax installation
 2012-10-16 01:33:35 +05:00
Sebastiaan Janssen
487fdea34e Logging for the datalayer now properly uses the LogHelper in Umbraco.Core 2012-10-15 07:02:29 -02:00
Sebastiaan Janssen
f6c51205fc Re-include splitbutton.js 2012-10-12 11:41:29 -02:00
Sebastiaan Janssen
d45b5a3139 Re-include ItemEditing javascripts 2012-10-12 11:09:32 -02:00
Morten@Thinkpad-X220
a9c40a7f72 Merge with 4.10.0 2012-10-12 05:43:10 -02:00
Morten@Thinkpad-X220
089b51cdbc Not sure where these language files came from, but looks like they are needed. 2012-10-12 05:40:39 -02:00
Shannon Deminick
689fe2a44f Fixes issue with wrapping the UmbEditor init in doc ready causing template editing not to work. 2012-10-12 09:15:33 +05:00
Morten@Thinkpad-X220
361d3e91f6 Merge with 4.10.0 2012-10-11 13:13:38 -02:00
Sebastiaan Janssen
65d5bc9155 Change from enableMvcSupport to defaultRenderingEngine in the release config too 2012-10-11 08:42:20 -02:00
Casey Neehouse
4d94909782 Folder Browser Enhancements - IE 7 Thumbnail list CSS corrections, 
Added labels to the thumbnail size setter,
Capture/cancel the return key on the filter textbox.
 2012-10-11 03:00:28 +04:00
Morten@Thinkpad-X220
f0e8ba063e Merge with 4.10.0 2012-10-10 13:21:00 -02:00
Morten@Thinkpad-X220
a02c3481d9 Removing files before merging 2012-10-10 13:20:37 -02:00
Shannon Deminick
3ddb9785c7 added missing codebehinds. updated ignore file. 2012-10-10 20:04:11 +05:00
Sebastiaan Janssen
585eea1c6b Merge 2012-10-10 11:03:27 -02:00
Sebastiaan Janssen
10095a4ee7 Upgrade to CodeMirror 2.34 2012-10-10 11:02:59 -02:00
Morten@Thinkpad-X220
e830660be3 Missing files in solution-workaround. 2012-10-10 08:43:38 -02:00
Morten@Thinkpad-X220.ab-nat1.dk
0cceac97fc Merge with 4.10.0 2012-10-09 16:08:13 -02:00
Shannon Deminick
8f4ccc53d5 Merge 2012-10-09 20:17:51 +05:00
Shannon Deminick
f04db8c52c Converted umbracoPage.master to have the correct codebehind structure. Added base2 as a default lib in umbracoPage. 
Converted EditView to use propery JS class so that we can now better support the editor for the new buttons (i.e. insert macro, etc...)
 2012-10-09 20:17:27 +05:00
Morten@Thinkpad-X220
26b67afd33 Merge with 4.10.0 2012-10-09 12:29:39 -02:00
Morten@Thinkpad-X220
2dbc40134c Refactoring TemplateRepository and adding providers to the FileSystemPRoviders.config 2012-10-09 12:27:57 -02:00
Sebastiaan Janssen
e2283c2310 Made CodeMirror 100% height again 2012-10-09 12:25:36 -02:00
Morten@Thinkpad-X220
b8c0969a85 Merge with 4.10.0 2012-10-09 09:14:16 -02:00
Morten@Thinkpad-X220
2705053177 Merge with 4.10.0 2012-10-09 05:36:20 -02:00
Casey Neehouse
26aca92337 Updates to the Change password dashboard UI - better language and corrected the 
validation. Related to comments in issue U4-914.
 2012-10-09 03:33:55 +04:00
Shannon Deminick
9022894d23 Changed EnableMvcSupport config section and classes to be: DefaultRenderingEngine which uses an enum. 
Added a real handy Enum<T> class for parsing/traversing enums.
 2012-10-09 02:42:09 +05:00
Morten@Thinkpad-X220.ab-nat1.dk
8a81bf935a Merge with 4.10.0 2012-10-08 17:23:11 -02:00
Shannon Deminick
747675816d Changed editMacro over to use the correct codebehind structure. 2012-10-08 23:57:27 +05:00
Shannon Deminick
2833a8c5c7 Changed editTemplate over to use the correct codebehind structure 2012-10-08 23:52:37 +05:00
Shannon Deminick
75a686bc07 Changed umbracoDialog.master to have correct codebehind structure. 2012-10-08 23:46:49 +05:00
Shannon Deminick
8fa36f3f22 Converted UmbracoField to use JS class Umbraco.Dialogs.UmbracoField. 
Adds base2 lib o the default umbracoDialog.Master.
 2012-10-08 23:32:43 +05:00
pgregorynz
caa937a4ef Updates to ViewEditor. Insert Page Field, Insert Dictionary Item, 
Master Template Selector
 2012-10-08 06:05:07 -10:00
pgregorynz
d7103a3b83 Merge 2012-10-08 05:57:57 -10:00
pgregorynz
e555520ddf Insert field Views. 2012-10-08 05:40:55 -10:00
Niels Hartvig
ed3f715988 Container Document Types 2012-10-08 11:53:35 -02:00
Morten@Thinkpad-X220
51165cf614 Enabling nuget package restore and removing referenced nupkg files from repo U4-997 
Implement Serialization framework from v5 U4-968
 2012-10-08 09:51:13 -02:00
Morten@Thinkpad-X220
d52c0db0ee Merge with 4.10.0 2012-10-08 08:50:01 -02:00
tg@umbraco.com
406e3663f6 Merge 2012-10-08 08:43:38 -02:00