yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,818 Commits 4 Branches 7 Tags
8c85be66838bba8ffb54676de61d00743023bd13
Commit Graph

52 Commits

Author SHA1 Message Date
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
55e74eba39 Fixing the folder uploader for media section 2013-08-16 15:41:13 +02:00
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
Shannon
c5a80ccb03 Changed WebSecurity to expose IUser instead of User, then fixed up the knock-on effect, obsoleted all calls to the legacy User object in the base classes to point to use the WebSecurity class to access the new user object. 2013-08-09 13:24:26 +10: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
0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
 2013-08-07 10:29:34 +10:00
Shannon
c4b44ea0e3 Fixes: U4-2577 Can't save umbraco user - without re-filling in the password 
Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
 2013-08-02 15:16:04 +10:00
Shannon
feb1892e9e Gets notification msgs on the server side to be displayed. Fixes property existence checking... was checking on id before but that is incorrect, needs to be on alias since a new property id is gen'd on each save and we're not re-wiring them back up. Fixes YSOD messaging for content as well. Changes the ModelState to modelState to be consistent in js. 2013-07-22 18:16:50 +10:00
Shannon
de2660cfb2 Merge branch '4.11.7---ITask-updates' into 7.0.0 
Conflicts:
	.gitignore
	.hgtags
	src/Umbraco.Core/XmlExtensions.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-12 11:30:06 +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
Shannon
a7b546527c Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though). 2013-06-17 16:03:27 +10:00
Shannon Deminick
fea28df758 Fixed more tree merge issues, fixed how property editors are rendered. 2013-06-04 15:59:14 -10:00
Shannon Deminick
dd3490a2ab added extension.js, trying to add legacy sprites for tree icons, updates tree icon filters (still not working) 2013-06-02 20:34:06 -10:00
Shannon Deminick
03f64521cb updated sln to have a simple website project in the Umbraco.UI.Client folder which will be the Belle development folder, its a website so it doesn't compile or anythng 
just a space to be able to edit files. We can probably also update it to launch IIS Express to point to the build folder for testing. Moved the back office
scripts controller actions just to the normal back office controller. Tweaked some of the Belle POC so now it is loading and have created an index.html
file which contains all the belle stuff so people won't have to worry about the container razor file.
 2013-05-29 20:25:29 -10:00
Shannon Deminick
522d909d37 Merge with 6.1.0 2013-05-28 14:20:43 -10:00
Shannon Deminick
5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Shannon Deminick
7d7ca4530b Getting server side integration working from ported over Belle POC including temporary custom property editors. 
Many files committed will be temporary and will be removed once development between the Belle UI project and this project are merged
and working.
 2013-05-27 18:21:07 -10:00
Shannon Deminick
cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct 
paths.
 2013-05-27 01:23:49 -10:00
Shannon Deminick
faae0b85cb importing more stuff from Belle proj 2013-05-26 19:54:50 -10:00
Shannon Deminick
b6f52bf782 Changed the profiler over to use resolvers again. We no longer will call MiniProfiler directly. 
Added an HtmlHelper extension which is used to render the profiler html output.
Added an HtmlHelper property to the new base page too.
 2013-05-13 20:10:28 -10:00
Shannon Deminick
6818ac4e50 Fixes merge issues, ensures that the UmbracoContext is set for the async operation since 
it is required, previous versions didn't require it to be set. Added the WebSecurity property
to UmbracoUserControl, made ContentTypeControlNew inherit from UmbracoUserControl
 2013-04-23 22:39:35 -10:00
Shannon Deminick
cb19fe3902 Secures all ITasks, adds unit tests to ensure they are all secured and the correct app is assigned. 2013-04-08 23:11:47 +06:00
Shannon Deminick
fe01bd1f29 Starts securing ITasks 2013-04-06 02:03:46 +06:00
Shannon Deminick
16746c8548 Updates authorized web services/http handlers to use WebSecurity and implements the new base class 
properties available in 6.1. Updates WebSecurity with a few more helpful methods.
 2013-04-09 22:11:12 +06:00
Shannon Deminick
495b4ed9e0 Refactors the WebSecurity class to not be static and be part of the UmbracoContext. Makes a few methods internal on it so that 
it's not relying on the legacy User class. Cleans up the new BasePage and EnsuredUmbracoPage
 2013-04-04 23:30:17 +06:00
Shannon Deminick
7deae8ea37 Update to latest examine (bug fixed), started Examine Management dashboard FF project. 2013-02-23 23:00:31 +06:00
Shannon Deminick
de13f7e361 WIP ... Fixes: #U4-1666, Updates documentService to not have to manually 
refresh content cache (and fix the unpublishing too since that logic wasn't correct)
Adds DebuggerDisplay support to ContentBase and Entity for better debugging info.
Adds new internal publishing methods to support publishing all children or only children previously published. This also adds new support
for getting a published result back even with bulk publishing.
Updates the publish dialog with new code and to use the new API based on issue #U4-1669.
Adds UmbracoUser property to AuthenticatedUmbracoController, Adds all common properties to the abstract UmbracoController.
Changes the legacy Document to allow content cache to be automatically refreshed (based on events)
 2013-02-09 04:05:01 +06:00
Shannon Deminick
4ab14484ba Fixes: #U4-1664, #U4-1661, #U4-1662, #U4-1660 
WIP - Updates much logic between editContent and ContentControl to ensure that the above issues are fixed and that we are not
double saving documents each time it is published. This also ensures that the Document.BeforeSave event is not double fired
when saving a document. Have changed over Document.SaveAndPublish to ensure that the cache does get refreshed automatically
when this is called - but now need to go through the rest of the codebase to make sure it's not being double refreshed. once that is
done then we will have streamlined the cache invalidation for content too.
Adds useful properties to the old BasePage like ApplicationContext, Services, etc...
 2013-02-08 04:25:31 +06:00
Shannon Deminick
bac2b7643f Moves UmbracoUserControl to it's correct home and obsoletes the old one (even though its really new) 
Publicizes UmbracoControl.
 2013-02-05 05:00:16 +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
Shannon Deminick
b292cb3ab3 Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor. 
Have implemented it now in the EditView (will transition over its use in editTemplate soon but is low priority).
Have got the js callbacks working now for inserting a macro for the mvc editor but need to implement the correct syntax. Also need
to migrate and update the editMacro dialog screen to check if we are rendering for MVC or not and if it is MVC then use the correct
syntax.
 2012-12-31 18:39:36 +03:00
Casey Neehouse
4d94909782 Folder Browser Enhancements - IE 7 Thumbnail list CSS corrections, 
Added labels to the thumbnail size setter,
Capture/cancel the return key on the filter textbox.
 2012-10-11 03:00:28 +04:00
Shannon Deminick
8fa36f3f22 Converted UmbracoField to use JS class Umbraco.Dialogs.UmbracoField. 
Adds base2 lib o the default umbracoDialog.Master.
 2012-10-08 23:32:43 +05:00
sebastiaan
8bab9d7fa5 Added node path to be able to refresh the tree + refreshing the tree after an upload succeeds 2012-09-04 14:27:54 -02:00
sebastiaan
673e040aa3 Fixed mediadashboard problem, ClientDependency doesn't like newlines in js using \ 2012-09-04 08:10:29 -02:00
Matt@MBP13-PC
f5d258b42d Added thumbnail size selector to folder browser 2012-08-21 08:59:10 -01:00
Matt@MBP13-PC
c1278674c3 Added throbber to library to show progress whilst loading media items 2012-08-21 08:17:07 -01:00
Matt@MBP13-PC
bd5182792e Added double click to edit support 2012-08-16 10:31:00 -01:00
Matt@MBP13-PC
ccd56f5594 Hooked up support for overwriting 
Made DMU web service check for logged in user if no credentials are passed in
 2012-08-08 09:08:09 -01:00
Matt@MBP13-PC
a989ea77ff Switched DMU web service to support XML and JSON so can be used by media dashboard aswell 
Added dmu.ashx file in old plugin folder to add backwards compatability
 2012-08-08 08:37:07 -01:00
Matt@MBP13-PC
872ef1fadc Added Multi-file delete support to media grid 
Added file name change support to multi-file uploader
 2012-08-07 09:30:11 -01:00
Matt@MBP13-PC
1e271455e8 Added multi select / drag to re-order support 2012-08-06 10:57:41 -01:00
Matt@MBP13-PC
4e1e7fe657 Added context menu to media grid 
Restructured folderBrowser js class to be less clutered
 2012-07-31 12:56:51 -01:00
Matt@MBP13-PC
fe87f6b89f Added js file uploader code 
Can now drag and drop files in, and trigger upload sequence.
 2012-07-26 12:11:42 -01:00