Mads Rasmussen
73d7915fb5
fixes: U4-9900 Add support for selecting an editor sub view trough route params
2017-05-16 13:14:29 +02:00
Shannon
225f657154
fixes tests for mappings
2017-05-16 18:18:10 +10:00
Shannon
4f80902ac2
Fixes unit tests - all but one
2017-05-16 17:17:02 +10:00
mikkelhm
69775c369a
Bump version to 7.5.14
2017-05-16 08:33:19 +02:00
mikkelhm
3f25d3637a
Bump version to 7.5.14
2017-05-16 08:32:33 +02:00
Stephan
02136d3060
U4-9908 - fix scope-related issues
2017-05-16 08:09:11 +02:00
Shannon
26b8236eea
fixes user query relator
2017-05-16 16:09:01 +10:00
Shannon
ffd63a9103
fixes merge issues
2017-05-16 15:51:30 +10:00
Shannon
bb436426a4
Merge remote-tracking branch 'origin/temp-U4-9776' into temp-U4-8632
...
# Conflicts:
# src/Umbraco.Web.UI/config/trees.config
2017-05-16 15:19:45 +10:00
Sebastiaan Janssen
99d4b13bb0
Adds SQLCE assembly redirect on fresh installs and upgrades
2017-05-15 22:54:46 +02:00
Sebastiaan Janssen
e7b007386a
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
2017-05-15 19:00:05 +02:00
Shannon
faa6a229e6
Updates UserGroupRepository to ensure that it persists things int he correct order and inside of a transaction, removes new code that is already obsolete, fixes tests
2017-05-15 20:27:40 +10:00
Claus
5dc3e0a3fc
Merge pull request #1880 from marcemarc/temp-U4-9765
...
debug logging when there is a distributed calls config issue
2017-05-15 10:28:26 +02:00
Claus
d146df43e6
Merge pull request #1903 from HarveyWilliams/dev-v7
...
U4-9806 Media Picker media hover should show full title
2017-05-15 10:19:04 +02:00
James Coxhead
451826a329
Fixes umbracoInternalRedirectId property to work with UDI IDs
2017-05-14 21:52:45 +01:00
Jason Prothero
b55d065d45
Update to mark some methods as Obsolete and not seen by the VS editor
2017-05-11 09:17:56 -07:00
Mads Rasmussen
0e8b8e3aef
set up some simple filtering of actions based on selection
2017-05-11 13:45:18 +02:00
Mads Rasmussen
7cf3f10afb
missed two paths
2017-05-11 13:44:35 +02:00
Shannon
9b50d6d251
Gets a few tests fixed
2017-05-11 20:51:31 +10:00
wanddy
83db63c5a8
Merge branch 'dev-v7.6-chnfix' of https://github.com/wanddy/Umbraco-CMS into dev-v7.6-chnfix
2017-05-11 16:29:10 +08:00
Mads Rasmussen
6a4a84d8aa
update files to match new tree path
2017-05-11 10:25:57 +02:00
wanddy
1fb0b95428
Fix translation didn't work in some tree node.
2017-05-11 16:25:02 +08:00
Mads Rasmussen
89c4f7dffd
Merge branch 'temp-U4-9776' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9776
2017-05-11 09:54:34 +02:00
Mads Rasmussen
4e76b61251
rename section
2017-05-11 09:53:43 +02:00
Mads Rasmussen
03cce6e8f6
move badge + add title
2017-05-11 09:53:19 +02:00
Mads Rasmussen
956250004e
add go back button to edit user
2017-05-11 09:48:16 +02:00
Mads Rasmussen
536be45bbf
add go back button to edit role
2017-05-11 09:47:35 +02:00
Mads Rasmussen
e5240575bd
add bulk selection to user roles
2017-05-11 09:31:58 +02:00
Shannon
84c7f5046e
Fixes the user group queries to be sorted since the relator requires this
2017-05-11 15:15:46 +10:00
Shannon
d2d6b6654a
Adds models and methods for the UserController
2017-05-11 13:11:41 +10:00
wanddy
53e23f09dc
Fix translation didn't work in some tree node.
2017-05-11 10:10:13 +08:00
wanddy
9e781173fc
Merge branch 'dev-v7-chnfix' into dev-v7.6-chnfix
2017-05-11 09:25:02 +08:00
Jason Prothero
fead30db38
Removed commented code for hash algorithm refactoring
2017-05-10 15:49:03 -07:00
Jason Prothero
d8811d6b46
Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5.
2017-05-10 13:35:28 -07:00
Mikkel Holck Madsen
080150baa3
Merge pull request #1924 from wanddy/dev-v7
...
Fix missing translation for some menu tree item
2017-05-10 21:18:58 +02:00
AndyButland
dd40dd964c
Ordered media types when returned for create dialog
2017-05-10 17:44:30 +02:00
wanddy
bc51a98cfd
Merge branch 'dev-v7-chnfix' into dev-v7.6-chnfix
...
# Conflicts:
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
Fix some menu tree header won't be translated.
This may be caused by the explicit definition of tree node name.
Add missing translation item for en.xml and zh.xml
2017-05-10 23:25:03 +08:00
wanddy
c6bc5ae6aa
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-10 22:37:47 +08:00
Mads Rasmussen
1dc30214cc
remove margin from umb-users
2017-05-10 15:06:06 +02:00
Mads Rasmussen
a84159a1ba
setup scaffolding for edit user and user role
2017-05-10 15:05:34 +02:00
Mads Rasmussen
7bfe736e5e
restructure so we can use subviews for users and user roles
2017-05-10 13:42:04 +02:00
Shannon
1ea06930f4
fixes some tests
2017-05-10 21:34:35 +10:00
Shannon
512f3237f0
larger refactor so we don't need to worry about 'loading' a users groups, it will all just be done, updated queries to fetch a user, it's groups and it's sections all at once, it might be a little heavy but we'll see. Adds/removes a few other methods that didn't seem right and uses group aliases for most things, adds Datbase unique indexes for group aliases and names (need to fix tests though)
2017-05-10 21:00:30 +10:00
Shannon
f594006b95
fixes db table order
2017-05-10 18:07:39 +10:00
Shannon
fc58c4f546
bumps version updates a few methods
2017-05-10 18:06:46 +10:00
Shannon Deminick
f84d3b435b
Merge pull request #1898 from DaveLong/U4-9799
...
Fixed Serialization issue in ValidatePasswordResetCodeModel
2017-05-10 14:59:04 +10:00
Shannon Deminick
99855bce11
Adds AppVeyor build badge
2017-05-10 14:51:40 +10:00
Shannon
d0b2f10a8c
U4-9836 CreatorId on a media is overwritten on save
2017-05-10 14:32:09 +10:00
Shannon Deminick
70507501bd
Merge pull request #1937 from AndyButland/u4-9836
...
U4-9836 - retains original media creator when media is updated
2017-05-10 14:31:34 +10:00
Shannon Deminick
bbfd570b8a
Merge pull request #1938 from suedeapple/U4-9886
...
U4 9886 - automaticly - > automatically (typo fix up)
2017-05-10 14:24:36 +10:00
