1f30a427b0
Reverted Tea commerce commit
2013-07-04 12:30:52 +10:00
e4df176a37
U4-2417: show media picker image as link to the original image.
...
Order of the views in the markup did not match the order of the Style enum.
ImageViewer control now selects the view by matching the ViewerStyle enum to a View ID. This way the order of the views in the markup is no longer important.
Also:
Removed user control from Umbraco.Web project, moved designer code and added code behind class for user control to Umbraco.Web.UI
Refactored code to use Umbraco.Core.IO
Removed some code that was commented out
2013-07-03 17:36:28 +02:00
01d55625d5
merge
2013-07-03 14:04:00 +02:00
693c0cb2a5
working modals
2013-07-03 13:55:33 +02:00
f06a6f42da
Updating nuget dependency for ClientDependency
2013-07-03 11:20:42 +02:00
9d4e1362c4
Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release
2013-07-03 11:11:37 +02:00
0d54e8df89
Updating MySql package dependency
2013-07-03 11:00:26 +02:00
d85c454012
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
...
Conflicts:
src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
2013-07-03 16:10:10 +10:00
2e636d5bcb
fixes testing due to wrong httpbackend injection
2013-07-02 15:46:50 +02:00
ff410a9d7f
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
...
Conflicts:
src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
2013-07-02 17:47:57 +10:00
3779e79367
Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations.
2013-07-02 17:47:20 +10:00
0e431ffd3c
File rename, refactor $httpBackend mocks
2013-07-02 09:17:32 +02:00
9e419f9bcc
Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
2013-07-02 12:58:40 +10:00
357e29ebe1
implemented section resource and mocks to load in the sections (applications)
2013-07-02 12:57:28 +10:00
32d7b88b45
Removes the ng-hide when unauthed
...
Not needed anymore, still something weird with the retry queue tho
2013-07-01 16:17:20 +02:00
2b13dff769
Fixes login and tree
...
Adds tree loader, fixes icons, fixes toggle arrows
Refactors httpbackend into nicer system
Testing of promises are broken :(
TODO: update docs
2013-07-01 16:06:41 +02:00
0d44189f7f
Mocked login works again
2013-07-01 09:58:10 +02:00
388f55d7fd
Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found.
2013-07-01 14:23:56 +10:00
2fd9efffa1
Styling of drop zone for draggable document type properties
2013-06-29 23:37:02 +02:00
f4eb8c7517
Localised no properties message
2013-06-29 22:57:53 +02:00
ef0744a849
Drag/drop UI for document type properties and tabs
2013-06-29 22:42:15 +02:00
adeb859195
Reload content page when document type changed if content already loaded; improved display of confirmation screen
2013-06-29 22:30:12 +02:00
aaec90e47a
Used override on change document type to clear properties; display of summary on completion
2013-06-29 21:54:48 +02:00
d926180e3a
Added special overload for creating a connection string with integrated security.
...
Actually disable checkbox is the selected database type is not Microsoft SQL Server.
Refactored saveDBConfig for readability.
2013-06-28 16:40:23 +02:00
ad766a2544
Authentication almost done
...
Missing some styling and we are good to go on promised based
authentication
2013-06-28 15:49:28 +02:00
ffce1a3e6b
Open new branch for 6.1.3
2013-06-28 14:44:56 +02:00
72bb1b3583
U4-667
...
Added a script to make the checkbox "Render content in editor" dependent on the "Use in editor" checkbox.
Also refactored the create.aspx code-behind so it's easier to see what control is loaded in the dialog when debugging.
2013-06-28 10:44:24 +02:00
e980296d6d
Enabled support for integrated security for SQL Server to the installer.
2013-06-28 10:39:48 +02:00
a077836936
Implemented the required/regex validation that is applied to PropertyType's on a Document type (this might be temporary if we get around to implementing pre-value overrides). Changed the name from ManifestValueValidator to just ValueValidator and allows for property editors to override the defaults if they need to change how the regex/required validation is processed against the property's value. Have streamlined all of the validation directives to require an FormController which we then listen to. Have removed valBubble as we don't actually need that functionality anymore and this simplfies input elements too.
2013-06-28 12:23:15 +10:00
9d0f544840
Handled inherited properties on source and destination side
2013-06-27 22:24:10 +02:00
3ecd564c57
Sync tree once document type changed
2013-06-27 21:49:06 +02:00
9c23bbd87a
Minor styling improvements
2013-06-27 21:44:53 +02:00
d3562b797e
Back-office UI for change of document type for content item
2013-06-27 21:29:27 +02:00
d23482b7a6
Moved setting for DefaultDocumentTypeProperty from GlobalSettings to UmbracoSettings
2013-06-27 16:00:49 +02:00
4368f15097
Updating nuspec files which is a bit different for 6.1.x then 6.0.x
2013-06-27 15:36:25 +02:00
b90150279b
Merge branch '6.0.7' into 6.1.2
...
Conflicts:
build/Build.proj
build/NuSpecs/UmbracoCms.Core.nuspec
src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
2013-06-27 15:27:31 +02:00
5c09ba9a2d
Updating nuspec files and build
2013-06-27 15:15:27 +02:00
7a89cf1ffd
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-06-26 11:12:24 +02:00
d214935ecb
Panel, Tabview, Propertie controls converted
...
Changed the html to output bootstrap html, masterpages load our belle
css + bootstrap.min.js
2013-06-26 11:12:06 +02:00
d47ff4005c
Support for deleting member groups with apostrophes
2013-06-26 06:16:39 +02:00
6ee1171e9c
Got tab validation indication working.
2013-06-26 13:01:40 +10:00
fe23502e67
Added code to actually pre-select the parent node instead of just locating it in the tree. This seams keeps the Ui in a sane state.
...
Updated control code in Umbraco.Web.Ui from Umbraco.Web.
2013-06-25 15:48:16 -04:00
d290ea81a2
css class adjustments for test prop ed
2013-06-25 22:49:27 +10:00
3de98b60c4
fixes prop editor view path
2013-06-25 22:15:33 +10:00
5148687ed3
Wired up validation elements and have server side validation nearly working properly
2013-06-25 22:10:39 +10:00
808d9fe589
Removes umbpropertyinclude directive since we won't be lazy loading js files for prop editors, they'll be included in the manifest. Fixes JS errors from grunt after re-enabling some of the validation stuff. Had to adjust the jshint build to ignore some of the warnings.
2013-06-25 14:54:42 +10:00
a2e16b4922
Fixed up gravatar with a watch, started implementing legacy proxy JS notification calls to our angular services.
2013-06-25 14:02:31 +10:00
68a648d3ba
Merge remote-tracking branch 'origin/6.1.2' into 7.0.0
...
Conflicts:
.hgignore
2013-06-25 10:01:23 +10:00
39d7676bee
Got the legacy editors working and iframe implementation almost done!
2013-06-25 08:54:36 +10:00
bd77463fa4
Merge branch '6.0.7' into 6.1.2
...
Conflicts:
build/NuSpecs/UmbracoCms.Core.nuspec
src/Umbraco.Core/Models/ContentTypeBase.cs
src/Umbraco.Core/Models/IContentTypeBase.cs
src/Umbraco.Core/Models/PropertyGroupCollection.cs
2013-06-24 12:06:58 +02:00
Shannon