yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,973 Commits 4 Branches 7 Tags
85ebcadcdd29b50fdaf5159c2c54a0dbfecf9ca4
Commit Graph

2268 Commits

Author SHA1 Message Date
Shannon
ba1d546579 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/UmbracoExamine/UmbracoExamine.csproj
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2015-07-15 14:58:19 +02:00
Sebastiaan Janssen
8baaae4da6 Merge branch '7.2.7' into master-v7 2015-07-15 12:58:48 +02:00
Shannon
b4bb15c66f fixes up a bower reference 2015-07-14 10:47:51 +02:00
Stephan
d83fdb48c9 Merge branch 7.2.7 into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/AsyncLock.cs
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/ServerEnvironmentHelperTests.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/less/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/less/property-editors.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/UI/JavaScript/JsInitialize.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-13 22:45:37 +02:00
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
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
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
42b2b16f0e fixes js error with date picker 2015-06-26 10:06:22 +02:00
Shannon
f14989f7fd Updates code for U4-6579 with equals check and adds logic to the content editor too 2015-06-26 10:06:07 +02:00
Shannon
acf7fa7907 Updates code for U4-6579 with equals check and adds logic to the content editor too 2015-06-26 10:01:32 +02:00
David Greasley
73de12037e Fixes U4-6579: Checks if media item being deleted was at the root then redirects to the root, otherwise redirects to parent item. 2015-06-25 21:11:36 +01:00
Shannon
95d8fe239e fixes js errors with grid and date picker 2015-06-25 16:40:48 +02:00
Shannon
9901b2ee3d Fixes: U4-6754 Resizing image in RTE passes invalid dimension parameters to ImageProcessor 2015-06-25 15:18:07 +02:00
Shannon
346d13174a Fixes: U4-6624 Sensitive form field has not disabled autocomplete 2015-06-25 14:40:28 +02:00
Shannon
84cac6ac90 Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror 2015-06-24 19:06:42 +02:00
Shannon Deminick
e758bf2eca Merge pull request #716 from rasmusfjord/dev-v7 
Updating image cropper interface
 2015-06-24 17:49:17 +02:00
Shannon
4f5c24d2e3 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-24 11:39:57 +02:00
Shannon
f82d8a5df1 updates bower and bower install task. 2015-06-24 11:39:50 +02:00
bjarnef
1cade7f8c7 Add unique id for TextSearch / LuceneSearch 
Add unique id for TextSearch / LuceneSearch for each searcher.
 2015-06-23 22:28:49 +02:00
Shannon Deminick
37211b9a2c Merge pull request #721 from robertjf/dev-v7 
Issue U4-6734 Fix: Tweaks to TreePicker dialog for better entity support
 2015-06-23 11:09:02 +02:00
Shannon
40c35e5851 Fixes: U4-6582 RTE "Link To File" missing rel="nodeId" attribute 2015-06-23 10:53:56 +02:00
Robert Foster
05d59bba73 Merge remote-tracking branch 'upstream/dev-v7' into dev-v7 2015-06-20 09:42:09 +10:00
Robert Foster
d5baa586cf Adds the ability to provide the Entity Type to the treepicker dialog controller rather than just guessing from the type. This allows other types than just Document, Media or Member to be picked properly without errors. 
Also fixed treepicker prevallue controller to pass in treeAlias properly to treepicker dialog.
 2015-06-20 09:37:20 +10:00
Shannon
3496a064c9 Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs 2015-06-19 10:54:46 +02:00
Shannon
c962a9331a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-18 10:04:45 +02:00
Shannon
b175177770 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-06-18 10:04:22 +02:00
Shannon
08ff284121 adds test to ensure the service level can remove a scheduled publish date, obsoletes method: GetHasPermission 2015-06-18 09:44:16 +02:00
Shannon Deminick
221183d791 Merge pull request #718 from WebCentrum/dev-v7-gridsort2 
Fixed bug in U4-6593 - After sort, reset the TinyMCE editors with previous settings
 2015-06-17 15:22:52 +02:00
Shannon
be84db097a Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version 2015-06-17 15:06:34 +02:00
Allyen
eaaccdad75 Fixed bug in U4-6593 - After sort, reset the TinyMCE editors with previous settings 2015-06-17 14:57:15 +02:00
Shannon
d77f95f29b removes tutorial docs and irrelavent readme and todo files, updates docs build to exclude tutorials header 2015-06-17 11:56:20 +02:00
Shannon
aef1fb13b1 Fixes: U4-6148 Grid values should not store meta data/grid configuration, the grid config should be accessed globally for use in rendering the grid 2015-06-17 09:59:25 +02:00
Shannon
10d368696d Updates grid editor to filter the values that will be persisted so it's a minimal subset. 2015-06-16 15:49:09 +02:00
Shannon
10c8645b5f fixes button alignment now that the left section panel shrinks 2015-06-15 18:10:54 +02:00
Shannon
3c353fc7f9 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-15 17:47:01 +02:00
Shannon
03a8ee437d 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
 2015-06-15 17:43:06 +02:00
Rasmus Fjord
d57561b0e3 Updating image cropper interface to show crop more intuitive and also fixing u4-4622 2015-06-15 16:39:07 +02:00
Damiaan
d2dc4efed8 U4-5559 Fix Typo "Seperate" to Separate 2015-06-15 16:12:46 +02:00
Shannon
29b64965ed Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-15 13:35:01 +02:00
Shannon
1e5a7a13dd fixes tree sync when the tree type alias isn't the correct case 2015-06-15 13:34:54 +02:00
Shannon Deminick
e6cc90f6dd Merge pull request #714 from Tobz91/U4-6699 
Removed capitalize from headings
 2015-06-15 13:28:09 +02:00
Shannon
c29af1df48 Fixes: U4-6636 Left navbar (section-bar) is unnecessary wide on mobile devices 2015-06-15 13:18:46 +02:00
Tobz91
8451a020dd Removed capitalize from headings 
To avoid uppercase on first letter in every word for headings (in modals
for example).

Issue: http://issues.umbraco.org/issue/U4-6699
 2015-06-15 13:18:18 +02:00
Shannon Deminick
b1fda57e50 Merge pull request #707 from trankin/bugfixes/U4-6687 
Fix U4-6687: Can't add multiple instances of a macro in RTE in 7.2.6 …
 2015-06-15 12:05:14 +02:00
Shannon Deminick
4cd8522921 Merge pull request #706 from bjarnef/dev-v7-U4-6058 
U4-6058 - Move search field out of table header in listview
 2015-06-15 11:44:58 +02:00
Shannon
a3d4ccc062 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
 2015-06-15 09:41:50 +02:00
Shannon Deminick
7ca323d8d3 Merge pull request #704 from bjarnef/dev-v7-loginview 
Add ng-cloak for login view
 2015-06-15 09:29:25 +02:00