perploug
|
c5000b9656
|
Better click detection for closing dialogs
|
2013-09-18 13:11:19 +02:00 |
|
perploug
|
408740b3dd
|
Iconpicker dialog to use promise
|
2013-09-18 13:10:16 +02:00 |
|
perploug
|
13baaf5182
|
Changes icon loading into a promise
|
2013-09-18 13:10:03 +02:00 |
|
perploug
|
445e749372
|
Fixes: Legacy dialogs couldnt close
|
2013-09-18 13:09:40 +02:00 |
|
perploug
|
9e7cd28ab4
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-09-18 09:01:43 +02:00 |
|
perploug
|
fe71974ce4
|
updated docs to use alias
|
2013-09-18 08:59:51 +02:00 |
|
Shannon
|
09b2a1f5d0
|
updated entity resource docs
|
2013-09-18 15:39:17 +10:00 |
|
Shannon
|
503d28ae92
|
Fixes up entity resource to use the correct methods of entity controller and anything that was referencing those methods.
|
2013-09-18 15:35:52 +10:00 |
|
Shannon
|
3e03fea1ae
|
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
|
2013-09-18 10:49:18 +10:00 |
|
Shannon
|
544bb4eb81
|
Added ability to launch a native angular modal window from an iframe, starts creating the macro parameter dialog for templates.
|
2013-09-18 10:49:10 +10:00 |
|
perploug
|
4b3db20d90
|
Fixes bug with multiple TinyMCE editors on the same page
|
2013-09-17 13:43:38 +02:00 |
|
perploug
|
b8ae98ab13
|
Updates TinyMCE to 4.0.6
|
2013-09-17 13:43:19 +02:00 |
|
perploug
|
2ac84a467d
|
rte.controller
|
2013-09-17 12:50:20 +02:00 |
|
perploug
|
e452ff6e36
|
Adds editor context
Enables property editors to access the complete entity when editing
|
2013-09-17 12:44:52 +02:00 |
|
perploug
|
6a026ab489
|
Fixes broken datatype editor
|
2013-09-17 11:15:20 +02:00 |
|
perploug
|
aee411517b
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-09-17 10:25:34 +02:00 |
|
perploug
|
740a3fd534
|
force commit to refresh
|
2013-09-17 10:25:19 +02:00 |
|
Tim Geyssens
|
193a991349
|
Fixes error with rte embed dialog
|
2013-09-17 08:10:56 +02:00 |
|
Shannon
|
371b1817ea
|
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias
Conflicts:
src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
src/Umbraco.Core/XmlHelper.cs
src/Umbraco.Tests/ObjectExtensionsTests.cs
src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
src/Umbraco.Web/Routing/DefaultUrlProvider.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/macro.cs
|
2013-09-17 00:27:17 +10:00 |
|
Shannon
|
86a5d16e25
|
Added moq (need to replace all rhino mock later) allowing us to nicely mock umbraco settings, fixing up more unit tests.
|
2013-09-17 00:14:15 +10:00 |
|
perploug
|
bb641c937c
|
Userpicker propertyeditor
|
2013-09-16 16:06:11 +02:00 |
|
perploug
|
0a2fa12b58
|
New treepicker
|
2013-09-16 16:05:56 +02:00 |
|
perploug
|
681ce4abb3
|
init load on folderbrowser
|
2013-09-16 15:19:46 +02:00 |
|
perploug
|
6288c672e1
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-09-16 14:52:41 +02:00 |
|
perploug
|
3965413d5d
|
Fixes: U4-2647 adds folderbrowser with drag/drop support
|
2013-09-16 14:52:26 +02:00 |
|
perploug
|
7681fb1925
|
Updated icon and media picker htm to new styles
|
2013-09-16 14:51:48 +02:00 |
|
perploug
|
53e9bd187e
|
Thumbnails styles improvement
|
2013-09-16 14:51:26 +02:00 |
|
perploug
|
46db322538
|
Improved ng-error styles
|
2013-09-16 14:51:13 +02:00 |
|
perploug
|
fdfb019ea7
|
User password change dashboard
|
2013-09-16 14:50:56 +02:00 |
|
Tim Geyssens
|
f38fc69ec7
|
More changes to rte embed stuff related to Shannons comments
|
2013-09-16 12:31:07 +02:00 |
|
Tim Geyssens
|
940f7f4534
|
Some more minor updates to the tiny mce embed stuff
|
2013-09-16 11:31:27 +02:00 |
|
Tim Geyssens
|
ecbaa94ab5
|
Update to rte embed stuff following Shannons comments
|
2013-09-16 10:05:33 +02:00 |
|
perploug
|
b6d00cca63
|
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
|
2013-09-16 09:18:02 +02:00 |
|
perploug
|
135701b845
|
change password dashboard form
|
2013-09-16 09:17:46 +02:00 |
|
perploug
|
99dc128b8f
|
user dialog scaling issue
|
2013-09-16 09:17:19 +02:00 |
|
perploug
|
078c698601
|
dashboard headline padding
|
2013-09-16 09:17:07 +02:00 |
|
perploug
|
ad62b96909
|
Categorised directives into seperate folders
|
2013-09-16 09:15:54 +02:00 |
|
Tim Geyssens
|
34bc27745e
|
Adds loader animation
|
2013-09-13 14:22:01 +02:00 |
|
Tim Geyssens
|
2a16e05699
|
Some more small changes to the embed dialog
|
2013-09-13 14:13:58 +02:00 |
|
Tim Geyssens
|
d3f1d6bb6b
|
Small change to embed controller js
|
2013-09-13 14:06:56 +02:00 |
|
Tim Geyssens
|
bc7bbea650
|
Initial checkin of the rte embed option
|
2013-09-13 13:46:19 +02:00 |
|
perploug
|
805ebd950e
|
Fixes: U4-2725 broken headline validation
|
2013-09-12 14:52:13 +02:00 |
|
perploug
|
0037283c75
|
Adds a notifications test
|
2013-09-12 14:40:07 +02:00 |
|
perploug
|
8c71195244
|
Seperates modal columns and panels html
|
2013-09-12 14:39:36 +02:00 |
|
perploug
|
852a946051
|
Fixes the grid height issues
|
2013-09-12 14:38:53 +02:00 |
|
perploug
|
377d72b5da
|
better handling of closing dialogs
|
2013-09-11 14:03:59 +02:00 |
|
perploug
|
c3e67a2144
|
chore: less cleanup
|
2013-09-11 14:03:28 +02:00 |
|
perploug
|
998e8bf9bd
|
Updates header css class to include padding
|
2013-09-11 14:03:13 +02:00 |
|
Shannon
|
968c921829
|
Finished the new installer screen report, finished and tested the v7 db upgrade script which is working!! :) Changed over all package manifests to have an alias instead of a GUID.
|
2013-09-11 18:25:51 +10:00 |
|
Shannon
|
15518f2069
|
Completes: U4-2749 Fix auth filters to return 401 when not logged in and 403 when the user has no access - adds ngSanitize which is required for ng-bind-html so we can add a bit of html to the notification msgs (like line breaks) and since devs might do this as well we require ngSanitize so that unsafe html cannot be injected.
|
2013-09-11 12:40:43 +10:00 |
|