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

930 Commits

Author SHA1 Message Date
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Shannon
b565a3468b Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly. 2013-07-22 18:40:02 +10:00
Shannon
d3fe37a080 Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer. 2013-07-18 17:05:40 +10:00
Shannon
c4d2c7d31a Fixes issue with 'headline' when there is no content. Added client side validation to the content name. 2013-07-16 12:25:54 +10:00
Shannon
82cce853da Cleans up the navigationController to not have to duplicate all props of the nav service, we just make 'nav' a property of the scope that equals the nav service. 2013-07-15 23:08:23 +10:00
Shannon
7926318709 start looking at tree service to remove a node but realized that our initial app tree loading isn't correct, we need to have a true root node but currently we dont. 2013-07-15 17:05:54 +10:00
Per Ploug
e4a72caf96 merge 2013-07-12 11:51:39 +02:00
Per Ploug
22f6be61de Updates yepnope, adds markown sample editor 2013-07-12 11:36:22 +02:00
Shannon
e2ef802f65 Got delete working for legacy items... just need to get the tree to respond, do tree syncing, etc... but it is working. 2013-07-12 14:36:35 +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
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Shannon
9d2c3865ed Updated icon mappings and updated to latest font-awesome but I have no idea how to make the font-awesome.min.less file from the download... will leave for Per :) 2013-07-11 11:03:03 +10:00
Per Ploug
410b664f7f Got legacy create dialogs working 
Its not pretty, but it works, and over time these hacks should slowly
fade away
 2013-07-10 15:35:38 +02: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
5af57d9667 Fixed up the 401 issue with checking authentication which led to other issues of lazy loading in the legacy js tree JS block. 2013-07-09 21:01:29 +10:00
Shannon
76c6d952f3 Fixed up the 401 issue with checking authentication, but now have other auth issues... but better than before :) 2013-07-09 20:13:26 +10:00
Shannon
fdabd945dc Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-09 11:48:03 +10:00
Per Ploug
df98ad4edf Sets the installer redirect to umbraco/default 2013-07-08 15:54:07 +02:00
Shannon
90b94f6ffb Fixes: #U4-2476 2013-07-08 18:58:38 +10:00
Per Ploug
f51306b0e2 Removed js redirect from logout.aspx 2013-07-05 16:10:00 +02:00
Per Ploug Krogslund
0c3d274232 merge 2013-07-05 14:27:26 +02:00
Per Ploug Krogslund
852fe4210a Removes left-col leftover file, adds contentLoaded to contentEdit controller 2013-07-05 14:26:43 +02:00
Per Ploug
1b03dbd9c2 Adds compat.js click registering, adds bg load 2013-07-05 14:22:19 +02:00
Per Ploug
cfd299562e rename umb leftcol to umb navigation 2013-07-05 12:58:36 +02:00
Per Ploug Krogslund
63495d05e1 merge 2013-07-05 11:05:43 +02:00
Morten Christensen
93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Per Ploug Krogslund
0a08dce8f5 Modifies the dialog css class loading and allows for left side modals 2013-07-05 10:48:12 +02:00
Per Ploug
0030488b61 Fixes dialog service instant closing modals 2013-07-05 10:40:28 +02:00
Per Ploug
d9e79666ca css-template editor tweaks, more compat polish 2013-07-04 13:33:06 +02:00
Per Ploug Krogslund
a984bf0d68 Fixes failing tests 
Adds a seperate unit test app loader, removes e2e backend from tests
adds scope.digest and httpbackend.flush to tests
 2013-07-04 09:28:27 +02:00
Shannon
93844f30ac Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons 2013-07-04 12:50:25 +10:00
Shannon
0f06308efc removed VS build events, hopefully that can kick start the build server 2013-07-04 12:36:28 +10:00
Shannon
1f30a427b0 Reverted Tea commerce commit 2013-07-04 12:30:52 +10:00
Per Ploug
01d55625d5 merge 2013-07-03 14:04:00 +02:00
Per Ploug
693c0cb2a5 working modals 2013-07-03 13:55:33 +02:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Morten Christensen
9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Shannon
d85c454012 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
 2013-07-03 16:10:10 +10:00
Per Ploug
2e636d5bcb fixes testing due to wrong httpbackend injection 2013-07-02 15:46:50 +02:00
Shannon
ff410a9d7f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
 2013-07-02 17:47:57 +10:00
Shannon
3779e79367 Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations. 2013-07-02 17:47:20 +10:00
Per Ploug Krogslund
0e431ffd3c File rename, refactor $httpBackend mocks 2013-07-02 09:17:32 +02:00
Shannon
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Shannon
357e29ebe1 implemented section resource and mocks to load in the sections (applications) 2013-07-02 12:57:28 +10:00
Per Ploug
32d7b88b45 Removes the ng-hide when unauthed 
Not needed anymore, still something weird with the retry queue tho
 2013-07-01 16:17:20 +02:00
Per Ploug
2b13dff769 Fixes login and tree 
Adds tree loader, fixes icons, fixes toggle arrows
Refactors httpbackend into nicer system
Testing of promises are broken :(
TODO: update docs
 2013-07-01 16:06:41 +02:00
Per Ploug Krogslund
0d44189f7f Mocked login works again 2013-07-01 09:58:10 +02:00
Shannon
388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
Per Ploug
ad766a2544 Authentication almost done 
Missing some styling and we are good to go on promised based
authentication
 2013-06-28 15:49:28 +02:00