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

4528 Commits

Author SHA1 Message Date
Mads Rasmussen
e1f3e82fbf U4-6924 Updated ng-file-upload bower dependency to latest version, added support for accepted file types and max file size in directive. Get file types from config. Still missing max file size. 2015-09-28 11:55:12 +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
Per Ploug
e4e3c46d15 Remove the culture from tree header localization 2015-09-25 16:29:41 +02:00
Per Ploug
8d57e0cd1d Less hacky way to lookup current user culture 2015-09-24 15:52:44 +02:00
Per Ploug
c13ae20885 U4-4761: adds overload to treeattribute 2015-09-24 15:49:17 +02:00
Per Ploug
6dc4e2d2ae U4-4761 Member translation 
Makes all trees translateable, does not break the current titles set on
atttributes, but for trees that does not have a title set, the tree wil
try to look up a treeheader.
 2015-09-24 15:30:08 +02:00
Per Ploug
9f9946eb1f Default contenttype icons 2015-09-23 21:01:32 +02:00
Per Ploug
1d23d2b7c6 Fixed: New document types fails to save 2015-09-23 20:40:03 +02:00
Shannon
ff9027c07d Merge branch 'dev-v7' into dev-v7-contenttypeeditor 2015-09-23 14:03:15 +02:00
Stephan
3124ea4e67 U4-7129 - BatchedDatabaseServerMessenger degraded non-batching mode when no context 2015-09-22 18:20:49 +02:00
Shannon
03f68cefb7 performs a fallback check for HttpContext in the batched server messengers in some cases where cache refreshers are executed on async threads... though there's not much we can do about when they are fired on background threads. 2015-09-22 14:39:55 +02:00
Stephan
c3076d6b8d Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-09-18 13:43:16 +02:00
Stephan
ae7a9a2fed Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor 2015-09-18 13:41:54 +02:00
Per Ploug Krogslund
d9d2403d99 csproj file 2015-09-17 14:08:56 +02:00
Per Ploug Krogslund
10d8fdba75 Updates template tree controller for angular view 2015-09-17 14:08:56 +02:00
Shannon
779dd26527 Fixes: U4-6969 Property label localization in 7.3 always uses en-US locale 2015-09-16 15:22:40 +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
af2dbc7cd9 U4-6811 - bugfix preview set 2015-09-14 12:43:05 +02:00
Per Ploug
81f206090d Default listview name on mediatypes 2015-09-11 10:42:48 +02:00
Damiaan
6d5a8c0db7 U4-7087 make pageId getter public to be able to unittest 2015-09-10 18:11:18 +02:00
Stephan
3314ab026b U4-7083 - filesystems, polish, fix, and back-compat 2015-09-10 14:20:21 +02:00
Stephan
8b612a1047 Use SaveFileController for stylesheets too 2015-09-10 14:19:56 +02:00
Stephan
28ecf79643 files editor xss 2015-09-10 11:20:01 +02:00
Stephan
8f78ba8b97 Revert "TEMP move stylesheet..." (pushed by mistake) 
This reverts commit 7e1a11373b.
 2015-09-10 11:14:23 +02:00
Stephan
b9ff056b61 Revert "U4-6992 - fix db migrations" 
This reverts commit 406d172169.
 2015-09-10 10:19:28 +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
Shannon
3a62fb5900 fixes script editor xss 2015-09-09 22:00:29 +02:00
Shannon
d127856726 fixes script editor xss 2015-09-09 21:52:52 +02:00
Shannon
02e9866398 Fixes regression issue with xss 2015-09-09 21:41:06 +02:00
Stephan
59ec709c69 U4-7048 - more filesystems cleanup 2015-09-09 16:32:45 +02:00
Shannon
710bc7ed7c fixes minor potential xss issue with stylesheets editor 2015-09-09 10:19:57 +02:00
Shannon
4d012ee1e1 Ensures that any stale old temp upload files are removed any time media is uploaded. 2015-09-08 18:33:43 +02:00
Stephan
6b5057b870 U4-7048 - more filesystems cleanup 2015-09-08 17:48:26 +02:00
Stephan
a542cf56d4 U4-7063 - Umbraco.TypedContent(ints) should not return nulls 2015-09-04 10:43:42 +02:00
Stephan
d323b3c5c9 U4-7042 - use IFileService when editing scripts 2015-09-03 15:12:37 +02:00
Stephan
fc8c92e922 U4-7056 - sync BatchedDatabaseServerMessenger on all requests 2015-09-02 14:44:02 +02:00
Stephan
dfbdf99bbc U4-7038 - IPublishedContentWithKey for medias 2015-09-01 15:00:31 +02:00
Stephan
7848ea5ec0 U4-7038 - IPublishedContentWithKey for contents, members 2015-09-01 15:00:27 +02:00
Shannon Deminick
2029bef6eb Merge pull request #771 from Jeavon/GetCropUrlFixes 
Fix for U4-6995 Image Cropper does not use predefined crop ratio when only width or height is supplied
 2015-09-01 11:29:45 +02:00
Shannon
05e17e1c7f Fixes: U4-6973 Given custom permissions user can create, but cannot save 2015-08-31 18:04:13 +02:00
Shannon Deminick
7020e948b8 Merge pull request #780 from umbraco/COU-191 
Fixes: COU-191 Creating a revision gives a reference not set error (7.3)
 2015-08-28 13:35:07 +02:00
Stephan
ed5ca49755 U4-6992 - update interfaces 2015-08-28 13:28:00 +02:00
Claus
c1352e2ad6 Fixes: COU-191 Creating a revision gives a reference not set error (7.3) 
If the typeInstance could not be cast to LegacyDialogTask, trying to set additionalValues caused a null exception.
Inserted a null check and then cast to ITaskReturnUrl instead to get the returnUrl.
 2015-08-28 13:01:23 +02:00
Shannon
05aa2aeb75 refactors new IDomainService to return attempt+status and raise events using event messages. 2015-08-27 18:43:54 +02:00
Shannon
d4c5a1ee1c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-08-27 14:56:51 +02:00
Shannon
e3598b99a5 Ensures tempdata is set on our member controllers in the correct place and ensures that the RegisterModel doesn't explicitly set the RedirectUrl because we want it to be empty by default. 2015-08-27 14:56:42 +02:00
Stephan
406d172169 U4-6992 - fix db migrations 2015-08-27 13:08:50 +02:00
Stephan
20d8656237 U4-6992 - fix server registration for new LB 2015-08-26 14:00:56 +02:00
Per Ploug
23a5ac439b Removes the old type trees and sets the right order on the new 2015-08-26 12:18:42 +02:00