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

16125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
aceaf4b15d Core.Persistence - massive cleanup 2016-04-13 17:33:09 +02:00
Shannon
43f0d77c10 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 2016-04-13 16:09:14 +02:00
Stephan
7886b7814d U4-8312 - models generation false error (#1222) 2016-04-13 15:57:27 +02:00
Shannon
a3158b48ac fix merge 2016-04-12 15:18:14 +02:00
Shannon
06ce26989a Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/PropertyEditors/RelatedLinksPropertyEditor.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
 2016-04-12 15:16:19 +02:00
Stephan
365a01a476 From PetaPoco to NPoco (#1207) 
* NPoco - 2.x (builds)

* NPoco - v3.1 (does not build)

* NPoco - builds

* NPoco - configure database factory (tests fail)

* Pick fix from 7.4

* NPoco - stock v3.1 - sort-of working

* NPoco - fix merge

* Fix Newtonsoft.Json in web.Template.Debug.config

* NPoco - fix SELECT *

* NPoco - fixing repositories

* NPoco - fix EntityRepository

* NPoco - fix EntityRepository

* NPoco - cosmetic

* NPoco - use 3.1.0-u001 from github/zpqrtbnk/NPoco

* Fixes build, NPoco needed to be referenced in the cms and UmbracoExamine projects

* Fixes lots of tests

* fixes more tests

* NPoco - bugfixing

* Bugfix CacheHelper in tests

* Bugfix connection mocking in tests

* NPoco - inject database in Sql.Select<>

* NPoco - discovery retry policy only once

* Enable C# 6 for Umbraco.Core

* NPoco - introduce UmbracoSql, cleanup

* NPoco - more cleanup and fixing

* NPoco - fix UserRepository

* Optimize InGroupsOf

* Implement UmbracoDatabase.FetchByGroups

* NPoco - fix Select

* NPoco - simplify GetPagedResultsByQuery

* Cherry-pick DisableBrowserCacheAttribute fix from 7.4

* Upgrade NPoco to use Sql<TContext>

* U4-8257 - cleanup relators

* 4-8257 - cleanup more relators

* Upgrade NPoco with more OOTB version

* fixes a couple tests, changes double check lock to Lazy<T>
 2016-04-12 15:11:07 +02:00
Claus
cf7756a96d Merge pull request #1217 from umbraco/temp-U4-8298 
Fixes: U4-8298 CacheRefresher authorization logic reversed - traditio…
 2016-04-12 13:19:59 +02:00
Claus
20347c1ccd Fixing typo. 2016-04-12 13:17:41 +02:00
Shannon
36255709e6 U4-8297 Custom MembershipProvider search doesn't work in the listview 2016-04-07 18:16:03 +02:00
Shannon
506ed9f866 U4-8286 Add OWIN startup events to the UmbracoDefaultOwinStartup class 2016-04-07 17:51:09 +02:00
Shannon
f87bec398d U4-8239 DisableBrowserCacheAttribute causing YSOD when a previous exceptions is thrown before the filter kicks in 2016-04-07 16:44:45 +02:00
Shannon
1e5b6a6a0f Fixes: U4-8298 CacheRefresher authorization logic reversed - traditional load balancing will not work 2016-04-07 15:42:51 +02:00
Warren Buckley
a2f8e92098 Merge pull request #1087 from bjarnef/dev-v7-U4-6425 
U4-6425 - Maximum property for Related Links
 2016-04-07 08:47:01 +01:00
bjarnef
9d5af4ad5e Merge branch 'dev-v7' of git://github.com/umbraco/Umbraco-CMS into dev-v7-U4-6425 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
 2016-04-06 20:20:22 +02:00
bjarnef
ae154885e4 Ensure icon has a value. 2016-04-06 19:52:21 +02:00
bjarnef
2c29e422bc Add icons for internal links. 2016-04-06 19:47:05 +02:00
bjarnef
2d6b8712d5 Limit this to listview, so it doesn't affect other property editors. 2016-04-06 19:44:09 +02:00
Warren Buckley
81aad6fc64 Merge pull request #1205 from bjarnef/dev-v7-U4-8248 
U4-8248 - Add tooltip for listview layout + cursor style for listview table row
 2016-04-06 15:45:31 +01:00
Claus
58280e7d63 Merge pull request #1209 from greystate/fix-U4-8260 
Fix for U4-8260
 2016-04-06 11:12:43 +02:00
Sebastiaan Janssen
c856795cb7 Fix hilariously wrong copy/pasted TODO comments.. 2016-04-05 08:03:47 +02:00
madden-tom
2d514ac09e Added check for publish permissions to remove option for Publish At a… 
U4-287 "Publish at" circumvents "Send for approval/publishing"
 2016-04-05 08:01:05 +02:00
Sebastiaan Janssen
8e8b8bdea1 Revert "Removes old obsoleted ping.aspx" 
This reverts commit 453efc02a5.

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

U4-8274 '/umbraco/ping.aspx' is missing
 2016-04-04 09:20:59 +02:00
Sebastiaan Janssen
d8c781f97f Make the file exclusion filter more readable 2016-04-03 13:39:05 +02:00
Sebastiaan Janssen
6502470708 U4-8265 Listview list and listview grid does not handle acceptedFileTypes in same way 2016-04-03 12:08:25 +02:00
Sebastiaan Janssen
680396daab Localize server-side error message for disallowed file uploads 2016-04-03 12:08:23 +02:00
Asbjørn Riis-Knudsen
4e4ea59433 * Only restrict to image files when onlyImages is active* Handle disallowed filetypes as per other upload controls 
* Only restrict to image files when onlyImages is active
* Handle disallowed filetypes as per other upload controls
 2016-04-02 19:07:35 +02:00
bjarnef
40f7e87e04 Fix issues when using custom font icons in backoffice. 2016-04-02 13:36:55 +02:00
Warren Buckley
fbce20d0c3 Merge pull request #1158 from umbraco/temp-U4-8016 
Fixes: U4-8016 Pick only images from media
 2016-04-01 13:54:37 +01:00
Shannon
1b8747bd6d removes legacy disable user menu item and uses the new/normal way of dealing with menu items. 2016-03-31 19:41:42 +02:00
Shannon
c6a586274e Merge branch 'U4-8189' of https://github.com/danlister/Umbraco-CMS into danlister-U4-8189 
Conflicts:
	src/Umbraco.Core/Constants-Applications.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-31 19:40:07 +02:00
Shannon
4df5ddcb4c Removes old serializers for old tree formats 2016-03-31 18:50:25 +02:00
Shannon
cf822be04f Merge branch 'MangoPieface-dev-v8' into dev-v8 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-31 18:46:26 +02:00
Shannon Deminick
982fa26b7e Merge pull request #1210 from umbraco/temp-U4-8103 
U4-8103
 2016-03-31 18:26:09 +02:00
Stephan
c3055ca43f U4-8103 - fix DisableBrowserCacheAttribute to handle exceptions 2016-03-31 16:37:16 +02:00
Stephan
4cca364511 U4-8103 - refactor YSOD overlay to display inner exceptions 2016-03-31 16:36:36 +02:00
Shannon
b6f88895dc re-adds images that are still required for some of the legacy file editors 2016-03-31 14:35:49 +02:00
Shannon
734392bb0e Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2016-03-31 14:31:21 +02:00
Shannon
b22fda1e80 fixes some ysods 2016-03-31 14:28:41 +02:00
Shannon Deminick
aefe2ee1c3 Merge pull request #1196 from BatJan/dev-v8 
Part 1 of U4-8226 Remove all unused/un-needed webforms files from the Umbraco.Web and Umbraco.Web.UI projects
 2016-03-31 14:27:31 +02:00
Stephan
9e0ed94d77 Fix typo in lang xml files 2016-03-31 12:56:24 +02:00
Warren Buckley
374147a1a0 Merge pull request #1208 from umbraco/temp-U4-2954 
U4-2954 - refresh domain cache when emptying recycle bin
 2016-03-31 10:28:31 +01:00
Chriztian Steinmeier
5f0fe69c82 Update links to https 2016-03-30 21:11:29 +02:00
Chriztian Steinmeier
e325e06efc Update link to Our on Backoffice sections 2016-03-30 21:10:41 +02:00
Chriztian Steinmeier
5e7db1047b Add the missing 't' ⚡ 2016-03-30 21:09:14 +02:00
Stephan
61fe0a4a93 U4-2954 - refresh domain cache when emptying recycle bin 2016-03-30 17:56:34 +02:00
Warren Buckley
aa1aabef3a Merge pull request #1204 from umbraco/temp-U4-7862 
U4-7862 Brackets cause issues in the stylesheet editor
 2016-03-30 16:11:15 +01:00
Shannon
79bebb9e14 Merge remote-tracking branch 'origin/dev-v8' into dev-v8 
Conflicts:
	src/Umbraco.Web.UI/config/trees.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 16:08:08 +02:00
Shannon
74e1078c31 Merge branch 'U4-8198_file_system' of https://github.com/yannisgu/Umbraco-CMS into yannisgu-U4-8198_file_system 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 16:07:45 +02:00
Warren Buckley
659af0ba48 Merge branch 'U4-8194' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-8194 
# Conflicts:
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 14:44:03 +01:00
Shannon Deminick
3c697436b1 Merge pull request #1195 from yannisgu/U4-8193 
U4-8193  replaced loadMacros with MacrosTreeController
 2016-03-30 15:15:41 +02:00