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

12998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
d7fc15dd67 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-24 11:15:46 +02:00
Shannon
fde162b086 Fixes up bower installer, no longer using grunt-bower-task since it is old and doesn't support the copying that we need, updates to latest bower dependency 2015-06-24 11:15:04 +02:00
Mads Rasmussen
73e54ea402 test out controller as syntax for sub views controllers + fix problems with the sub views directive caused by this approach 2015-06-24 11:00:00 +02:00
Shannon
c64bd5f65a Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
 2015-06-24 09:52:46 +02:00
Shannon
32e0cbc886 updates bower/grunt file for new ng file upload 2015-06-24 09:51:36 +02:00
Per Ploug
1e5b8eb0fc Removes unused bower dependencies from bower.json 2015-06-23 22:59:17 +02:00
Per Ploug
dada265736 Adds jquery event unbinding 
Updates the dom event binding to use the newer on/off instead of
bind/unbind.
Adds off() to all dom event directives triggered by scope.on($destroy).
 2015-06-23 22:58:47 +02:00
Shannon
aad82360ad Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/app.dev.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-06-23 18:27:18 +02:00
Shannon
7503a83219 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-23 18:10:57 +02:00
Shannon
869e0dcbd2 Updates the upgrader to ensure that the latest migrations are run if they don't exist, fixes the migration runner null check, adds test to subtract a revision number from a Version object. 2015-06-23 18:10:50 +02:00
Per Ploug
a53166828a Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-23 14:08:15 +02:00
Per Ploug
3212bfa4b6 New upload field + dependencies 2015-06-23 14:08:02 +02:00
Mads Rasmussen
da18a89540 move design view logic from edit.controller to design.controller 2015-06-23 13:58:43 +02:00
Stephan
a814b51682 U4-6675 - in-memory temp media cache 2015-06-23 13:57:00 +02:00
Shannon
c204741fb9 Fixes up unit test for testing back office request to ensure that the GlobalSettings.Path is consistent with a vdir 2015-06-23 12:30:09 +02:00
Shannon Deminick
5f64b2cf37 Merge pull request #723 from tomfulton/fix/u4-6346 
Fix unable to login to backoffice when using virtual directory - U4-6346
 2015-06-23 12:16:36 +02:00
Shannon Deminick
9efa67224e Merge pull request #722 from tomfulton/fix/u4-6346-2 
Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346
 2015-06-23 12:13:32 +02:00
Mads Rasmussen
7b547a3ad1 create service for data type helper function. call createPreValueProps from helper service 2015-06-23 11:39:54 +02:00
Mads Rasmussen
759599b426 call addInitTab from new service 2015-06-23 11:18:02 +02:00
Shannon
b00776901c Changes the routing context to be publicly accessable on the umbraco context. 2015-06-23 11:15:56 +02:00
Mads Rasmussen
f4aff7752c move content type logic from controller to new service 2015-06-23 11:13:20 +02:00
Shannon Deminick
37211b9a2c Merge pull request #721 from robertjf/dev-v7 
Issue U4-6734 Fix: Tweaks to TreePicker dialog for better entity support
 2015-06-23 11:09:02 +02:00
Shannon
40c35e5851 Fixes: U4-6582 RTE "Link To File" missing rel="nodeId" attribute 2015-06-23 10:53:56 +02:00
Per Ploug
10a5fd91c7 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-23 09:57:27 +02:00
Per Ploug
2e2f8723a0 Set collections on property groups 2015-06-23 09:56:59 +02:00
Per Ploug
efd231f6a9 Core Constants Icons class 2015-06-23 09:56:19 +02:00
Shannon
68073fdb8b Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-23 09:41:41 +02:00
Mads Rasmussen
ea9604c260 sorting: disable properties/tabs when inherited. Remove sorting animation. 2015-06-23 09:25:29 +02:00
Tom Fulton
5eb9138775 Fix IsBackOfficeRequest returning false for virtual directory paths - U4-6346 2015-06-22 16:26:35 -04:00
Tom Fulton
cb6b8434f0 Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346 2015-06-22 16:12:13 -04:00
Shannon
ff7bdb0f5b Ensures the migrations table is created on install, updates the installation to create the latest migration version once complete. 2015-06-22 19:31:34 +02:00
Shannon
38953212a3 Fixes up some unit tests with changes to migration runner, creates unit tests for ApplicationContext.IsConfigured, updates DatabaseContext to be able to mock some methods. 2015-06-22 18:59:44 +02:00
Shannon
8e1e7a8676 Gets the IsConfigured check checking the migration data, updates the install controller to ensure there's no infinite redirects and to use the IsUpgrading flag. Now to add entries to the table when the migrations have executed. 2015-06-22 16:22:47 +02:00
Stephan
a296437547 Fix test that fails in Release mode 2015-06-22 15:50:41 +02:00
Stephan
012c3289cd U4-6675 - in-memory temp media cache 2015-06-22 15:50:22 +02:00
Mads Rasmussen
a1498b6242 use compareArray filter to filter out data types from property editors 2015-06-22 15:04:19 +02:00
Mads Rasmussen
2067d65704 use compareArray filter to compare selected templates with available templates. Clean up controller 2015-06-22 15:03:02 +02:00
Mads Rasmussen
fbc2a6fb4b use compareArray filter to compare selected nodes with available nodes. Clean up controller 2015-06-22 15:01:52 +02:00
Mads Rasmussen
4e2143264c created a custom filter to compare two arrays and remove duplicates based on a compare property 2015-06-22 14:59:25 +02:00
Mads Rasmussen
ad52ae0ddb change margins on lock icon 2015-06-22 09:29:26 +02:00
Mads Rasmussen
4d1954cc84 use alias directive in header and property settings dialog 2015-06-22 09:28:50 +02:00
Mads Rasmussen
4aa572629f create directive for generating aliases - still needs server side validation 2015-06-22 09:27:42 +02:00
Mads Rasmussen
5e3d32c88b umb blocked field directive - allow changing lock from outside the directive 2015-06-22 09:17:08 +02:00
Mads Rasmussen
54f6084189 fix issues with split and merge composite content types 2015-06-22 09:13:47 +02:00
Mads Rasmussen
f1a2883cd6 forgot rename of remove tab function 2015-06-22 09:12:23 +02:00
Sebastiaan Janssen
48dd3fe0c7 Update test for mapper added in commit a1d7f2d8 2015-06-21 15:24:50 +02:00
Sebastiaan Janssen
367d82d103 Experiment with less verbose logging for the build (so AppVeyor is easier to use) 2015-06-21 14:51:17 +02:00
Sebastiaan Janssen
b7aadaa3d2 Experiment with less verbose logging for the build (so AppVeyor is easier to use) 2015-06-21 14:41:18 +02:00
Robert Foster
05d59bba73 Merge remote-tracking branch 'upstream/dev-v7' into dev-v7 2015-06-20 09:42:09 +10:00
Robert Foster
d5baa586cf Adds the ability to provide the Entity Type to the treepicker dialog controller rather than just guessing from the type. This allows other types than just Document, Media or Member to be picked properly without errors. 
Also fixed treepicker prevallue controller to pass in treeAlias properly to treepicker dialog.
 2015-06-20 09:37:20 +10:00