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

515 Commits

Author SHA1 Message Date
Sebastiaan Janssen
ccb8ac4cfc Merge branch 'dev-v7' into U-9333 
# Conflicts:
#	src/Umbraco.Web.UI/packages.config
 2017-01-03 14:19:43 +01:00
Shannon
b9c90af8be U4-9329 ExamineIndex.config should not ship with the {machinename} token for Examine 
Removes Sync from being the default for developers locally (that shouldnt have been committed), actually removes the machinename token from release
 2017-01-03 17:37:15 +11:00
Niels Hartvig
afbceca184 Makes EXIF data in resized images default 2017-01-02 17:29:37 +01:00
Shannon
0daaa3e785 Revert "Merge pull request #1618 from AliSheikhTaheri/U4-9180" 
This reverts commit 4050a375bc, reversing
changes made to a058f26462.
 2016-12-20 12:28:45 +11:00
Shannon Deminick
4050a375bc Merge pull request #1618 from AliSheikhTaheri/U4-9180 
U4-9180 Optimise Log4net
 2016-12-20 11:08:11 +11:00
Ali Sheikh Taheri
19b24b5109 Added maximum number of backups to keep. 2016-11-14 11:56:21 +00:00
Ali Sheikh Taheri
3aaa33ebe9 added .log file extension for backup logs. 2016-11-14 11:55:09 +00:00
Ali Sheikh Taheri
4ae7a32e29 Fix for maximum file size. 2016-11-14 11:54:42 +00:00
Steve Morgan
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
Stephan
e330d40005 U4-9090 - Upgrade to ModelsBuilder 3.0.5 (reuse compiled live dll on restart) 2016-10-25 12:40:27 +02:00
richarth
08733d7351 Update noNodes.aspx 
Grammar correction
 2016-10-17 14:28:16 +01:00
leekelleher
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
Sebastiaan Janssen
061f1ae0b1 U4-9005 Update comments in urlrewriting.config to note it's obsolete 2016-10-05 17:49:09 +02:00
Warren Buckley
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
Stephan
c2eeff6e47 U4-8954 - fix WhereIn issue with non-value-types 2016-09-08 10:37:03 +02:00
Stephan
fa45cd1a88 tmp 2016-09-02 14:44:16 +02:00
Sebastiaan Janssen
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
Mads Rasmussen
1f8dc9a424 move dashboard from App_Plugins to dashboards folder 2016-08-05 12:36:10 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
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
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
Stephan
afcf2e195e Upgrade to ModelsBuilder 3.0.3 2016-06-20 16:10:06 +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
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
d83d7956bb Dev v7 health check (#1220) 
Adds health check feature including some initial checks
 2016-06-13 17:42:05 +02:00
Shannon
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
Damiaan
7b101caf0b update examine documentation links 2016-06-03 11:36:07 +02:00
Simon Busborg
2ce2a03072 Local installer 2016-06-01 13:03:19 +02:00
Simon Busborg
259ccd653e Added dummy data to packages 2016-05-26 14:13:55 +02:00
Shannon
fb55b0a60b U4-8371 Dont ship with the {machinename} token for Examine 2016-05-10 18:32:32 +02:00
Stephan
271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +02:00
Shannon
7e13781d8b fixes merge issue 2016-04-20 16:04:35 +02:00
Shannon
82b4b4e668 Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5 
Conflicts:
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
 2016-04-13 14:44:22 +02:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Shannon
80d7443bd3 fix build 2016-04-05 16:00:49 +02:00
Shannon
61f9845db0 bumps version 2016-03-23 10:06:53 +01:00
Sebastiaan Janssen
fb42574c34 Revert "U4-5334 Richtext editor inserts extra p - tags to html output" - apparently it does just as much harm as it does good 
This reverts commit 9ad3b6a337.
 2016-03-12 21:02:05 +01:00
Sebastiaan Janssen
9ad3b6a337 U4-5334 Richtext editor inserts extra p - tags to html output 
#U4-5334 Fixed
 2016-03-12 12:58:53 +01:00
Sebastiaan Janssen
b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Stephan
b6a9734755 Fix ModelsBuilder integration 2016-02-09 11:46:26 +01:00
bjarnef
0bfc5f1272 Change icons in tinymce config 2016-02-08 15:07:16 +01:00
Shannon
e423864781 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
	src/Umbraco.Web.UI.Client/src/less/hacks.less
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/WebBootManager.cs
 2016-02-03 12:30:11 +01:00
Shannon
6faa7e2fc9 dont' have RebuildOnAppStart set for dev purposes! 2016-01-28 18:31:47 +01:00
Shannon
adc3c1e927 updates to latest MB 2016-01-20 18:08:34 +01:00
Shannon
8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Sebastiaan Janssen
49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Stephan
fb1a72600e Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002 2016-01-15 12:37:15 +01:00
Shannon
b79c7407e6 Removes unecessary promise wrapping for localizing, fixes localization service so that it's not double requesting and fixes how it deals with promise returns. 2016-01-15 11:49:29 +01:00
Simon Busborg
e47d72a51f Added localize to dialogs 2016-01-14 11:44:29 +01:00
Shannon
20f2773f38 removes the config option registered in the file 2016-01-13 17:09:55 +01:00