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

462 Commits

Author SHA1 Message Date
Sebastiaan Janssen
701dea5de7 Merge pull request #969 from umbraco/temp-U4-7591 
U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs
 2016-01-06 13:43:14 +01:00
Shannon
c6dbb0f7fa reverts member tree order 2015-12-28 10:35:54 +01:00
Shannon
f3f70a3243 U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs 2015-12-21 15:19:15 +01:00
Sebastiaan Janssen
a0ac0b55d0 Update trees transform with new aliases and sorting, also re-ordered member tree to have member types first, think that was the intention 2015-12-16 17:02:10 +01:00
Mads Rasmussen
5d4f4376dd make overlay component of rich text editor link picker in property editor and grid editor 2015-12-15 15:26:07 +01:00
Sebastiaan Janssen
c7aa3d63fb Merge branch 'temp-U4-7372' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
 2015-12-03 09:22:19 +01:00
Sebastiaan Janssen
4d4a7b5078 U4-7343 Change the order of trees under Settings: Make "Document Type" the first item in the settings section 
#U4-7343 Fixed
 2015-12-02 13:33:40 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
Shannon
3f7293304d removes password change dashboard from release 2015-11-26 11:55:42 +01:00
Stephan
eb5589e064 Remove PropertyGroup.ParentId, sanitize Property groups/types 2015-11-17 16:55:14 +01:00
Sebastiaan Janssen
05c592860d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-11-17 13:43:19 +01:00
Gerty Engrie
eb3ff12916 U4-7297 - fixes <hr/>-button 2015-11-17 00:35:10 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Claus
63160e2e2d Removing the Change Password tab from Content section. 2015-11-12 13:31:03 +01:00
Simon Busborg
d68a9fae5d UI Polish 
New: UI Polish
Edit: Changed 'Cancel' to 'Clear selection'
Fix: Changed from table to flexbox
 2015-11-11 11:42:02 +01:00
Shannon
a0761b92b8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/RevertToCleanInstall.bat
	build/RevertToEmptyInstall.bat
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
 2015-11-09 12:33:53 +01:00
Jeffrey Schoemaker
6b0c94948e U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:23:30 +01:00
Sebastiaan Janssen
4259b02b8d Merge branch 'dev-v7' into temp-U4-5963 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2015-10-28 16:56:40 +01:00
Shannon
98fadf82a1 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-10-21 18:44:07 +02:00
Shannon
22b8d41aee U4-5963 There should be no external request dependencies - updates nonodes, removes the font references that is never used, replaces the open sans font-reference with the one that we already have locally and uses it. 2015-10-15 19:08:53 +02:00
Shannon
57622cef9a Fixes: U4-7198 Change default log4net config to include machine name in file name 2015-10-15 17:14:24 +02:00
Mads Rasmussen
df76554aaf U4-5523: move change password to it's own part of user fly out to minimize visual clutter, use new 7.4 buttons + remove functionality from dashboard files. 2015-09-30 12:16:30 +02:00
Mads Rasmussen
9d1d53524a Merge branch 'changepassword-fix' of https://github.com/arknu/Umbraco-CMS into arknu-changepassword-fix 2015-09-30 11:28:52 +02:00
Per Ploug
ebbde5f64b Rolling back members tree alias to "tree" due to UI issues 2015-09-29 11:05:38 +02:00
Per Ploug
6c5e35ec2c Fixed: U4-7150 Inconsistent tree aliases 
Changes all translation files and tree classes to have consistent
naming, updates trees.config to these new alias's
 2015-09-28 08:54:00 +02:00
Stephan
ae7a9a2fed Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-09-18 13:41:54 +02:00
Sebastiaan Janssen
1f3c396c5b Using protocol-relative URLs is an antipattern, just use https if you know it exists 2015-09-16 19:00:14 +02:00
Stephan
9c9ba477aa Merge dev-v7 into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Constants-ObjectTypes.cs
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/loader.dev.js
	src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
	src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
	src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-09-16 13:25:32 +02:00
Stephan
7848ea5ec0 U4-7038 - IPublishedContentWithKey for contents, members 2015-09-01 15:00:27 +02:00
Sebastiaan Janssen
4ec63ffd0d U4-6939 'html code' button is missing in the Rich Text Editor] 
#U4-6939 Fixed
 2015-08-19 18:40:04 +02:00
Shannon
930b61a7ff Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/belle.less
 2015-08-13 11:09:04 +02:00
Shannon
e5bb35b335 Updates to latest Examine 2015-08-10 18:06:23 +02:00
arknu
6de9989285 delete Change password tab from Dashboard.config 2015-08-09 21:53:34 +02:00
Shannon
2f1877c2cd Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-08-05 13:39:30 +02:00
Shannon
34fd405bca Downgrades AutoMapper to the version before the assembly was signed (breaking!), we're stuck on < 3.1 because Automapper decided to sign an assembly in a minor version, nothing we can do till v8 2015-08-05 13:35:42 +02:00
Shannon
85534bc3ce Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-08-04 17:10:58 +02:00
Sebastiaan Janssen
b7926bfa19 Cookie monster 2015-07-27 15:52:10 +02:00
Stephan
a3936d69cb Revert rogue umbracoSettings.config changes (dbaf7c0) 2015-07-17 14:20:05 +02:00
Shannon
d97c772c70 Fixes: U4-6831 Add {machinename} to ExamineIndex.config by default 2015-07-16 17:19:49 +02:00
Stephan
db0cfad6b9 Merge 7.2.7 into dev-v7 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.MacroEngines/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/umbraco.editorControls.csproj
 2015-07-14 19:57:56 +02:00
Stephan
1e3dd4c5cd Cleanup new umbracoApplicationUrl config 2015-07-14 19:28:14 +02:00
Stephan
0f56fa4baa Bugfix content xml doctype issue 2015-07-13 14:08:50 +02:00
Shannon
2e088fa036 Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-07-13 09:49:34 +02:00
Shannon
a712726065 Updates the logger and how to output process id and app domain id with the default log4net patterns. 2015-07-07 16:18:57 +02:00
Shannon
3a3917c1fc Fixes: U4-4231 remove umbracoUserLogins table 2015-07-06 17:52:07 +02:00
Shannon
d63f83f7c7 Fixes: U4-6786 Update to CDF 1.8.4 2015-07-03 11:40:41 +02:00
Shannon
44943e367f Updates async logging to a newer format 2015-07-01 13:46:11 +02:00
Shannon
035318753b Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-06-25 17:35:58 +02:00
Shannon
fdf53b8550 puts the Flickr provider back for backwards compat, adds a todo and updates the release config with all providers 2015-06-25 17:10:45 +02:00
Shannon
5487ec1d5f Merge branch 'dev-v7-oembed' of https://github.com/tcmorris/Umbraco-CMS into tcmorris-dev-v7-oembed 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-06-25 16:57:52 +02:00