Commit Graph

2357 Commits

Author SHA1 Message Date
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
Shannon
79eb8176ac bumps version and website port 2015-09-23 14:21:14 +02:00
Shannon
ff9027c07d Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-09-23 14:03:15 +02:00
James Jackson-South
2599fdb1d2 Fix missing project reference 2015-09-23 18:06:49 +10:00
James Jackson-South
6b639e940c Update ImageProcessor dependency for core
An update to U4-7053. Reduced memory usage plus web optimised images.
2015-09-23 16:05:07 +10:00
Stephan
ae7a9a2fed Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-09-18 13:41:54 +02:00
Sebastiaan Janssen
91a1955454 Make sure to redirect to the current version of HTML Agility Pack 2015-09-17 12:20:11 +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
Shannon
23f7a4e53f Set min password length is 8 characters by default for release 2015-09-16 14:32:56 +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
Mads Rasmussen
e5781c5e76 Notifications: move notifications directive to new component folder, move styles to new less file, move html element to support resizable pane 2015-09-15 09:39:57 +02:00
Stephan
8b612a1047 Use SaveFileController for stylesheets too 2015-09-10 14:19:56 +02:00
Stephan
8f78ba8b97 Revert "TEMP move stylesheet..." (pushed by mistake)
This reverts commit 7e1a11373b.
2015-09-10 11:14:23 +02:00
Stephan
7e1a11373b TEMP move stylesheet editing to filesystem 2015-09-10 10:12:25 +02:00
Stephan
200625aa3a SaveFileController can also save stylesheets (not used at the moment) 2015-09-10 10:04:55 +02:00
Stephan
6b5057b870 U4-7048 - more filesystems cleanup 2015-09-08 17:48:26 +02:00
Shannon
6d6b2f72b6 fixes open redirect issue for schema less Urls 2015-09-07 20:15:10 +02:00
Stephan
d323b3c5c9 U4-7042 - use IFileService when editing scripts 2015-09-03 15:12:37 +02:00
Sebastiaan Janssen
d4fb28607d U4-7053 Update ImageProcessor dependency for core
#U4-7053 Fixed
2015-09-01 15:35:42 +02:00
Stephan
7848ea5ec0 U4-7038 - IPublishedContentWithKey for contents, members 2015-09-01 15:00:27 +02:00
Claus
37986f0ed5 Fixes: U4-6193 Inserting an image into grid layout ignores alternative text
AltText is used for alt tag instead of caption text which is used below the media.
Ensured the altText set in the dialog is saved to the value object.
2015-09-01 10:28:35 +02:00
Shannon
e3cc107bfa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-08-27 18:33:48 +02:00
Shannon
4a59c27793 Refactors new IPublicAccessService to return Attempt+Result so we know what happened, also ensures events are firing with msgs (events were not firing at all before). 2015-08-27 18:33:38 +02:00
Shannon Deminick
abde63ebee Merge pull request #768 from abryukhov/patch-3
ru.xml - newest 'member' and 'help' sections
2015-08-27 15:17:44 +02:00
Shannon Deminick
346fb471da Merge pull request #773 from bjarnef/dev-v7-additional-translations
Additional translations for members
2015-08-27 15:14:54 +02:00
arichika taniguchi
c3c63ce0e3 Update Japanese resource XML for UI
Update Japanese resource XML for UI
2015-08-26 21:33:35 +09:00
bjarnef
d7360e7a41 Additional translations for members
Addtional translations for members, help dialog and a few updated in
da.xml
2015-08-23 16:49:53 +02:00
Shannon
29903058a9 Fixes: U4-6937 Update all web.configs in all subfolders to use MVC4 / Razor 3, U4-6938 While upgrading, delete dlls that shouldn't be there after upgrade 2015-08-20 18:41:39 +02:00
Bjarne Fyrstenborg
4ea9fec9e2 Add missing Danish translations
Added missing keys in da.xml and removed some duplicate keys.
2015-08-20 09:56:16 +02:00
Alexander Bryukhov
5167ba7aee ru.xml - newest 'member' and 'help' sections 2015-08-20 09:04:52 +06: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
bjarnef
5bc0c499d8 Localize text in help dialog
Add localization for text in help dialog, create and delete dialogs and
some minor parts of the member area.
2015-08-19 02:03:54 +02:00
Shannon
127736d188 updates to latest examine 2015-08-13 15:30:28 +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
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
715cc22722 Revert "Correct trees.config"
This reverts commit 88b23e09b6.
2015-08-01 15:11:47 +02:00
Sebastiaan Janssen
88b23e09b6 Correct trees.config 2015-08-01 15:05:01 +02:00
Sebastiaan Janssen
58e648828b Fix web.config and adds a transform for NuGet 2015-07-30 17:08:40 +02:00
Sebastiaan Janssen
d87b268a40 Update to MVC5 2015-07-30 17:08:39 +02:00
Shannon
bb94fc7d71 Ensures notifications are shown for drag/drop uploads 2015-07-30 11:35:00 +02:00
Sebastiaan Janssen
51eae92a5a Update json.net everywhere 2015-07-27 16:11:18 +02:00
Sebastiaan Janssen
9f000eb90c Updates build to include and exclude correct files, syncs web.config and syncs dependency versions between core and nuget pkg 2015-07-27 15:52:10 +02:00
Sebastiaan Janssen
b7926bfa19 Cookie monster 2015-07-27 15:52:10 +02:00
Sebastiaan Janssen
86ad3f6b05 Makes sure that R# doesn't suggest C#6 features 2015-07-24 17:25:52 +02:00
Shannon
aa08a4ca37 Gets the messages being pumped out to the UI. Updates the ContentService and MediaServices to have a SaveWithStatus in order to determine the response, we'll need to update most of the methods to also have this OperationStatus. Now messages can be added to the UI for Saving & publishing for media and content services, we'll need to update more to support everything. 2015-07-24 11:44:09 +02:00
Shannon
9bdb91b3c0 latest examine 2015-07-23 18:03:44 +02:00