e75c050eff
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
...
Conflicts:
src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Services/PackagingService.cs
src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
2013-09-11 13:07:22 +10:00
90abe8c25f
Fixes: U4-2823 RenderRouteHandler.GetUmbracoRouteDefinition() fails to store the route definition when an incidental alias-controller match is made
2013-09-11 12:15:29 +10:00
3aa9873db9
legacy Editmacro editor tweaks
2013-09-10 23:33:26 +02:00
4a84b039c1
remove debugging alert
2013-09-10 18:04:03 +02:00
17833022a3
Update dev section editors
2013-09-10 18:03:50 +02:00
d5846a5a4c
delete unneedded files
2013-09-10 18:01:52 +02:00
f1dda1b86c
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-09-10 15:09:36 +02:00
ae24b280ec
Base classes on index and dialog
2013-09-10 15:07:17 +02:00
aeb3b466dc
Simple create dialog html
2013-09-10 15:07:01 +02:00
b097f33bc9
Fixes: U4-2789 Tree.config registeres tree inconsistently
2013-09-10 18:28:45 +10:00
8d83dc462d
Fixes: U4-2777 Get legacy tree pickers working - calls the close callback by inside of the umb client mgr instead of having to modify the dialogservice, this works well for legacy pickers.
2013-09-10 17:58:59 +10:00
404062b4d0
Removes committed code for contour installation.
2013-09-10 17:41:32 +10:00
4957acb8d3
Completes: U4-2693 Make package.manifest less complex - WARNING: You need to upgrade your package.manifest files to support the new syntax. If you don't have validation specified then you just need to update the "prevalues" key. See the issue for details.
2013-09-10 17:20:13 +10:00
e962e86c3c
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/StringExtensions.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
src/Umbraco.Web/Umbraco.Web.csproj
2013-09-10 11:49:05 +10:00
41766d7738
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-10 11:29:11 +10:00
6bc8713b7f
Remove vaue->value typo in all files
2013-09-09 15:26:22 +01:00
58ba7d2d6d
Fixes U4-502 TextString/TextBox multiple don't accept polish Ś character
2013-09-08 21:29:20 +02:00
edd9aa80ae
Fixes U4-489 Installer, link to folder permission video broken
2013-09-08 21:18:00 +02:00
7ddb77db66
Fixed U4-576 Umb 4.7.x - Dashboards
2013-09-08 21:06:22 +02:00
303c1e16b8
Change document type did unnecessary checks on root node which resulted in YSOD
2013-09-06 16:17:08 +02:00
b3ec44b61d
Getting all the unit tests working again with the GUID to alias change, lots of little fixes everywhere.
2013-09-06 17:50:31 +10:00
cf6a3cdfef
A bunch more work done to convert the GUID -> alias for prop eds
2013-09-06 16:00:35 +10:00
78741bf134
more work on removing the GUID requirement for prop editors, removes legacy editDataType webforms editor (U4-2801 Remove legacy/un-used editDataType.aspx webforms editor)
2013-09-06 15:27:38 +10:00
038780614c
Re-deletes files that should not be committed! Seriously WHY DOES THIS KEEP HAPPENING??! Have updated the ignore to try and stop this
2013-09-05 14:38:22 +10:00
cab92d203e
Delete contour files checked in by mistake
2013-09-04 21:08:48 +02:00
8e93cfa94d
merge
2013-09-04 16:00:30 +02:00
b105bd305b
Ok, getting pretty close to making those legacy tree dialogs work.
2013-09-04 18:10:57 +10:00
be9c3b8996
Got a solution for legacy dialog trees with the new format trees, just committing all of the work in case i need to come back and reference some stuff I'm about to remove.
2013-09-04 17:36:05 +10:00
70eb3e8613
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
.gitignore
src/Umbraco.Core/Models/PropertyExtensions.cs
src/Umbraco.Tests/Models/DataValueSetterTests.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
src/Umbraco.Web/Controllers/RegisterController.cs
src/Umbraco.Web/Models/ProfileModel.cs
src/Umbraco.Web/Models/RegisterModel.cs
src/Umbraco.Web/Models/UmbracoProperty.cs
src/Umbraco.Web/UmbracoModule.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
2013-09-03 17:30:08 +10:00
7c9f5eda9d
Fixes up more permissions checks, refactors MediaController.PostAddFile to use the correct WebAPI usage. Fixes issue with UmbracoClientManager throwing errors because the treeProps didn't include all called props.
2013-09-03 16:35:36 +10:00
aee521ce1a
Fixes: U4-2770 Legacy content dialogs doesnt render and removes a file that shouldn't have been committed.
2013-09-03 12:27:48 +10:00
020623acd3
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-09-02 17:09:16 +02:00
ede8f837a0
media picker item html
2013-09-02 17:08:27 +02:00
5b2705181b
Styling Mediapicker dialog
2013-09-02 15:44:41 +02:00
623a28c158
delete fontawesome
2013-09-02 15:40:14 +02:00
2a0878a071
move markdown editor to umbraco.packages module
2013-09-02 15:34:35 +02:00
2fb55cb831
Enhanced permission checking on views and snippets
...
Thanks to Richard Turnbull from NGS Secure Research who discovered a
minor issue that made it possible for authenticated Umbraco Users to
view files beyond their permissions
2013-09-02 14:23:27 +02:00
0e6a926a3f
Merge branch '6.1.5'
2013-09-02 12:24:26 +02:00
a99794c34c
Fixed up a couple things based on code review
2013-09-02 17:43:56 +10:00
0be1604163
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-09-02 16:37:02 +10:00
5478de911b
Merge pull request #115 from stocksr/6.2.0
...
U4-516 - Fix DatePicker with time default value
2013-09-01 17:24:03 +02:00
fdfb6187e9
Removing SVG from staticContent before addings it.
2013-09-01 16:51:00 +02:00
e9b9fb15c1
Can't install starterkits message was always showing, even if install folder was present
2013-09-01 16:47:28 +02:00
3d4b54064f
I love managing files in csproj files.. NOT.
2013-09-01 15:32:55 +02:00
14303fab0c
File move didn't make it into the csproj file previously, leading to build errors. Fixed!
...
Also changed default PartialView template and added another Empty one
2013-09-01 15:05:17 +02:00
262ef8d305
Merge pull request #115 from stocksr/6.2.0
...
U4-516 - Fix DatePicker with time default value
2013-09-01 05:34:18 -07:00
69830f28c2
Added SVG as static content so SVG-icons in the backoffice will be served by IIS
2013-09-01 14:05:54 +02:00
7806762b80
Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase.
2013-08-31 11:28:19 +10:00
c7c3bb6183
Forgot to update the dashboard.release.config
2013-08-30 12:29:48 +02:00
4d5a8298b0
U4-2549 - fix it differently
2013-08-30 12:22:58 +02:00
Shannon