yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,612 Commits 4 Branches 7 Tags
2ee71ecb96e7be2a5bdf4f15b1bd4af361aa448f
Commit Graph

16612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
2ee71ecb96 U4-8833 The default sorting field for the member list view should be LoginName not Name 2016-08-09 15:30:43 +02:00
Shannon
2d25c4dad5 deletes tests to attempt to test the sorting issue: U4-8831 which didn't work because it's on sql ce 2016-08-09 14:01:18 +02:00
Shannon
8bdf0924de Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7 2016-08-09 13:59:00 +02:00
Shannon
1b85163a7f U4-8831 Paging logic is flawed when ordering by a potentially non-unique value 2016-08-09 13:58:53 +02:00
Shannon
634dfaaf75 U4-8833 The default sorting field for the member list view should be LoginName not Name 2016-08-09 13:55:41 +02:00
Claus
2279e6cc53 U4-8834 Removing code assigning PropertyData IDs for new properties even though it isn't used 2016-08-09 13:39:40 +02:00
Mads Rasmussen
82c5b91deb Fixes: U4-8832 Remove custom styling of pagination on list views 2016-08-09 13:30:19 +02:00
Shannon
9d2efdfb37 Adds test to confirm bug U4-8831 2016-08-09 12:47:14 +02:00
Shannon
910e6b7a64 U4-8766 v7.5.0-beta2 exception from Examine Grid Indexer 2016-08-09 09:40:29 +02:00
Sebastiaan Janssen
bffd9c340d Wrong parameter name being sent to the RedirectUrlManagementController 2016-08-09 09:21:22 +02:00
Simon Busborg
df116555ad fix search 2016-08-09 09:11:19 +02:00
Mads Rasmussen
ca7e9c90b9 fixes: U4-8827 Add empty state for no search result and no added redirects to url redirects dashboard 2016-08-09 08:47:01 +02:00
Mads Rasmussen
65fc23dadc Fixes: U4-8828 Redirect urls dashboard - when search field has focus and enter is pressed the first redirect gets deleted 2016-08-09 08:44:45 +02:00
Sebastiaan Janssen
3ac7512a98 Merge pull request #1116 from rpjengaard/patch-1 
Update da.xml
 2016-08-08 17:23:20 +02:00
Sebastiaan Janssen
a553fabce4 Merge pull request #1262 from umbraco/UmbracoCMS-Settings-Dashboard 
Fixed issue: U4-8435 so the link is correct in settingsdashboardintro…
 2016-08-08 17:07:55 +02:00
Sebastiaan Janssen
2a2453a969 Merge pull request #1283 from jbreuer/patch-1 
Fix for U4-8510
 2016-08-08 17:06:21 +02:00
Sebastiaan Janssen
f4711a4473 Merge pull request #1340 from bjarnef/dev-v7-U4-8608 
Document getByQuery
 2016-08-08 17:02:53 +02:00
Sebastiaan Janssen
2069c585fb Merge branch 'temp-U4-8802' into dev-v7 
# Conflicts:
#	src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-08-08 16:49:10 +02:00
Mads Rasmussen
045374993f Fixes: U4-8821 Prevent random form submits from healthcheck dashboard 2016-08-08 15:12:42 +02:00
Sebastiaan Janssen
57923866ed Merge pull request #1419 from umbraco/temp-U4-8813 
U4-8813 RedirectTrackingEventhandler always iterates over all descend…
 2016-08-08 14:59:58 +02:00
Shannon
bf61956b7f oops fixes build 2016-08-08 14:48:05 +02:00
Shannon
9ad84a7eab fixes repository mapping the GUID id for redirect urls and removes unused properties 2016-08-08 14:47:48 +02:00
Shannon
4301af108f Merge branch 'temp-U4-8802' of https://github.com/umbraco/Umbraco-CMS into temp-U4-8802 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html
#	src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
 2016-08-08 14:42:07 +02:00
Shannon
c331ba134a Fixes 301 redirect js naming conventions, fixes URL handling, moves c# classes to the correct/constistent namespaces, fixes up models and N+1 requests, adds model mapping to not return the business logic model, adds controller method to check if it's enabled instead of returning the result as part of the search. 2016-08-08 14:40:53 +02:00
Mads Rasmussen
7d4e547b8d Fixes: U4-8820 Healthcheck dashboard should validate input for notification email 2016-08-08 14:30:59 +02:00
Mads Rasmussen
cbd20cb9b3 Merge pull request #1406 from arknu/U4-8749 
U4-8749: Allow default sort order to be custom properties
 2016-08-08 14:01:53 +02:00
Claus
3170d6829a browser object null check in jquery.ba-bbq.min. 2016-08-08 13:26:21 +02:00
Claus
55752abdcf fixing InsertMacroSplitButton typo in jquery selector causing javascript errors. 
fixing modal $.browser checks to not cause console errors due to deprecated browser object in jquery 1.9+.
 2016-08-08 13:23:46 +02:00
Sebastiaan Janssen
69c952ddda Don't use HttpContext 2016-08-08 13:10:32 +02:00
Simon Busborg
4ff728b62a added target blank so it opens in another tab 2016-08-08 12:55:52 +02:00
Shannon Deminick
1b9a3e8ebc Merge pull request #1423 from abryukhov/patch-3 
Update UI language ru.xml * dev-v7-U4-8597 - Social login form key added
 2016-08-08 12:22:11 +02:00
Shannon
fee4a84c66 Revert temp commit, adds logic to check if the segment value has changed + lots of notes 2016-08-08 12:19:03 +02:00
Shannon
ad2a644bdf temp save to track history since i need to roll this back 2016-08-08 12:07:43 +02:00
Sebastiaan Janssen
f4b0700528 Merge branch 'temp-U4-8802' of https://github.com/umbraco/Umbraco-CMS into temp-U4-8802 2016-08-08 12:00:14 +02:00
Sebastiaan Janssen
126c358546 Fixes build and use Guid where necessary 2016-08-08 11:57:48 +02:00
Alexander Bryukhov
f316393955 Update UI language ru.xml 2016-08-08 16:41:19 +07:00
Simon Busborg
80d579891b Removes search when disabled 2016-08-08 11:33:56 +02:00
Claus
bfc2e6f666 Merge branch 'bjarnef-dev-v7-U4-8597' into dev-v7 2016-08-08 11:32:02 +02:00
Claus
c3035f26a7 Merge branch 'dev-v7-U4-8597' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-8597 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
 2016-08-08 11:31:29 +02:00
Sebastiaan Janssen
b2e03dcc1b Merge branch 'refs/heads/dev-v7' into temp-U4-8802 2016-08-08 11:31:16 +02:00
Mads Rasmussen
97a765d6af Merge branch 'bjarnef-dev-v7-U4-8580' into dev-v7 2016-08-08 11:28:07 +02:00
Mads Rasmussen
67430392e3 Change object to img to make it render in Edge 2016-08-08 11:22:16 +02:00
Sebastiaan Janssen
6560f752d6 Merge branch 'refs/heads/dev-v7' into temp-U4-8802 2016-08-08 11:21:19 +02:00
Claus
e02575830f Merge pull request #1420 from umbraco/temp-U4-8816 
U4-8816 Update to jQuery  2.2.4
 2016-08-08 11:00:47 +02:00
Shannon Deminick
a838d20c3e Merge pull request #1422 from abryukhov/patch-9 
Update UI language ru.xml
 2016-08-08 10:57:22 +02:00
Alexander Bryukhov
081284bc62 Update UI language ru.xml 
1. Duplicated 'prompt' area removed
2. Several typos corrected
 2016-08-08 15:48:14 +07:00
Claus
9e9c1ad030 Merge pull request #1418 from drpeck/dev-v7 
U4-8814 - HTml.Wrap adds children twice
 2016-08-08 10:45:35 +02:00
Simon Busborg
32d48b12d1 Changed button when inactive, added class to toggle when table in inactive 2016-08-08 10:36:10 +02:00
Claus
b4b91f0fef Merge branch 'pynej-sql-repalce' into dev-v7 2016-08-08 10:19:35 +02:00
Claus
cbf67a4399 changing to Debug.Print. 2016-08-08 10:18:44 +02:00