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

16595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Claus
f58e0dc08e Merge branch 'sql-repalce' of git://github.com/pynej/Umbraco-CMS into pynej-sql-repalce 2016-08-08 09:58:39 +02:00
Shannon Deminick
e449c237be Merge pull request #1421 from abryukhov/patch-8 
Update UI language ru-RU.xml
 2016-08-08 09:40:51 +02:00
Shannon Deminick
1dae6724cc Merge pull request #1227 from abryukhov/patch-6 
Update UI language ru.xml
 2016-08-08 09:40:20 +02:00
Simon Busborg
a28c52aa16 Added styling to url list 2016-08-08 09:36:10 +02:00
Mads Rasmussen
26708ae82b Merge branch 'dev-v7-U4-8580' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-8580 2016-08-08 09:20:32 +02:00
Alexander Bryukhov
809970bc2e Update UI language ru-RU.xml 
New 'bulk' area and few more corrections
 2016-08-07 14:06:16 +07:00
Mads Rasmussen
27d041c055 Merge pull request #1416 from bjarnef/dev-v7-U4-8765-fix 
Open documentation link in new browser window/tab
 2016-08-05 21:36:27 +02:00
Shannon
7bf3d04a25 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-05 19:29:10 +02:00
Shannon
87934e52dc obsoletes strange IsGuid and changes logic to use what .Net does instead of regex in case others are using this. 2016-08-05 19:28:46 +02:00
Shannon
4022c3cec9 U4-8816 Update to jQuery 2.2.4 2016-08-05 19:15:11 +02:00
Shannon
816107a348 U4-8813 RedirectTrackingEventhandler always iterates over all descendants 
fixes SHA1 hashing (moves to a ext method), fixes col length for new db for the redirect table, updates migration len to 40 to store the correct hash format, don't iterate descendents if there's nothing changed, fixes issue with RedirectTrackingEventHandler with regards to operating outside of a web request (i.e. console app)
 2016-08-05 18:55:48 +02:00
Sebastiaan Janssen
aedba40b54 Updates language file to specify which integrity check we're looking at. Quotes all table names correctly. Updates description for the check. 2016-08-05 18:03:05 +02:00
Shannon
31b17e3048 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-08-05 17:41:13 +02:00
Shannon
42666403a6 Fixes regression issue with building the xml cache file, moves the logic to query and build the xml document for the cache to the repository level. 2016-08-05 17:41:00 +02:00
Mads Rasmussen
aa66fd6e33 rewrite controller as vm + refactor controller to follow angular style guide 2016-08-05 16:59:03 +02:00