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

16198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
1bfb32dcdc Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-U4-8588 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Web.UI/packages.config
 2016-06-23 16:55:04 +02:00
Mads Rasmussen
8a3c5c226c fix angular docs build 2016-06-23 15:44:55 +02:00
Mads Rasmussen
7411be99a8 Merge pull request #1344 from bjarnef/dev-v7-U4-8607 
Document localizationService and localize directive
 2016-06-23 15:30:26 +02:00
Sebastiaan Janssen
7dcd67f953 != to !== 2016-06-23 12:39:32 +02:00
Sebastiaan Janssen
f995370792 Merge pull request #1328 from pynej/fix-markdwn-isDirty 
Update markdowneditor.controller.js
 2016-06-23 12:35:46 +02:00
Sebastiaan Janssen
402b2b082f Merge pull request #1347 from umbraco/temp-U4-8433 
This ensures we are using the latest code from Log4Net.Async for thes…
 2016-06-22 17:25:11 +02:00
Warren Buckley
772754bde8 Merge pull request #1348 from umbraco/temp-U4-8630 
fixes: U4-8630 Make lightbox component for package images
 2016-06-22 15:35:46 +01:00
Stephan
980683d25a Merge pull request #1285 from umbraco/temp-U4-8410-2 
Backports some changes from v8 so that we can perform a nice strongly… Reviewed, sounds good.
 2016-06-22 14:55:06 +02:00
Stephan
ab973fd4df U4-8410 - fix build 2016-06-22 13:33:52 +02:00
Stephan
3f285185d1 U4-8410 - minor fixes 2016-06-22 13:10:37 +02:00
Mads Rasmussen
f1803b4f33 fixes: U4-8630 Make lightbox component for package images 2016-06-22 12:15:50 +02:00
Shannon
9463db7431 This ensures we are using the latest code from Log4Net.Async for these libs. there are very little changes and none breaking but it is now up-to-date and we will use the nuget package in v8 instead. 2016-06-22 11:48:52 +02:00
Mads Rasmussen
5021112934 fix the Angular Docs build: fixes small issues in healthCheck resource documentation 2016-06-22 11:40:11 +02:00
Stephan
d4f2486b4f Merge remote-tracking branch 'origin/dev-v7' into temp-U4-8410-2 2016-06-22 10:58:46 +02:00
Shannon
740c3e770a remove test thing 2016-06-21 21:09:41 +02:00
Shannon
b8c88139e1 fixing build 2016-06-21 21:08:38 +02:00
Shannon
33ca761441 Updated all to use the ref parameter, tests are passing - now to see if they run any faster :) 2016-06-21 20:43:02 +02:00
Shannon
866df9c0b8 Merge branch 'temp-U4-8410-2' of https://github.com/umbraco/Umbraco-CMS into temp-U4-8410-2 
# Conflicts:
#	src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs
 2016-06-21 18:22:26 +02:00
Shannon
06fd7c2780 starting ref refactor (need to merge first) 2016-06-21 18:20:55 +02:00
Shannon
b5411a5402 Initial commit of refactor of better/more efficient in terms of mem and performance properpty selectors for our models, this also yields a much cleaner syntax. I have discovered one issue now which is that the PropertyChanged event now fires before the property value is actually set, this is why the lambda syntax existed before. Instead we can use a ref property for the SetPropertyValueAndDetectChanges methods which will work much nicer - and also potentially have less allocations. 2016-06-21 18:11:03 +02:00
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
bjarnef
5a53984b43 Document localizationService and localize directive 2016-06-21 01:25:14 +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