yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,512 Commits 4 Branches 7 Tags
82ec2d28ef164a0bebe2db74163c7ed2aaedc73b
Commit Graph

8512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
82ec2d28ef WIP on media upload tree refresh 2013-12-05 15:28:32 +01:00
perploug
66383c6f16 merge 2013-12-05 13:11:17 +01:00
perploug
9733c5c031 Folderbrowser tree sync 2013-12-05 13:04:28 +01:00
Shannon
0c0c08ec98 Changes how we set the csrf header for jquery, changed to global and ensures that it is lazily resolved to always ensure it has the newest value 2013-12-05 22:18:07 +11:00
Shannon
d7d800331b Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-05 22:07:19 +11:00
Shannon
4346578160 Ensures csrf token is set for PostFile on the media controller for bulk file uploads 2013-12-05 22:06:57 +11:00
perploug
cfe0b2f9e5 fixes failing eventsService tests 2013-12-05 11:30:08 +01:00
Shannon
d7d7d88ecc Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-05 21:23:53 +11:00
Shannon
fd34a9cd29 fixes demo app loader to load the correct bootstrap 2013-12-05 21:23:31 +11:00
perploug
6da1a5adb3 Fixes: U4-3405 Umbraco 7 RC admin login - remember password 2013-12-05 09:22:32 +01:00
Shannon
23cf5b544a Moved image handling to diff controller since it doesn't support the csrf header, need to test more in an hour (WIP) 2013-12-05 19:06:55 +11:00
Shannon
b0cde715da fixes merge issue 2013-12-05 18:51:05 +11:00
Shannon
366ca11490 Merge branch 'lars-erik-7.0.azurestorage' into 7.0.1 2013-12-05 18:45:21 +11:00
Shannon
a1a985e4a8 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-05 18:34:05 +11:00
Shannon
3384634033 Fixes: U4-3795 Cannot create content with a tag editor when the tag property belongs to an inherited doc type & U4-3786 Multi-level document types fail 2013-12-05 18:33:51 +11:00
perploug
b6bcdcb351 fixes: U4-3728 Non-Mandatory Numeric property gives error when left blank 
also fixes dimming on buttons fails when validation fails
 2013-12-05 08:32:53 +01:00
Shannon
db5b99dbf1 adds failsafe database lookup to BackwardsCompatibleData even though it shouldn't even get used. 2013-12-05 16:30:14 +11:00
Shannon
a64dbb172e undo my custom test change to login controller 2013-12-05 16:20:02 +11:00
Shannon
b1913c9a07 puts IDataValueSetter back in so it can be used by backwards compatible data 2013-12-05 16:18:45 +11:00
Shannon
11fc06d75d Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 2013-12-05 16:12:32 +11:00
Shannon
f6179ff813 Strange, somehow these updates got overwritten 2013-12-05 16:11:15 +11:00
Shannon
186e664894 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-12-05 16:09:34 +11:00
Shannon
1735c5adca adds Exists(string username) to member service and wraps IsMember with that call. 2013-12-05 16:04:53 +11:00
Shannon
31e715e146 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:51:38 +11:00
Shannon
4a7f7813e7 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:30:22 +11:00
Shannon
5f50bae65c Cleaning up a bit of the legacy member class 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-12-05 14:48:30 +11:00
Shannon
996d74b1d3 Cleaning up a bit of the legacy member class 2013-12-05 14:45:28 +11:00
Shannon
e6d8a83519 Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:26:18 +11:00
Shannon
d3aa1b3d7e Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:24:26 +11:00
Shannon
3effe6b96d updates manifest docs to be correct 2013-12-05 12:38:39 +11:00
Lars-Erik Aabech
6458c223b8 Cleaned it up a bit. Now just using media file system provider. 
It needs a bit of convesion rules though, need getfullpath(getrelativepath(path)) to be compatible with package & physical.
 2013-12-04 19:47:54 +01:00
Lars-Erik Aabech
a511c84b4d Messy fix to support images on other domain. (Read: Azure Storage) 
Added GetResized to replace usage of third party packages for simple resizing.

This PR should probably not be pulled, but I make a PR to show you what must be done.
Surely this is considered for UAAS?
 2013-12-04 16:12:27 +01:00
perploug
ff34024f39 fixes: U4-3717 List view doesn't honor the sort order 2013-12-04 13:17:55 +01:00
perploug
bdc0ae7e2f fixes: U4-3707 Change password under users is not translated 
translated, and added missing danish keys
 2013-12-04 12:55:23 +01:00
perploug
60965ecd92 fixes: U4-3738 macro container, editing doesn't seem to work, just adds a new one 
adds fallback on the parser object
 2013-12-04 10:56:46 +01:00
Sebastiaan Janssen
708b49ca13 Reference the Microsoft.AspNet.WebApi.Client NuGet instead of local MVC4 install 2013-12-04 10:47:59 +01:00
perploug
b6baa9af3d removes webdavModule from web.config 2013-12-04 09:24:04 +01:00
Shannon
8c7db9e846 Fixes: U4-3742 Umbraco 7 and umbraco/channels.aspx 2013-12-04 17:45:47 +11:00
Shannon
176ec0edc0 Fixes: U4-3651 What is the "Pick multiple items" prevalue on MNTP for? and removes the remaining uGoLive references. 2013-12-04 17:13:26 +11:00
Shannon
0d1cf872d3 Fixes WebApi issue with creating HttpResponseMessage manually - this shouldn't be done and we'll end up with very strange YSODs 2013-12-04 17:05:05 +11:00
Shannon
13b6318ad2 Fixes: U4-3776 v7 - MNTP value type changes between int and string 2013-12-04 15:57:55 +11:00
Shannon
18352f8a4d Fixes null check with filtered content/media attribute, fixes issue with container types and rendering tree nodes. 2013-12-04 15:54:50 +11:00
Shannon
ad52b86336 Fixes scrollbar issue with directory/file browser and xslt visualize 2013-12-04 15:29:51 +11:00
Shannon
38df2017de Fixes issue with deleting content types that have content 2013-12-04 15:01:27 +11:00
Shannon
210f66cc4a Fixes issue with deleting content types that have content 2013-12-04 15:00:49 +11:00
Shannon
e7e209280c Fixes issue with replacing webapi formatter 2013-12-04 14:47:19 +11:00
Shannon
5b7e9c712e Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
 2013-12-04 13:50:55 +11:00
Shannon
33aa4e2062 Fixes potential xss 2013-12-04 13:33:24 +11:00
Shannon
1efa75c891 Fixes potential xss 2013-12-04 12:42:40 +11:00
perploug
cb13b4a0e0 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-03 13:44:53 +01:00