yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,032 Commits 4 Branches 7 Tags
888ba8f285969304c7fbead73e96d7fa436f57dc
Commit Graph

13032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug
888ba8f285 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-25 11:49:08 +02:00
Per Ploug
fc323ae89d Include EsLint in grunt 
ESlint is not turned on by default - as it gives us 500ish errors as of
the current state of the codebase, also, we should start linting
controllers (why arent we?)

EsLint contains angular best practices rules and will help us get V8
ready for Angular2 and to follow best practices, untill everything
passes we can turn it on and off during clean-up time
 2015-06-25 11:49:00 +02:00
Per Ploug
3565d1e26b Manifest parser tests updated to include icon and group 2015-06-25 11:43:51 +02:00
Shannon
693b87a527 Fixes upgrade issue 2015-06-25 11:15:04 +02:00
Shannon
3c04f43abc Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-25 10:23:33 +02:00
Shannon
da7b0e34d2 fixes test 2015-06-25 10:22:34 +02:00
Shannon
fc7932c2bf Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/less/property-editors.less
 2015-06-25 10:16:35 +02:00
Per Ploug
f8beb5ec3f Use IEnumerable instaed of List for fetching datatypes 2015-06-25 10:09:55 +02:00
Shannon
a85f3bfc16 Fixes install issue that was causing so many tests to fail 2015-06-25 09:56:40 +02:00
Per Ploug
9c8489c4c5 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-24 21:43:22 +02:00
Per Ploug
8679c26f3d Added icons and groups on all core editors 2015-06-24 21:43:14 +02:00
Shannon
84cac6ac90 Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror 2015-06-24 19:06:42 +02:00
Shannon Deminick
e758bf2eca Merge pull request #716 from rasmusfjord/dev-v7 
Updating image cropper interface
 2015-06-24 17:49:17 +02:00
Shannon
1f0a4490a6 U4-6737 Add unique id (guid) column to property type 2015-06-24 17:47:20 +02:00
Shannon
85a4a4fa81 fixes migration check to ensure that migrations for the current version always run if the current installation version is a pre-release 2015-06-24 17:46:52 +02:00
Shannon
aaf49667ec Fixes member indexer to ensure that all user fields are indexed. 2015-06-24 17:45:25 +02:00
Shannon
6a7c4e9dc1 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-06-24 15:20:32 +02:00
Shannon
a7029e4733 Fixes up migration runner with regard to semver numbers. All migrations for a normal version within a build number will execute. For example if migrating from 7.3.x-x to 7.3.0 (final), all migrations for 7.3 will execute. 2015-06-24 15:20:08 +02:00
Shannon
18b1857539 Changes versioning to SemVersion (via nuget package), now target migrations with the full SemVer and update the web.config with the correct sem ver. Creates migration to create the migration table. 2015-06-24 14:17:24 +02:00
Per Ploug
4b72fc3642 Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-06-24 12:54:16 +02:00
Per Ploug
5e81aed928 Adds icon and group to property editor classes 2015-06-24 12:54:06 +02:00
Per Ploug
15c1477907 Moves localization directive into seperate folder 2015-06-24 12:53:10 +02:00
Per Ploug
933f97fef7 Umb-editor and Umb-Property-Editor into 1 file 
only done to keep backwards compat and avoid dublicate code.
 2015-06-24 12:52:27 +02:00
Per Ploug
c9008c9946 Renames ContentType Create function as it broke another create dialog 2015-06-24 12:51:24 +02:00
Per Ploug
e254e241b5 Fixes missing progress bars and large file error 2015-06-24 12:50:36 +02:00
Per Ploug
945858bbbc Cleanup unused directives 
Removes the old upload directives and unused buttongroup directive
 2015-06-24 12:50:02 +02:00
Shannon
4f5c24d2e3 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-24 11:39:57 +02:00
Shannon
f82d8a5df1 updates bower and bower install task. 2015-06-24 11:39:50 +02:00
Shannon
8f4da31f0b removes old grunt-bower task. 2015-06-24 11:34:50 +02:00
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
Per Ploug
34893d5f53 Delete dublicate event file 2015-06-24 10:22:22 +02:00
Per Ploug
6d6bcff233 Moves on-delayed-mouseleave to events directives 
Keep all these utillity events in one file
 2015-06-24 10:22:10 +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
Shannon Deminick
cb3ed7ed8d Merge pull request #727 from bjarnef/dev-v7-U4-6748 
Add unique id for TextSearch / LuceneSearch
 2015-06-24 09:32:49 +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
bjarnef
1cade7f8c7 Add unique id for TextSearch / LuceneSearch 
Add unique id for TextSearch / LuceneSearch for each searcher.
 2015-06-23 22:28:49 +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