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

2291 Commits

Author SHA1 Message Date
Sebastiaan Janssen
b5c87ccfb7 Merge branch 'dev-v7-U4-6898' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6898 2015-07-31 11:29:51 +02:00
Sebastiaan Janssen
2efe6ae7a4 Merge pull request #754 from bjarnef/dev-v7-U4-6179 
Highlight recycle bin tree node
 2015-07-31 11:20:44 +02:00
bjarnef
09a3b0d155 Highlight recycle bin tree node 
Ensure recycle bin tree node is highlighted when chosen.
 2015-07-30 18:36:22 +02:00
bjarnef
5174645059 Make tree nodes consistent 
Make tree nodes have same position from the left regardless of the arrow
to expand the children.
 2015-07-30 16:04:54 +02:00
Shannon
bb94fc7d71 Ensures notifications are shown for drag/drop uploads 2015-07-30 11:35:00 +02:00
Shannon
787e128d5c wires up event messages for media editor and tree (haven't done the drag/drop media upload though) 2015-07-29 16:00:06 +02:00
Shannon
367da39bbb wires up UI to show notifications for delete cancellation 2015-07-29 15:18:23 +02:00
Shannon
6d8ffb903f Ensures events for deleting, trashing and unpublishing are done using the event messages, updates UI to support showing these messages in the list view, Since we cannot change the 
method results on a service, we've created a new temporary service that we will explicitly implement with an extension method to get it. This is temporary until v8 where we will just replace
the original methods on the service with these methods and then remove this class.
 2015-07-29 15:12:12 +02:00
Shannon
1eab92b299 updates prog bars in examine mgt dashboard to be like other umb prog bars 2015-07-27 18:58:14 +02:00
Shannon
7a8b8f138f Fixes list view search debounce and adds a ui indication that search is in progress. 2015-07-27 18:48:41 +02:00
Shannon
b44494a093 Works on: U4-5308 Umbraco 7 Content Tree Width not resizable or scrollable 2015-07-27 16:38:39 +02:00
Shannon
a6094a82cb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-27 16:16:22 +02:00
Shannon
07f58d191b fixes js error 2015-07-27 16:16:10 +02:00
Sebastiaan Janssen
9f000eb90c Updates build to include and exclude correct files, syncs web.config and syncs dependency versions between core and nuget pkg 2015-07-27 15:52:10 +02:00
mattbrailsford
de53c8886b Increased to 19 pixels based on feedback 2015-07-25 09:32:54 +01:00
mattbrailsford
3672d13215 Increased font tree icon font size to 17px for better visibility 2015-07-24 21:36:24 +01:00
Sebastiaan Janssen
86ad3f6b05 Makes sure that R# doesn't suggest C#6 features 2015-07-24 17:25:52 +02:00
Shannon
b0fb892b16 Fixes: U4-6736 Log "logout" from Umbraco and also ensures logging is occuring on timeout, logout, login all with Identity stuff. 2015-07-23 12:03:50 +02:00
Shannon
d5460068d4 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Macros/MacroTagParser.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
	src/Umbraco.Tests/Macros/MacroParserTests.cs
	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-16 17:04:25 +02:00
Sebastiaan Janssen
1ecd0af268 New installer image 2015-07-16 15:49:18 +02:00
Shannon
0bbcaca067 Add unique id for TextSearch / LuceneSearch 
Add unique id for TextSearch / LuceneSearch for each searcher.
 2015-07-16 13:52:52 +02:00
Sebastiaan Janssen
55d3d8437a Update number of tattoos 2015-07-16 12:44:10 +02:00
Shannon
56176d0e36 Fix U4-6687: Can't add multiple instances of a macro in RTE in 7.2.6 without ruining RTE formatting 
We found that the MacroTagParser.cs was being greedy and matching all UMBRACO_MACRO tags instead of getting them individually.

macro.service.js was updated for posterity purposes to match the regex in the .cs side, but testing showed that it was functioning as expected without this change.
 2015-07-16 09:50:49 +02:00
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