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

6653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
0026f7bd01 More ignores 2013-09-05 14:55:55 +10:00
Shannon
0b1cad7687 Fixes app.dev to not include ui.sortable. Fixes server vars mocks to have an entry for dashboardApiBaseUrl, adds dashboard.mocks to not throw an exception when trying access that data. 2013-09-05 14:54:40 +10:00
Shannon
038780614c Re-deletes files that should not be committed! Seriously WHY DOES THIS KEEP HAPPENING??! Have updated the ignore to try and stop this 2013-09-05 14:38:22 +10:00
perploug
ac4eb18b55 Add ngmin and uglify to grunt setup RERUN NPM INSTALL 2013-09-04 23:31:05 +02:00
perploug
cab92d203e Delete contour files checked in by mistake 2013-09-04 21:08:48 +02:00
perploug
9414639ee1 icons and modal css updates 2013-09-04 21:07:10 +02:00
perploug
c27f6e3458 merge legacy client 2013-09-04 16:02:23 +02:00
perploug
8e93cfa94d merge 2013-09-04 16:00:30 +02:00
perploug
334374b9f6 New sorter and contentType editor 2013-09-04 15:43:56 +02:00
perploug
a5445bb779 media picker icons 2013-09-04 15:43:41 +02:00
perploug
fd06c1b785 add jqueyr sortable lib 2013-09-04 15:43:24 +02:00
perploug
d59963a53e Comment jquery UI for new sorter 2013-09-04 15:43:00 +02:00
perploug
025b952fb6 Remove old debug valu from content picker 2013-09-04 15:42:23 +02:00
perploug
ed4c22b2c1 css updates 2013-09-04 15:40:56 +02:00
perploug
f2376c4340 add datatype.getall resource 2013-09-04 15:40:46 +02:00
perploug
00534251ea Remove old ui.sortable while I work on the new one 2013-09-04 15:40:31 +02:00
perploug
b97b4eaa89 Revert "Revert "Remove jquery sourcemap reference"" 
This reverts commit 87df168c7d.
 2013-09-04 15:39:50 +02:00
perploug
87df168c7d Revert "Remove jquery sourcemap reference" 
This reverts commit fbdd94e577.
 2013-09-04 15:35:57 +02:00
perploug
fbdd94e577 Remove jquery sourcemap reference 2013-09-04 15:35:32 +02:00
Shannon
0273b79935 Fixes the dialogs when used by the legacy umb manager to ensure that they only close the latest open (which is what the legacy stuff is expecting), now the xslt visualizer works with the picker as well. Completes: U4-2777 Get legacy tree pickers working 2013-09-04 20:42:37 +10:00
Shannon
ecdfecd173 Fixed the dialog service to be able to call registered callbacks even if the dialog is an iframe, this helps fix the legacy tree pickers, fixed up the legacy tree control so that it can load in new trees as well 2013-09-04 20:06:41 +10:00
Shannon
b105bd305b Ok, getting pretty close to making those legacy tree dialogs work. 2013-09-04 18:10:57 +10:00
Shannon
be9c3b8996 Got a solution for legacy dialog trees with the new format trees, just committing all of the work in case i need to come back and reference some stuff I'm about to remove. 2013-09-04 17:36:05 +10:00
Shannon
db79d87c08 Fixes infinite loop ... oops. 2013-09-04 16:09:54 +10:00
Shannon
838788c270 Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/ 2013-09-04 13:18:23 +10:00
Shannon
f6ea604101 First attempt at getting legacy tree dialog to work with new trees. Just saving this revision since I might need to reference the code later but am going to revert since this doesn't seem like the way to go. 2013-09-04 12:01:41 +10:00
perploug
91de4ebd42 datatype tree icons update 2013-09-03 14:26:07 +02:00
perploug
6c4fba1a4e client-side icons update 2013-09-03 14:26:06 +02:00
perploug
f6f6da2f21 Tree icons update 2013-09-03 14:26:04 +02:00
perploug
0175bb0d9e IAction icons update 2013-09-03 14:26:03 +02:00
Shannon
c40e4fed87 Got the file upload making thumbs based on pre-vals - U4-2778 FileUploadValueEditor - need to create pre-values like we had in v6 including thumb sizes. 2013-09-03 18:33:17 +10:00
Shannon
e5633df6c3 Added pre-vals for the file upload property editor (backwards compatible format) and fixed saving a data type. 2013-09-03 18:28:14 +10:00
Shannon
70eb3e8613 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Controllers/RegisterController.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-03 17:30:08 +10:00
Shannon
eeeb99b3b5 Fixes U4-2738 Collection Disposal issue when deploying 6.1.4 on Windows Server 2008 (Random, environment specific) 2013-09-03 17:19:31 +10:00
Shannon
7c9f5eda9d Fixes up more permissions checks, refactors MediaController.PostAddFile to use the correct WebAPI usage. Fixes issue with UmbracoClientManager throwing errors because the treeProps didn't include all called props. 2013-09-03 16:35:36 +10:00
Shannon
f0a2bfdea4 Updates EntityController with corrected permissions checking, updated media controller with correct permissions checking, added unit tests for the permisions filters. 2013-09-03 13:59:25 +10:00
Shannon
aee521ce1a Fixes: U4-2770 Legacy content dialogs doesnt render and removes a file that shouldn't have been committed. 2013-09-03 12:27:48 +10:00
perploug
020623acd3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-02 17:09:16 +02:00
perploug
427efcdfe2 stadard icon sizing 2013-09-02 17:08:59 +02:00
perploug
9f4ac8a1af image picker multiple select toggle 2013-09-02 17:08:48 +02:00
perploug
ede8f837a0 media picker item html 2013-09-02 17:08:27 +02:00
perploug
5c6578c06b recommit iconpicker 2013-09-02 17:08:15 +02:00
perploug
9a33849f6e Auto resize image on insert 2013-09-02 17:08:04 +02:00
Anders Stentebjerg
5b2705181b Styling Mediapicker dialog 2013-09-02 15:44:41 +02:00
perploug
c49ee0da7a Mocks merge 2013-09-02 15:43:33 +02:00
perploug
623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
perploug
26da26fe8d add icon picker dialog 2013-09-02 15:34:48 +02:00
perploug
2a0878a071 move markdown editor to umbraco.packages module 2013-09-02 15:34:35 +02:00
perploug
551c7b38b7 rte tweaks 2013-09-02 15:34:14 +02:00
perploug
0f108eb842 seach headline 2013-09-02 15:34:07 +02:00