Commit Graph

439 Commits

Author SHA1 Message Date
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
tg@umbraco.com
775b2192ff Fixes U4-680: insert Macro split buttons not working 2012-10-08 08:42:47 -02:00
PerPloug
458de6296e Wraps masterpages selector in try/catch
to avoid exceptions if masterpage is missing for some reason
2012-10-08 07:19:36 -02:00
PerPloug
b55ce96d85 Changes to editView, editTemplate and loadTemplates
to fix wrong create dialog, and missing master pre-selection
in master template dropdown
2012-10-08 07:12:02 -02:00
Sebastiaan Janssen
227d910722 Merge 2012-10-07 15:27:47 -02:00
Sebastiaan Janssen
a356552d2d Moved tree picker tooltip style to default.css so it also works in editMacro (and elsewhere) 2012-10-07 11:45:22 -02:00
Michiel van Oosterhout
c1cfcaf9ea Deprecated MacroProperty.Public because its value is ignored. Removed the checkbox
for setting MacroProperty.Public from the macro editor.
2012-10-06 20:51:00 -02:00
Michiel van Oosterhout
c7c10b8ab6 Fixed typo for consistency and incorrect grammar. 2012-10-06 18:46:31 -02:00
Sebastiaan Janssen
cae2183ab4 Merge 2012-10-06 11:47:55 -02:00
Sebastiaan Janssen
07e75dab15 BaseRestExtensions.Release.config should not be in the build package, output set to None 2012-10-06 11:47:01 -02:00
Sebastiaan Janssen
5cebbd8a91 Adds a nice tooltip when hovering over the content/media picker
#U4-192 Fixed
2012-10-06 11:46:37 -02:00
Stephan
db59b08f58 fix config files for BaseRestExtension.config 2012-10-06 07:20:12 -02:00
funka@WETWIRED
2b2c75f5e4 Resolves feature request U4-192 Add more meta data to Content and Media pickers 2012-10-06 01:26:56 +07:00
Casey Neehouse
8c7b06fe2b U4-914 - Added additional security to the change password
dashboard control to require current password.
2012-10-05 21:12:12 +04:00
Sebastiaan Janssen
540db7137a Fixed config transform for BaseRestExtension.config 2012-10-05 13:45:06 -02:00
Morten Bock
a2b876608f Refactoring to use object resolver, instead of ProviderBase 2012-11-21 07:14:40 -01:00
Morten@Thinkpad-X220
ce1de7d8c8 Adds stubs for ContentService implementation U4-936.
Adds initial implementation of a simple publishing strategy U4-943.
2012-10-03 12:51:32 -02:00
Shannon Deminick
45c335702d Updated view engine to look only in App_Plugins/ not App_Plugins/Packages/.
Updated view engine to automatically create the required razor web.config in the packages
Views folder if it is not there already.
2012-10-01 23:43:47 +05:00
Shannon Deminick
bc04d4f8da Added PluginViewEngine for App_Plugins 2012-10-01 23:22:23 +05:00
Shannon Deminick
42da98e020 Moves codebehind for EditView into UI project 2012-10-01 22:09:49 +05:00
Shannon Deminick
bac038b82d Converted treeInit.aspx so that it's codebehind and designer files are in the UI project and only
the old TreeInit class exists in the Umbraco.Web project (not the aspx file). It needs to stay there
to maintain backwards compatibility for anyone that may have inherited from that file.
2012-10-01 03:57:57 +05:00
Shannon Deminick
dd6d0e380e Updated the /umbraco/umbraco.aspx page to have all of it's aspx + codebehind + designer files in the UI project and
left the original class in the Umbraco.Web project as to not break backwards compatibility for anyone that may have inherited from that
class.
2012-10-01 03:41:37 +05:00
Morten Bock
9e1c5e71e4 Adding the umbraco:image control, and the ImageUrl feature with a some generic ProviderFeature classes, to make it easier to implement future provider based features. 2012-11-21 07:13:31 -01:00
Sebastiaan Janssen
aba68720bb Localized the create window for new Scrips (js) 2012-11-21 06:54:52 -01:00
Michiel van Oosterhout
248af2eaa2 Correct code that validates the user name when the session times out by serializing
user name and password.

Adds a minified 4KB JSON library to umbraco.aspx to support older browsers, namely
https://github.com/douglascrockford/JSON-js (public domain)
2012-10-07 20:54:34 -02:00