Warren Buckley
54a2aa00a7
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
Shannon
390514cd9d
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
# src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
# src/Umbraco.Core/Security/BackOfficeUserManager.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
# src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
# src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/routes.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/content/copy.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
# src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
# src/Umbraco.Web.UI/config/splashes/noNodes.aspx
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/MemberTypeController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Routing/PublishedContentRequest.cs
# src/Umbraco.Web/Routing/UrlProviderExtensions.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
2018-07-18 13:19:14 +10:00
Morten Larsen
7a07649e2b
Update links in the noNodes splash screen
2018-07-14 10:26:46 +02:00
Stephan
7a615133ff
Renormalize
2018-06-29 19:52:40 +02:00
Sebastiaan Janssen
b70f543790
Reverts wrongly committed files
2017-10-23 14:02:00 +02:00
Stephan
edfe212227
Fix login issue
2017-10-20 15:35:30 +02:00
Stephan
c76403077f
Normalize cr/lf/tab
2017-07-20 11:21:28 +02:00
Stephan
07a05317ff
Merge dev-v7.6 into dev-v8
2016-12-14 14:06:30 +01: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
b26b415096
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
2016-11-03 10:31:44 +01:00
richarth
08733d7351
Update noNodes.aspx
...
Grammar correction
2016-10-17 14:28:16 +01:00
Shannon
1aa52b4cc9
removes old helpers/url
2015-12-22 16:43:11 +01:00
Shannon
22b8d41aee
U4-5963 There should be no external request dependencies - updates nonodes, removes the font references that is never used, replaces the open sans font-reference with the one that we already have locally and uses it.
2015-10-15 19:08:53 +02:00
Sebastiaan Janssen
1f3c396c5b
Using protocol-relative URLs is an antipattern, just use https if you know it exists
2015-09-16 19:00:14 +02:00
Sebastiaan Janssen
8442b2e8e7
Updates installer backgrounnd and nonodes page
2014-12-03 16:51:16 +01:00
markvantilburg
4a8a09c78a
Update booting.aspx
...
Throw the exception immediately if the parameter is not there or empty.
If the parameter is not there it's defaulted to the current url, and this will redirect to itself and create an endless loop here.
2014-01-13 11:33:24 +01:00
Shannon
367cdde35e
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/umbraco.cms/businesslogic/workflow/Notification.cs
2013-11-08 08:55:22 +11:00
Tim Payne
4ea04f5ffe
Fixes issue U4-2708
2013-11-07 10:08:11 +00:00
diachedelic
d09b34dd03
* Updated references to 'umbraco.aspx' in static content
...
* URI encode query strings in frontend API calls
2013-10-25 16:07:20 +11:00
Sebastiaan Janssen
60867af1a7
Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico
...
Also fixes casing of folder names
2013-07-15 16:31:19 +02:00
Shannon Deminick
01bf0bcfa5
Fixes merge issues
2013-04-06 01:41:06 +06:00
Shannon Deminick
7dcfcaf339
Merge with 6.0.4
2013-04-06 01:23:29 +06:00
Shannon Deminick
e22988e435
Merged with 4.11.7
2013-04-06 00:21:06 +06:00
Shannon Deminick
165d9c7dff
Fixed nonodes to now show version information and updated it so that it redirects to root if there
...
is actually content so the page is actually not accessible unless you actually have no nodes.
2013-04-05 21:58:13 +06:00
Shannon Deminick
1be3af1e31
Working on #U4-1358 - moving Base page classes to their correct location/assembly. Migrated all installation webforms files and associated helper files to
...
their correct locations/namespaces/assemblies and obsoleted all of the old ones and ensure the old webforms files don't exist where the obsoleted ones were.
Fixes a security issue with the installer ajax service (used to be p.aspx, now is InstallerRestService.aspx)
2013-02-03 05:06:11 +06:00
NielsHartvig@UMBRACORATI.localdomain
5f1e327e4a
Fixes U4-1485 Booting.aspx has potential Open Redirect flaw
2013-01-17 08:38:09 -01:00
NielsHartvig@UMBRACORATI.localdomain
168b38b2a3
Update to U4-1485 for 4.11.4
2013-01-17 08:47:42 -01:00
Shannon Deminick
ca62b3aedb
adds umb favicon to installer and back office. This also ensures it doesn't get overridden by package files (some do that).
2012-12-03 03:21:07 +05:00
Morten Christensen
0ae707fe78
Refactoring the umbraco version from GlobalSettings to be a seperate class that simply wraps the version from the assembly.
...
Since the version will come from the assembly there is no need to have it as part of the GlobalSetting, which is internal and needs a makeover of its own.
2012-11-26 11:18:06 -01:00
Morten Christensen
3fe1975514
Refactoring usages of umbraco.GlobalSettings.CurrentVersion to use the new Umbraco.Core.Configuration.GlobalSettings.Version
2012-11-26 09:57:05 -01:00
Stephan
abe4944843
routing - handle when umbraco is not ready or has no content
2012-09-28 11:11:47 -02:00
Matt@MBP13-PC
9b8d40ee2d
Fixed broken noNodes page
2012-08-07 07:53:19 -01:00
shannon@ShandemVaio
62f4db0b76
added Umbraco.Web.UI containing only web rendering files
2012-07-18 04:35:30 +06:00
