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

207 Commits

Author SHA1 Message Date
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@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
Shannon Deminick
b40dbf73ca Changes case back to the correct EditView 2012-10-01 03:00:05 +05:00
Shannon Deminick
7623746f64 changed editViewTEMP to EditView with correct casing. 2012-10-01 02:52:58 +05:00
Shannon Deminick
3152427ff7 Changed name of editView to editViewTEMP in order to change it back to the correct case. 2012-10-01 02:52:28 +05:00
Stephan
3cddc5e4dc merge 2012-09-30 14:04:38 -02:00
Sebastiaan Janssen
be2ed3762b Merge 2012-09-30 06:46:37 -02:00
Sebastiaan Janssen
e3abd49276 Fix regression bug 2012-09-30 06:46:08 -02:00
Stephan
926427ff68 merge 2012-09-28 11:14:04 -02:00
Stephan
abe4944843 routing - handle when umbraco is not ready or has no content 2012-09-28 11:11:47 -02:00
PerPloug
04e0b35c7d Method Renaming to follow standards 
Marking IOHelper methods as internal
Removing unneeded umbraco setting
Missing icon and missing folder in UI project
 2012-09-28 09:19:16 -02:00
Stephan
6c4869f931 merge 2012-09-28 07:08:37 -02:00
Stephan
a469e3dbe3 fix base/rest service - cleanup + new config file 2012-09-27 15:37:21 -02:00
PerPloug
c409cfa421 Create/Ui.xml file for templates 
umbracoSettings.config file
 2012-09-27 06:29:41 -02:00
Shannon Deminick
f7f83bc057 Changed IPublishedContentStore and IPublishedMediaStore back to internal as we don't need to expose these yet. Instead have added 
an UmbracoHelper property to the PluginController class which will expose any methods needed by devs to retreive media or content.
Have updated UmbracoHelper with loads of new helpful methods and moved the Wrap methods to HtmlHelper extensions because this is purely to
do with rendering html (have written unit tests for it too).
Updated some 'library' methods to proxy calls to UmbracoHelper so we only have to maintain one set of code.
Added a convenience property to UmbracoContext to return the current NiceUrlProvider so you don't have to go through the RoutingContext to get it.
 2012-09-27 08:30:35 +07:00
Shannon Deminick
530e7ae44e removed ref to missing template file 2012-09-27 07:06:14 +07:00
Sebastiaan Janssen
f76e90990f Include packages.config anyway, just tell it to not output in the build 2012-09-26 11:58:52 -02:00
Sebastiaan Janssen
587542ace7 The build.bat file now won't exit when there's an error so you can inspect it, if there's no errors it will just exit 
Excluded missing index.cshtml file from project (was giving build error)
 2012-09-26 06:48:11 -02:00
Shannon Deminick
05add96294 Ensures web.config includes new namespace reference 2012-09-26 13:43:47 +07:00
Shannon Deminick
9b5fd3d67b Merge 2012-09-26 13:42:44 +07:00
Shannon Deminick
332b42aa49 Changed how surface controllers are routed: because we don't load plugins in via App_Plugins/[PackageName] like we did in v5 which meant that we can autoroute all plugin controllers with their own areas, in v4 we have to do something different. 
Instead (because we still want areas), we have an attribute called PluginControllerAttribute which allows a dev to assign an area name as a string. A package developer should always ensure that all of their plugin controllers are assigned to the same
area. This also lets us get rid of the GUID id part of the plugin (hopefully we can leave it out, just need to run some tests). Since we have areas, package devs can then put their views into
their own folders and not clutter up the local devs ~/Views folder. Perhaps we use App_Plugins/[PackageName] for the views like we did in v5 but need to ask on the mail list. Otherwise it will be the standard MVC:
~/Areas/[AreaName]/Views which will still also clutter up the local devs view folder if they are using Areas.
 2012-09-26 11:04:07 +07:00
Sebastiaan Janssen
97472c6ce6 Ignore file excluded the web.config file in the views folder, which is why the build failed, not because it wasn't included 2012-09-25 11:56:33 -02:00
Sebastiaan Janssen
48a3a920d2 Web.config file was not included, making the build fail 2012-09-25 11:53:27 -02:00
Shannon Deminick
083b18139a Adds code to RenderViewEngine to ensure the /Views folder exists and also that the razor web.config file exists there too. 
I've also added this web.config file to the sln so it should output in the build by default though it will still be created automatically if
its not there.
 2012-09-25 11:20:05 +07:00
Shannon Deminick
1bc3943f33 Fixes: #U4-894 - moves the int Priority out of the IThumbnailProvider class as it is only metadata, moved 
this into a new generic WeightedPluginAttribute which can be used for other resolves/objects that require a weight.
 2012-09-25 11:06:32 +07:00
Hendy@Blueberry
2fcb9d7b30 added uQuery.IGetProperty - allows GetProperty<T> extension methods to pass T hydration to a method in T 2012-09-23 10:34:39 -01:00
Sebastiaan Janssen
ccbcb991b1 Text for Alias is changed to Alternative link 
#U4-891 Fixed
 2012-09-22 12:14:42 -02:00
sebastiaan
33f4da875a Additional fix for #U4-306 - click to the right of the node still collapsed the tree 2012-09-22 10:54:22 -02:00
sebastiaan
d89a24d96b Tree disappears if you click slightly below the root node 
#U4-306 Fixed
 2012-09-20 17:02:07 -02:00
Stephan
3a21d48dbc merge 2012-09-20 14:38:08 -02:00