51b19bedc8
Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Editors/GravatarController.cs
# src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
2017-06-14 22:30:36 +02:00
08c4a75af7
Merge pull request #1945 from protherj/U4-9792-fips-support
...
U4-9792 -- Update Umbraco to be FIPS compliant
2017-06-13 15:05:21 +02:00
121036ebb9
Merge branch 'dev-v7.7' into user-group-permissions
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
2017-06-05 10:35:23 +02:00
d8811d6b46
Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5.
2017-05-10 13:35:28 -07:00
712cd29fea
Upload checks to utilise whitelist. Refactored check on white and black list to common extension method.
2017-05-09 23:29:30 +02:00
3d21448f89
Validated file uploads using white list if provided, before falling back to blacklist
2017-05-09 18:12:51 +02:00
24e2547656
Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b
...
# Conflicts:
# src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
# src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
# src/Umbraco.Core/Persistence/RepositoryFactory.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/SectionService.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
# src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2017-05-04 18:29:43 +10:00
604bddabdf
Updateing the app.configs with the correct redirects for log4net since alll package installs are going to change these
2017-04-07 12:04:05 +10:00
16582c8207
U4-9745 Update outdated NuGet dependencies
2017-04-06 16:27:41 +02:00
7fa8f04b11
deploy-257 Downgrade Core and Deploy to framework 4.5
2017-03-08 11:20:48 +01:00
f4f1f6774d
U4-9499 Update to latest Json.Net
2017-02-08 17:47:32 +11:00
72910cb35e
Updates everything to .Net 4.6.2, had to update the semver reference too - no breaking changes though
2017-02-07 00:22:34 +11:00
ede342feba
Finds all other instances where a reader would be executed inside another reader's loop and fixes
2017-01-16 16:38:23 +11:00
4e2fb8e5dc
Fixes IP nuget references and fixes up several other Nuget assembly references.
2017-01-03 10:36:26 +11:00
ee3a4614c3
Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks
2016-11-26 18:02:57 +01:00
0e57d558f6
updates cdf version
2016-11-18 14:34:31 +01:00
b1800305b8
Removed user types and migrated them to groups. Returned to compiling state.
2016-10-28 09:20:52 +02:00
344dab65d4
U4-8868 Ensuring all usages of .live() is updated
...
changed .on bind handlers to use .live instead.
removed an old jquery.1.4.4 which seems unreferenced and unused in the whole project.
2016-08-18 12:45:15 +02:00
5620074790
U4-8718 Latest ClientDependency release
2016-08-10 14:40:54 +02:00
ca0ffe23ba
U4-8718 Latest ClientDependency release
2016-07-11 09:39:54 +02:00
b94c396d4e
Code sample No.5
2016-01-05 23:20:47 +01:00
1bf2a3b1bf
Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7
...
Conflicts:
src/Umbraco.Web/Editors/ImagesController.cs
2015-12-15 11:12:13 +01:00
3b404a2f76
U4-7314 Change name of "Textbox Multiple" to "Large textbox" or "Textarea"
2015-10-29 13:54:16 +01:00
d87b268a40
Update to MVC5
2015-07-30 17:08:39 +02:00
86ad3f6b05
Makes sure that R# doesn't suggest C#6 features
2015-07-24 17:25:52 +02:00
9bdb91b3c0
latest examine
2015-07-23 18:03:44 +02:00
c2dc896fce
working on: U4-6756 Don't ship or generate unnecessary folders
2015-07-16 15:29:46 +02:00
db0cfad6b9
Merge 7.2.7 into dev-v7
...
Conflicts:
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Tests/packages.config
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/packages.config
src/umbraco.MacroEngines/packages.config
src/umbraco.cms/packages.config
src/umbraco.cms/umbraco.cms.csproj
src/umbraco.controls/umbraco.controls.csproj
src/umbraco.editorControls/umbraco.editorControls.csproj
2015-07-14 19:57:56 +02:00
a7871abbd9
Update Examine and ClientDependency to latest version
2015-07-14 16:50:45 +02:00
d63f83f7c7
Fixes: U4-6786 Update to CDF 1.8.4
2015-07-03 11:40:41 +02:00
d2dc4efed8
U4-5559 Fix Typo "Seperate" to Separate
2015-06-15 16:12:46 +02:00
4f02a13a46
U4-5559 Fix Typo "Build-In" (Code)
2015-06-15 16:07:45 +02:00
d2deaf0375
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
95ff94c532
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/packages.config
2015-05-11 12:26:53 +10:00
a4a49b1466
Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC.
2015-05-11 11:45:13 +10:00
3be1cd8b0d
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/packages.config
2015-05-07 16:24:29 +10:00
1cac4ed075
Fixes MVC 4.0.0.1 problem once and for all.
2015-05-07 08:10:45 +10:00
2f9753cc12
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/umbraco.presentation/content.cs
src/umbraco.macroRenderings/app.config
2015-05-05 12:27:01 +10:00
be065b2fa3
Generate symbols nupkg (apparently you can create it from an existing NuSpec file, very cool)
...
Making sure that all pdbs ARE actually generated in Release mode (the AllBinaries file was missing loads of files)
Generate all and include all xml doc files too
Corrects WebPI zip, also shouldn't include dotLess.Core.dll
2015-05-01 14:27:26 +02:00
ff602da0fa
Updates owin packages and updates the web.config tempate for owin redirects
2015-04-01 13:41:45 +11:00
a2a8c8fbd7
updated to latest owin
2015-04-01 13:41:36 +11:00
93df2edec2
Initial install which now uses Identity middleware to perform the back office auth (no longer done in our module). Created custom data secure classes that use the legacy Forms auth logic for backwards compat. This means that the cookie can still be written the old way and still auth the new way if required. Now need to clean a lot of this up.
2015-04-01 13:41:16 +11:00
f15301a7a0
Merge remote-tracking branch 'origin/dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-20 08:26:16 +11:00
311d503d8b
Updates CDF dependency to latest version
2015-03-19 12:54:00 +01:00
5342d819d9
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
2015-02-18 17:40:29 +01:00
b2399e97cc
updates cdf refs
2015-02-18 17:39:33 +01:00
8abf6fc2b5
Cleans up legacy stylesheet code to wrap the new APIs better, creates a new OriginalPath property on IFile to track if the path has changed, updates FileRepository to deal with path's changing and automatically deal with renaming files. Adds new methods to IFileService: GetStylesheetsAtPath. Fixes up the stylesheet and stylesheet property editors to use the file names, gets tree syncing working nicely for them both even with files or properties are renamed. Updates stylesheet editors and controllers to use the new APIs
2015-01-15 11:49:32 +11:00
8f35c8fb57
Fixes: U4-5996 CDF reference issue
2014-12-11 17:55:53 +11:00
a1c223bc2b
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
...
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
2014-11-26 10:43:46 +01:00
f4231b1692
Upgrade to System.Web.Mvc 4.0.0.1 (or 4.0.40804.0 whatever you want to call it)
2014-10-17 17:24:32 +02:00
Shannon