9e2733ce69
U4-2549 - fix issue with last chance content finder
...
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
2013-08-30 12:22:36 +02:00
fbfdd8d398
Bump version number
2013-08-30 12:00:33 +02:00
e921c670dd
Another missing package file
2013-08-30 10:54:28 +02:00
d559411187
Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse
2013-08-30 10:45:13 +02:00
a057e9bcbd
Missing file in vs csproj
2013-08-30 10:32:31 +02:00
d004d529b7
New dashboard using angular
2013-08-30 10:17:46 +02:00
9b56c7eab6
Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse
2013-08-30 14:15:51 +10:00
c62689450b
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0
2013-08-29 17:28:46 +02:00
e65a71a05a
Added code to pre-select the current node in content tree pickers based on the location of the document in the tree.
...
This is a HUGE time saver with an even moderately complex site hierarchy.
2013-08-29 11:14:51 -04:00
e16ebecda4
Merge branch '6.1.3-clean' into select-parent-on-movecopy
2013-08-29 11:09:20 -04:00
0ed4c1868b
U4-2549 - fix it differently
2013-08-29 17:08:16 +02:00
2238f81d83
Oops, accidentally killed creating a partial view from the backoffice as it's also using PartialViewTasks.cs (like when you create a partial view macro)
2013-08-29 16:09:23 +02:00
4ef10c8afe
Install a default member type during initial setup
2013-08-29 13:54:30 +02:00
aa0fca5de9
Fixes small error with entityresouce, adds app based security to some of the entity controller methods, need to add diff sec checks to the other ones based on the type requested.
2013-08-29 20:15:08 +10:00
733b6aa945
Completes: U4-2742 Remove legacy xsltExtensions.config - xslt extensions are configured using attributes
2013-08-29 17:14:34 +10:00
cd7f737fa6
Removes remaining references to the restExtensions.config
2013-08-29 15:55:58 +10:00
89324370b4
Completes U4-2415 Remove legacy RestExtensions and restExtensions.config
2013-08-29 15:50:48 +10:00
f7e7687f27
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
.gitignore
build/Build.bat
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Models/PropertyExtensions.cs
src/Umbraco.Core/TypeFinder.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/ClientDependency.config
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoContext.cs
2013-08-29 15:18:19 +10:00
232c81543a
Fixes the rest of U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia
2013-08-29 12:11:48 +10:00
3fc4f36859
U4-2549 - fix issue with last chance content finder
...
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
2013-08-28 18:16:20 +02:00
49637e62fe
Updated, more robust versions of the Member template/snippets
2013-08-28 17:52:06 +02:00
f26d759c84
Moved controllers and models as per Shannon's suggestion
...
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
2013-08-28 13:36:04 +02:00
0ebe9ec0fa
Updated some of the property editor API to ensure that when formatting data for persistence we have access to the pre-values as well since these might need to be used to format the persisted data. Completed the new property editor: Multiple text box and it is saving the data in a backwards compatible format. Changed the internal AsDictionary method of the pre value collection to be a public method called FormatAsDictionary.
2013-08-28 17:53:31 +10:00
8274883fa5
Bump version number to 6.2.0
2013-08-28 09:09:21 +02:00
cb368b4335
Implemented the numeric property editor
2013-08-28 13:30:05 +10:00
d257835cb5
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Models/ContentTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-08-28 11:08:23 +10:00
0cb084b9d1
Removes images that shouldn't be checked in
2013-08-28 09:51:19 +10:00
86276206d5
Add register member partial view macro template
2013-08-27 19:29:15 +02:00
8b1fcf3e07
Media dialog upload and folder creation
2013-08-27 16:01:39 +02:00
23e4003af0
U4-516 - Fix DatePicker with time default value
...
Enables the standard jQuery date picker to parse the current value of
the field correctly, this prevents it from defaulting to Today and
overwriting the currently stored value.
2013-08-27 12:04:20 +01:00
53b6fb7b56
Add login template to partial view macros
2013-08-27 11:37:20 +02:00
f25d1ec917
Fixes readonly validator issue
2013-08-27 10:07:48 +02:00
d81ccecd10
Media service
2013-08-27 10:05:36 +02:00
c03839d985
ImageCropper
...
- Media Picker grid
- Image Cropper dialog
- Updated Font Awsome to 3.2.1
2013-08-27 09:52:13 +02:00
d17b2cf884
Added ability to have predefined templates for Partial View Macros
2013-08-26 17:28:15 +02:00
b86f2474d5
missing files
2013-08-26 14:48:58 +02:00
2345a5e133
U4-2477 Member editing - Indicate which box is active and which is inactive
2013-08-26 13:45:09 +02:00
3708b0de65
Got value editors being able to handle 'object' not just string so we can post and return json structures directly to the angular editors, got the multiple drop down list working and saving data. U4-2704 Change property editor value editor to return/receive object instead of string
2013-08-26 18:03:35 +10:00
5b289a4971
Implemented much more for the new drop down property editors to ensure backwards compatibility, had to implement a new required method for property editors to format their data for cache storage. Changed how the drop down angular list is generated, now it uses a dictionary which is much more elegant with less code. Got drop down (normal) and drop down publishing keys working and saving the correct data types, nearly have drop down list multiple working but going to change the property editors to be able to post object (json) instead of just a string for values.
2013-08-26 17:24:08 +10:00
ab8e6b8f33
Merge branch 'wip-dragdrop2' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-dragdrop2
2013-08-25 17:26:08 +02:00
76d0ffb797
Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui
...
Conflicts:
.gitignore
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/ClientDependency.config
src/Umbraco.Web/Umbraco.Web.csproj
2013-08-25 15:50:07 +02:00
6437179a83
Merge pull request #112 from dampee/6.1.3
...
U4-2638 Developer/Packages/Install Starterkit give 500 server error
2013-08-25 05:36:49 -07:00
a7754c7e8c
image helper rename
2013-08-23 15:43:23 +02:00
fe7d61ef37
The completed markdown sample
2013-08-23 15:40:20 +02:00
13afb127f4
Whoops, broke build, now fixed
2013-08-23 14:19:16 +02:00
b850cd68a1
csproj file updates
2013-08-23 12:22:37 +02:00
1e76cf67d3
Fix merge problem
2013-08-23 08:57:02 +02:00
baaecedac2
Finetuning html adding prevalue editors
2013-08-22 14:46:43 +02:00
61149f8112
Merge branch '6.1.4'
...
Conflicts:
.gitignore
src/Umbraco.Web.UI/install/steps/database.ascx
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
src/umbraco.editorControls/mediapicker/mediaChooser.cs
2013-08-22 14:46:11 +02:00
49dc33c713
Fixes up the content editor js, updates some docs to reflect correct naming conventions.
2013-08-22 13:03:12 +10:00
Stephan