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

16171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
d2ad39f2d3 Merge pull request #1287 from bjarnef/dev-v7-U4-8526 
Fix a few translations in da.xml
 2016-06-21 17:47:06 +02:00
Sebastiaan Janssen
5842575d48 Correct path for the matchbrackets.js file 2016-06-21 16:55:02 +02:00
Sebastiaan Janssen
3a0ff337bd Merge pull request #1304 from pynej/fix-matchbrackets 
Update CodeArea.cs
 2016-06-21 16:54:09 +02:00
Simon Busborg
4c57cc2f39 Fixed white space in package overview 2016-06-21 12:19:02 +02:00
Sebastiaan Janssen
afd62caa73 Ignore ClientDependency.config, building the solution will automatically create it 2016-06-21 10:55:18 +02:00
Sebastiaan Janssen
df95b2a402 Same trick as for web.config, copy the ClientDependency.config from a template once and then ignore it so we don't always get prompted to commit it 2016-06-21 10:53:52 +02:00
Sebastiaan Janssen
fc0334493a Update installer background 2016-06-21 10:43:56 +02:00
Mads Rasmussen
7b1563e0ca Merge pull request #1315 from JimBobSquarePants/U4-8583 
U4 8583
 2016-06-21 10:43:15 +02:00
Simon Busborg
b7eb4e4e19 Merge pull request #1337 from bjarnef/dev-v7-U4-8598 
Focus on input and toggle checkbox when clicking label
 2016-06-21 10:34:04 +02:00
Warren Buckley
24a9ce51d5 Merge pull request #1330 from umbraco/temp-U4-6551 
U4-6551 GetMediaByPath returning null
 2016-06-21 09:21:55 +01:00
Simon Busborg
6c8771fae7 Merge pull request #1289 from pynej/fix-grid-macro 
Macro's inserted in the grid should block link clicks so that users d…
 2016-06-21 10:18:31 +02:00
Stephan
afcf2e195e Upgrade to ModelsBuilder 3.0.3 2016-06-20 16:10:06 +02:00
Shannon
bc2b9ab298 U4-8614 JsonCamelCaseFormatter breaks the global configuration for the default JsonMediaTypeFormatter 2016-06-20 15:35:30 +02:00
Shannon Deminick
465a02d697 Merge pull request #1157 from simonech/patch-1 
[U4-8128] Always rejecting promise even with server error
 2016-06-20 15:33:21 +02:00
bjarnef
bca6e16e1b Focus on input, toggle checkbox when clicking label and only submit button dimmed 2016-06-19 23:11:26 +02:00
Sebastiaan Janssen
2a5dcef5f9 Merge pull request #1335 from bkclerke/U4-7879 
escape semicolons
 2016-06-16 14:11:32 +02:00
Blake Clerke-Smith
f00a5271c3 escape other stuff 2016-06-16 06:09:59 -06:00
Blake Clerke-Smith
deff98612f escape semicolons 2016-06-16 06:07:21 -06:00
Claus
c612505362 updated unittest to be more precise. 2016-06-14 17:47:33 +02:00
Claus
12a2de7cf3 U4-6551 GetMediaByPath returning null 
now doing fallbacks to other querys trying to get media from the json value format stored.
 2016-06-14 17:43:46 +02:00
Sebastiaan Janssen
85b00f60ab Update broken unit test 2016-06-14 14:38:19 +02:00
Sebastiaan Janssen
2ae2047b7c Temporarily ignore two failing tests 2016-06-14 14:18:24 +02:00
Shannon
c5aa97e23a Merge branch 'temp-packages' into dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
 2016-06-14 14:15:47 +02:00
Shannon
017b925fe7 Merge branch 'temp-packages' of https://github.com/umbraco/Umbraco-CMS into temp-packages 2016-06-14 14:12:41 +02:00
Shannon
3fcb2a7840 Installer is now 'fully' working 2016-06-14 14:12:10 +02:00
Mads Rasmussen
5f506a8bbc fix dropzone width 2016-06-13 23:50:36 +02:00
Sebastiaan Janssen
8539de08d0 IRedirectUrlRepository needs to be public 2016-06-13 23:41:19 +02:00
Shannon
a8c71e52ec Ensures the min umbraco version is checked when installing packages that have the strict flag set. 2016-06-13 23:35:09 +02:00
Sebastiaan Janssen
7cddeca730 New installer background 2016-06-13 23:24:58 +02:00
Sebastiaan Janssen
7f154e28de Add the beta label 2016-06-13 23:24:57 +02:00
Sebastiaan Janssen
b2cd4820be Updates Examine 2016-06-13 23:24:19 +02:00
Sebastiaan Janssen
82954b6b6f Merge pull request #1325 from umbraco/temp-u4-8361 
U4-8361 Basic 301 Support In Core
 2016-06-13 23:22:34 +02:00
Stephan
ef181b7230 U4-8361 - internal some things 2016-06-13 23:20:27 +02:00
Mads Rasmussen
67d71908bf add back button when uninstalling package 2016-06-13 22:45:42 +02:00
Mads Rasmussen
e38d4b7e88 increase icon font size 2016-06-13 20:57:00 +02:00
Sebastiaan Janssen
2407517fd5 Merge pull request #1326 from AndyButland/u4-3805f 
u4-3805 - Set fixed value for click-jacking protection to sameorigin...
 2016-06-13 20:54:26 +02:00
AndyButland
0a00be7cfe Set fixed value for click-jacking protection to sameorigin instead of deny 2016-06-13 20:48:37 +02:00
Mads Rasmussen
1a7993b9d7 set bigger font icon on uninstall dashboard 2016-06-13 20:46:40 +02:00
Shannon
c0625a7853 adds small icon to packages without them 2016-06-13 20:15:11 +02:00
Shannon
3d2fe3c9da Install/uninstall working - just need a few ui updates and then get the repo install working 2016-06-13 20:10:31 +02:00
Stephan
839603342b U4-8361 - bugfix, get events to work 2016-06-13 19:45:25 +02:00
Andy Butland
203e9e3394 Ensured click-jacking meta-tag health check searches case insensitively (#1324) 2016-06-13 19:44:01 +02:00
Shannon
2d9010caf4 I can haz package uninstallation 2016-06-13 19:43:04 +02:00
Shannon
c2b016d7d0 Gets local package installation 'working', now needs a little UI work. 2016-06-13 18:28:56 +02:00
Sebastiaan Janssen
d83d7956bb Dev v7 health check (#1220) 
Adds health check feature including some initial checks
 2016-06-13 17:42:05 +02:00
Shannon
f5d3f9087f updates to package filtering to unselect a category 2016-06-13 13:29:51 +02:00
Shannon
441ea0cfaf Got the package search/filter/etc.. all working 2016-06-13 13:10:26 +02:00
Shannon
5a32e1a294 package tree is basically done, got the editor updated to work with the server data to display the initial screen and details 2016-06-12 21:39:29 +02:00
Stephan
795e6945e3 Merge pull request #1313 from marcemarc/temp-u4-8361 
Create 301 Redirects When Urls Change - merging for review
 2016-06-12 19:54:00 +02:00
Stephan
e231206555 U4-8361 - bugfix, get finder to work 2016-06-12 19:47:11 +02:00