yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,316 Commits 4 Branches 7 Tags
3b849987bf6d3d1cefd959cb32c4fd7c4170141b
Commit Graph

109 Commits

Author SHA1 Message Date
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
Sebastiaan Janssen
7a644b6681 U4-6133 Update builtin razor snippets to follow Query Builder conventions 
#U4-6133 Fixed
 2015-01-15 10:38:07 +01:00
Shannon
dc846e7ff6 Fixes installer email validation. Ensures all validation directives are registered under the correct module: umbraco.directives.validation, then we load this module in the installer so we can use the correct email validation directive. 2015-01-07 15:02:58 +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
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
86e82c7674 Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros) 2014-10-22 16:44:45 +10:00
Shannon
4494d8cc91 Merge branch 'partial-view-folders' of https://github.com/pynej/Umbraco-CMS into 7.2.0 2014-10-21 13:21:12 +10:00
antoine
b8034fa325 canvasdesigner.*.js added to ignore file 
Conflicts:
	.gitignore
 2014-09-30 09:24:38 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
Jeremy Pyne
fbed14a9e0 Partial Views and Partial View Macro's should allow for folder hierarchy for organization. This changes makes them work much like the Scripts and css folders. 
I didn't add a Type drop down like the scripts screen has.  This is unnecessary and cumbersome.  Instead it works like other screens and the user can generate a hierarchy in their files by adding /'s in the names.  This is how it works in Stylesheets works and its a lot cleaner.  I added a note of this to the creation dialogs as well.

For example create a view file with the name myFolder/myView and the system will take care of folder creation automatically.  There is also a delete option.

Other errors fixed:
 Selecting a folder in the scripts lists was generating an error.
 Stylesheets would not create a new folder(but they wold make nested children in existing folders.
 Partial and Macro Views would not use the proper elpers for generating syncTree code.
 2014-09-04 10:17:54 -04:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
antoine
54c3e68f32 Ignore Preview folder 2014-07-01 13:57:04 +02:00
Sebastiaan Janssen
c34f83e231 U4-5092 Czech language support 2014-06-16 10:11:19 +02:00
antoine
9da7e108da double )) in embed open windows 2014-06-10 16:52:29 +02:00
antoine
5cb210c7b6 slider input updated real time 2014-06-08 11:08:56 +02:00
antoine
39eaa4a15e Element select improved, default style more clean 2014-06-03 19:33:31 +02:00
antoine
2fdf040f73 Palette improvement 2014-06-02 10:55:53 +02:00
antoine
3dabd73ec2 Merge branch '7.1.2-Usky' into 7.1.2-Usky-Grid 
Conflicts:
	src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
	src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
	src/Umbraco.Web.UI/Umbraco/js/tuning.panel.js
	src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
 2014-05-30 19:56:51 +02:00
antoine
90e5440518 bootstrap3 ; issue + hx style issue 2014-05-28 15:33:36 +02:00
antoine
7cfd2d6593 schema's selector improved 2014-05-28 15:06:16 +02:00
antoine
6382515258 Device preview always enable 2014-05-28 11:29:08 +02:00
antoine
b57642003c Grid row unique id 2014-05-25 20:52:23 +02:00
antoine
7508613d13 First approach 2014-05-22 22:20:13 +02:00
antoine
52cd44a700 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-21 15:37:58 +02:00
antoine
0c8ff187aa grunt update to copy default files 2014-05-21 15:37:20 +02:00
John
3af74bd4fd Load google fonts independently in the content iframe. 
Enables live preview on the page's content for google fonts.
 2014-05-21 14:57:20 +02:00
John
c9e2e1e116 Apply preview of font to page's content. 2014-05-21 14:57:18 +02:00
John
c27f73e54a Fix glitch when selecting new font in dropdown. 
In the font family picker, selecting a not-yet-loaded font caused the font sample to render as Arial until the font had been downloaded.
 2014-05-21 14:57:17 +02:00
John
cede13d180 Merge name and description changes from uSky. 2014-05-21 14:57:15 +02:00
antoine
3ffb2772b6 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-21 13:54:25 +02:00
antoine
e6f0d4e056 @Umbraco.EnableTuning() and Recursive less file 2014-05-21 13:53:00 +02:00
John
e62d1559b1 Fix grunt not copying tuning's index.html to Umbraco/preview. 
Also fixes same issue when using grunt --dev.
 2014-05-20 10:36:48 +02:00
antoine
80379e116d umbraco media support 2014-05-19 14:34:09 +02:00
antoine
89081b86af preview grunt issue 2014-05-16 14:42:47 +02:00
antoine
216e2255f2 Save message more friendly 2014-05-16 13:33:41 +02:00
antoine
9db3dbd730 Style improvement 
focus schema in front when roll-over in panel
 2014-05-16 11:40:39 +02:00
antoine
8a1dd96294 some styles fixed 2014-05-14 19:15:43 +02:00
antoine
4f34fbd2c8 devices preview better look 
tested in chrome/firefox/IE
 2014-05-14 18:37:44 +02:00
antoine
8cda6e4062 Tuning panel include in preview mode 2014-05-14 14:51:58 +02:00
antoine
a00e5d54aa rename tuning project without usky 2014-05-13 12:50:48 +02:00
antoine
7e61b25746 uskytuning with style suggest and preview device 2014-05-12 19:57:06 +02:00
antoine
103f4f33bd Only one less style file 2014-05-10 15:56:36 +02:00
antoine
861b1cefe5 uSkyTuning.loader.js deleted 2014-05-09 18:22:02 +02:00
antoine
23301817bf uSkyTuning into Umbraco core, first approach 2014-05-09 18:18:08 +02:00
per ploug
dbbe3fe5fb Removes remaining yepnop dependencies 2014-05-05 12:59:34 +02:00
Shannon
264c537b50 Fixes: U4-4530 Edit Profile Snippet: Check for null before loop 2014-03-27 16:52:43 +11:00
Shannon
2b6b8e9e8c Fixes: U4-4470 New Installer doesn't deal with 500 errors, also fixes a tree init problem causing this particular ysod 2014-03-19 13:28:23 +11:00
Shannon
8574c6b7d0 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
 2014-03-13 14:12:45 +11:00
Shannon
221bfa5f3d Fixes up issues with editing the member profile and registering a member with our snippets including specifying a custom member type. 2014-03-13 14:10:05 +11:00
Shannon
3c771648e3 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/UmbracoHelper.cs
 2014-03-11 14:47:00 +11:00