Commit Graph

35 Commits

Author SHA1 Message Date
Shannon d1bed54cf1 Fixes tabdrop memory leak U4-6907 Bootstrap tab drop has memory leaks, fixes tab/header to use the correct bootstrap tab api, simplifies the header code dramatically and speeds up processing. Fixes mem leak with delayedMouseLeave.directive 2015-08-04 11:59:57 +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 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 3496a064c9 Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs 2015-06-19 10:54:46 +02:00
Shannon d2083673be Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower. 2015-03-10 13:02:34 +11:00
Shannon cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon 201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
2014-10-03 13:01:00 +10:00
Sebastiaan Janssen 9957bbfb5d Remove unnecessary reference to ace.js that resulted in javascript errors 2014-07-31 10:08:31 +02:00
per ploug 482750ab6a Missing file 2014-05-12 13:22:58 +02:00
per ploug 4baf3ed99a Initial commit of the grid 2014-05-09 12:23:59 +02:00
per ploug 90bf600378 Replaces yepnope.js with lazyload.js
Solves the caching and multi-load of the same file problems - adds a bit
of promise-based loading logic ontop of ll.js to ensure order and count
2014-04-29 11:38:13 +02:00
perploug da2f3aefe6 Improves media drag n drop sorting 2013-11-18 14:58:29 +01:00
perploug 28ec40e1ae modifies angular-mobile to fix firefox glitch 2013-11-14 22:05:51 +01:00
perploug 238bc58234 Revert to old datepicker 2013-11-13 11:33:39 +01:00
Shannon ba72991929 refactored out the usage of "ui.showContextMenu" with the usage of appState. Added a new init.js instead of having the startup scripts embedded in the routes file (we should make a 'startup' naming convention like we have for 'controllers' to combine into one file) 2013-11-13 16:16:11 +11:00
perploug acbde943b0 replaces the datepicker with a native angular picker 2013-11-12 19:01:48 +01:00
Shannon 151e20240a Changes debounce function to use underscore 2013-10-29 09:18:47 +11:00
perploug c75a7817cf re-adds the jquery-ui sorting
The other libraries werent mature enough so we'll have to stick with
this for now
2013-10-28 20:26:18 +01:00
Shannon 6263b07087 Working on (WIP) U4-3255 Fix search - shouldn't search on every key change, shouldn't show up for non-search sections, shouldn't return ISearchResults 2013-10-28 18:38:20 +11:00
perploug d8de1c5b1b Removing boostrap tags lib, updating bootstrap to 2.2.3 2013-10-23 16:07:24 +02:00
perploug 59f711f802 memberpicker search updates 2013-10-10 12:43:59 +02:00
perploug ce30153830 Enables the manifest to load custom stylesheets outside the js loading 2013-10-02 10:54:25 +02:00
Niels Hartvig 32f4eaf900 WIP on image uploading
UX work - broken atm.
2013-09-23 21:24:34 +02:00
Shannon 15518f2069 Completes: U4-2749 Fix auth filters to return 401 when not logged in and 403 when the user has no access - adds ngSanitize which is required for ng-bind-html so we can add a bit of html to the notification msgs (like line breaks) and since devs might do this as well we require ngSanitize so that unsafe html cannot be injected. 2013-09-11 12:40:43 +10:00
perploug d59963a53e Comment jquery UI for new sorter 2013-09-04 15:43:00 +02:00
perploug 1e3d505df1 Serverside js loader 2013-08-26 15:04:02 +02:00
perploug d181a39343 Added 1.2 references to app.js and dev.app.js 2013-08-21 21:11:15 +02:00
perploug e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
Shannon 371bf785b0 Changed to jquery 2.0.3, added a few jquery ui bits and pieces, got the sort dialog working with an angular-ui sortable directive and styled it. 2013-08-07 14:25:30 +10:00
Shannon 0f207b01f2 Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated. 2013-07-10 13:24:28 +10:00
Shannon a2e16b4922 Fixed up gravatar with a watch, started implementing legacy proxy JS notification calls to our angular services. 2013-06-25 14:02:31 +10:00
Shannon 39d7676bee Got the legacy editors working and iframe implementation almost done! 2013-06-25 08:54:36 +10:00
Shannon 8db763c953 Updated server side stuff to work with new yepnope which makes things much simpler. 2013-06-19 13:45:41 +10:00