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

13063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
053346d79b fixes merge 2015-07-08 11:54:10 +02:00
Shannon
044c9c95f8 Merge branch 'dev-v7-U4-6677' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6677 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/panel.less

Conflicts:
	src/Umbraco.Web.UI.Client/src/less/panel.less
 2015-07-08 11:49:09 +02:00
Shannon
b23ea69b3e Fixes: U4-6636 Left navbar (section-bar) is unnecessary wide on mobile devices 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/grid.less
 2015-07-08 11:48:17 +02:00
Shannon
46f9c5ff05 Fixes: U4-5052 (U7) Previewing a published page changes icon in content tree to the little green plus indicating changes need to be published even though no changes have been made. 2015-07-08 11:46:03 +02:00
Shannon
3bc4b50d74 updates version 2015-07-08 11:36:50 +02:00
Shannon
1a2849dfb0 fixes merge issues 2015-07-08 11:35:55 +02:00
Shannon
bcb5883230 Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
 2015-07-08 11:16:46 +02:00
Shannon
18080c1cfb Fixes: U4-6796 BackOfficeIdentity gets assigned inadvertently for front-end requests if using ui.Text to localize 2015-07-08 11:13:49 +02:00
Shannon
2600a3887e Fixes issue with upgrading - potential file lock issues and also file check for access.config 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MovePublicAccessXmlDataToDb.cs
 2015-07-08 11:13:24 +02:00
Shannon
45bec2a67d Fixes date picker: U4-6715 i can't seem to remove a "publish-at" date? - date picker is more robust now and does proper validity checking/feedback 2015-07-08 11:12:19 +02:00
Shannon
da7456fd2a Fixes up unit test for testing back office request to ensure that the GlobalSettings.Path is consistent with a vdir 2015-07-08 11:11:17 +02:00
Shannon
275ba00e24 Fix IsBackOfficeRequest returning false for virtual directory paths - U4-6346 2015-07-08 11:10:30 +02:00
Shannon
d00bf4649d Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346 
Conflicts:
	src/umbraco.cms/Actions/Action.cs
 2015-07-08 11:10:18 +02:00
Shannon
04976f8063 U4-6202 - cache clearing by object type 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2015-07-08 11:08:19 +02:00
Shannon
3e7c9fc81e Fixes: U4-6202 Cache not clearing by object type properly 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2015-07-08 11:07:53 +02:00
Shannon
a1f4d7b16f Fixes: U4-5798 The database configuration failed with the following message: The incoming request has too many parameters. The server supports a maximum of 2100 parameters. 2015-07-08 11:05:30 +02:00
Shannon
811ef4a444 Fixes: U4-5673 SQL Azure cannot drop clustered index on upgrade 2015-07-08 11:03:42 +02:00
Shannon
69ac621f5a Fixes: U4-5670 Umbraco.DropDown List pre value with alias ** already exists for this data type 2015-07-08 11:03:10 +02:00
Shannon
610582df38 U4-5162 - do not cache macro if previewing 2015-07-08 11:02:30 +02:00
Shannon Deminick
cf16692b5a Merge pull request #741 from abryukhov/patch-2 
UI localization (RU) - All 7.2 and actual at the moment 7.3 keys
 2015-07-08 09:53:23 +02:00
Shannon
5d60440a6f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-07 18:27:38 +02:00
Shannon
0fe96e80c9 Fixes: U4-6782 ContentTypeService should support getByKey(Guid) and refactors a little bit of the RepositoryBase stuff with the addition of IReadRepository, adds some tests to support. 2015-07-07 18:26:53 +02:00
Shannon
a712726065 Updates the logger and how to output process id and app domain id with the default log4net patterns. 2015-07-07 16:18:57 +02:00
Shannon
253b9dab27 Ensures log4net is shutdown on app shutdown 2015-07-07 16:12:05 +02:00
Shannon
1ffde1e9a6 makes log tests go a little quicker 2015-07-07 16:11:49 +02:00
Shannon
f6e0dfe9dc Changes published media cache log output to warnings (when indexes are not found) 2015-07-07 16:11:33 +02:00
Sebastiaan Janssen
30dfd2772b "+" in the version doesn't work with the current NuGet 2015-07-07 15:20:35 +02:00
Alexander Bryukhov
f93364ab96 All 7.2 and actual at the moment 7.3 keys 2015-07-07 19:17:56 +06:00
Sebastiaan Janssen
b903e0503f "+" in the version doesn't work with the current NuGet 2015-07-07 15:11:58 +02:00
Sebastiaan Janssen
b0ccb040a1 Makes sure we can have nightlies for non-pre-releases as well 2015-07-07 15:11:57 +02:00
Sebastiaan Janssen
db030ffa31 Adds the ability to pass in a nightly version to the version comment 2015-07-07 15:11:57 +02:00
Shannon
cf90e9a6b8 Fixes: U4-6796 BackOfficeIdentity gets assigned inadvertently for front-end requests if using ui.Text to localize 2015-07-07 12:05:51 +02:00
Shannon
7c451411cb Fixes issue with upgrading - potential file lock issues and also file check for access.config 2015-07-07 11:24:28 +02:00
Shannon
bf19d61d14 bumps txt version 2015-07-06 18:02:25 +02:00
Shannon
2cd5551913 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-06 17:57:07 +02:00
Shannon
3a3917c1fc Fixes: U4-4231 remove umbracoUserLogins table 2015-07-06 17:52:07 +02:00
Shannon
7e798e18e8 Fixes: U4-6789 Core.Models.Macro is internal 2015-07-06 17:50:10 +02:00
Shannon Deminick
9cb5026a0a Merge pull request #740 from shwld/dev-v7 
update language conf file (ja)
 2015-07-06 17:36:23 +02:00
Stephan
39a9d68f43 U4-6785 - crlf when serializing to xml 2015-07-06 15:32:06 +02:00
Stephan
8c54f2edc9 U4-6788 - refactor OriginalRequestUrl into UmbracoApplicationUrl 2015-07-06 13:58:10 +02:00
Stephan
d26b12137b CoreBootManager - report version in log 2015-07-03 16:39:35 +02:00
Stephan
081d6f9158 Logger - report process and domain ID 2015-07-03 16:39:34 +02:00
Stephan
b52439f8f1 AsyncLock - support timeout when async-locking 2015-07-03 15:42:09 +02:00
Shannon
d63f83f7c7 Fixes: U4-6786 Update to CDF 1.8.4 2015-07-03 11:40:41 +02:00
Shannon
85158abb5f removes unit test that no longer makes any sense. 2015-07-02 18:27:55 +02:00
Shannon
c917fc37ae Fixes: U4-6113 Cannot delete member with upload field 2015-07-02 17:20:27 +02:00
Shannon
f68cdf43e1 Fixes: U4-6099 cmsLanguageText.languageId needs to be a foreign key to the umbracoLanguage table 2015-07-02 17:19:42 +02:00
Shannon
f0742c9d7c Fixes: U4-6733 Adding dictionary item (7.3): No parent dictionary item was found with id 41c7638d-f529-4bff-853e-59a0c2fb1bde 2015-07-02 14:52:01 +02:00
Shannon
32e21b0314 Fixes: U4-5798 The database configuration failed with the following message: The incoming request has too many parameters. The server supports a maximum of 2100 parameters. 2015-07-02 14:30:21 +02:00
Shannon
22c035c9b9 Fixes test 2015-07-02 11:21:46 +02:00