3aaa33ebe9
added .log file extension for backup logs.
2016-11-14 11:55:09 +00:00
4ae7a32e29
Fix for maximum file size.
2016-11-14 11:54:42 +00:00
a031551fb2
Rationalised changes in whitespace, to reduce the differences in the PR
2016-11-08 17:59:30 +00:00
69728fb5c4
Changed Allowed Templates setting to be validate templates which checks url only
2016-11-08 08:27:18 +00:00
c6e4e3b3ed
Merge origin/dev-v7-deploy into dev-v8-zbwip
2016-11-04 18:40:42 +01:00
8fa1499a2f
Merge origin/dev-v7 into dev-v7-deploy
2016-11-04 12:18:39 +01:00
dfbadb1550
U4-9148 noNodes Splash screen apostrophe char typo fixed (in "Be a part of the community" - we're)
2016-11-03 17:03:33 +00:00
392319d26c
Adding check for converter enablement to James's converters that need it
2016-11-03 16:43:23 +00:00
afd91f8adb
Added ability to only allow templates what are allowed by the document type
2016-11-03 16:25:45 +00:00
be8632db1c
Adding EnablePropertyValueConverters setting to umbracoSettings.config so that all the new converters can be disabled.
...
Readded existing JArray converter for RelatedLinks but renamed to LegacyRelatedLinksEditorValueConvertor
2016-11-03 13:30:41 +00:00
b26b415096
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
2016-11-03 10:31:44 +01:00
b1800305b8
Removed user types and migrated them to groups. Returned to compiling state.
2016-10-28 09:20:52 +02:00
2d9aeb3aa1
Removed relationship between users and applications and got back to a compiling state.
...
Set up editing screens for group/node permissions.
2016-10-27 18:11:46 +02:00
cbb36a900a
Management of user groups with assignment of users.
...
Migration for creation of user group tables and data amends for moving from permissions on users to those on groups.
2016-10-26 22:38:54 +02:00
e330d40005
U4-9090 - Upgrade to ModelsBuilder 3.0.5 (reuse compiled live dll on restart)
2016-10-25 12:40:27 +02:00
e8538cc035
Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy
2016-10-20 12:23:22 +02:00
dda988f0ea
Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy
2016-10-18 12:25:31 +02:00
08733d7351
Update noNodes.aspx
...
Grammar correction
2016-10-17 14:28:16 +01:00
c839285f90
Grid: Quote editor - wrong CSS style rule for italic
...
[Issue #U4-9073](http://issues.umbraco.org/issue/U4-9073 )
In `grid.editors.config.js`, the style config for the Quote editor has an incorrect CSS style rule for italic, it has...
```css
font-variant: italic;
```
It should be...
```css
font-style: italic;
```
I wasn't sure which `grid.editors.config.js` to change, so I did them all.
2016-10-14 16:37:06 +01:00
b3e6f0fd22
Merge branch 'refs/heads/dev-v7' into dev-v7-deploy
...
# Conflicts:
# src/Umbraco.Core/IO/FileSystemExtensions.cs
2016-10-06 10:35:45 +02:00
061f1ae0b1
U4-9005 Update comments in urlrewriting.config to note it's obsolete
2016-10-05 17:49:09 +02:00
7176c99264
Merge branch origin/dev-v7 into dev-v7-deploy
2016-09-21 16:03:17 +02:00
8091d9a098
Resetting UmbracoSettings file in this PR back to what it was previously - seems to have been committed by mistake
2016-09-16 11:04:50 +01:00
ab3b04c165
Fix SqlHelper so it uses to current db connection
2016-09-15 12:14:25 +02:00
c2eeff6e47
U4-8954 - fix WhereIn issue with non-value-types
2016-09-08 10:37:03 +02:00
fa45cd1a88
tmp
2016-09-02 14:44:16 +02:00
14b527a9fa
Makes sure the redirect dashboard is added in zip and for NuGet upgrades
...
Also adds healthcheck for NuGet upgrades
2016-08-09 14:12:28 +02:00
1f8dc9a424
move dashboard from App_Plugins to dashboards folder
2016-08-05 12:36:10 +02:00
b4d5140d07
WIP Starting with taking Marc's code to get a rudimentary dashboard for the 301 URL tracker
2016-08-03 17:57:01 +02:00
080da771ff
U4-8457 Ensure <MacroErrors> default is updated from legacy inline setting to newer throw setting
...
#U4-8457 Fixed
2016-08-02 14:37:08 +02:00
f584404324
U4-8551 - import NuCache code
2016-07-20 18:43:53 +02:00
3c7245f9ba
Merge origin/dev-v7 into dev-v8
2016-07-08 16:32:06 +02:00
f58c9b5056
Merge branch 'u4-8191' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8191
...
Conflicts:
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs
2016-06-21 17:33:57 +02:00
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
afcf2e195e
Upgrade to ModelsBuilder 3.0.3
2016-06-20 16:10:06 +02:00
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
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
d83d7956bb
Dev v7 health check ( #1220 )
...
Adds health check feature including some initial checks
2016-06-13 17:42:05 +02:00
cba91145ee
Updates new packages tree, obsoletes old one, have the package UI running for root node and sub nodes only for created packages.
2016-06-12 15:19:42 +02:00
7b101caf0b
update examine documentation links
2016-06-03 11:36:07 +02:00
2ce2a03072
Local installer
2016-06-01 13:03:19 +02:00
f5f7cf8d63
Merge pull request #1277 from umbraco/temp-u4-8447
...
U4-8447
2016-06-01 12:57:01 +02:00
6a5a736877
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
...
# Conflicts:
# .gitignore
# build/UmbracoVersion.txt
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
# src/Umbraco.Core/Services/DataTypeService.cs
# src/Umbraco.Core/Xml/XmlHelper.cs
# src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
# src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
# src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web.UI/config/ClientDependency.config
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/LabelPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
# src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
# src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
# src/umbraco.cms/businesslogic/Packager/Installer.cs
# src/umbraco.cms/businesslogic/translation/Translation.cs
2016-05-31 16:00:32 +02:00
8c33a31f37
U4-8447 - fix services setup
2016-05-30 17:56:25 +02:00
259ccd653e
Added dummy data to packages
2016-05-26 14:13:55 +02:00
21fb67654b
Merge dev-v8 into dev-v8-ExamineV2
2016-05-19 18:52:09 +02:00
7621006200
updates trees.Release.config with correct tree
2016-05-19 18:17:49 +02:00
1d8e0eb280
Merge branch 'u4-8192' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8192
...
# Conflicts:
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2016-05-19 18:16:47 +02:00
ed40ce0695
Merge branch 'dev-v8' into dev-v8-ExamineV2
2016-05-19 18:13:19 +02:00
c53d074aaf
Merge branch 'U4-8195' of https://github.com/Mantus667/Umbraco-CMS into Mantus667-U4-8195
...
# Conflicts:
# src/Umbraco.Web.UI/config/trees.Release.config
# src/Umbraco.Web.UI/config/trees.config
# src/Umbraco.Web/Umbraco.Web.csproj
2016-05-19 17:56:11 +02:00
Ali Sheikh Taheri