Commit Graph

5066 Commits

Author SHA1 Message Date
Simon Dingley e0da5a9cb2 Groups jQuery dependencies using the ClientDependency Group property 2013-11-07 12:45:35 +00:00
mkariti 451d5eb484 U4-415 2013-11-07 14:40:26 +02:00
dipeshhirani 3f2be3342a Fixed the issue below:
The "Unpublish" button (under Properties tab) is bad translated to Italian.
The used word is "Non pubblicato". This phrase is mean "It is not published".
A best translation is "Non pubblicare" (unpublish).

Did not do any of the others as they are either already done or the requesters change seems incorrect/irrelevent
2013-11-07 11:42:08 +00:00
Sebastiaan Janssen cc039e365d Merge pull request #181 from Attackmonkey/Tim-Payne-Hackathon-U4-2708
Fixes issue U4-2708
2013-11-07 02:55:03 -08:00
Tim Payne 4ea04f5ffe Fixes issue U4-2708 2013-11-07 10:08:11 +00:00
Shannon fad84ac0bb Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/members/EditMember.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2013-11-07 12:30:28 +11:00
Shannon fc0654a80f Fixes: U4-2241 Native Multi-node tree picker in Member Types: Saving clears selected items 2013-11-07 12:02:41 +11:00
Jeavon Leopold e7d587f776 Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks required 2013-11-06 17:19:18 +00:00
Sebastiaan Janssen 039ec7b958 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-11-05 14:27:09 +01:00
Sebastiaan Janssen 5659ab5fc0 Remove promise of image galleries and blogs in installer screen. :) 2013-11-05 14:26:28 +01:00
perploug e41e017fa3 fixes dialog iframe auto-expanding 2013-11-05 13:56:20 +01:00
perploug 2371a40a8a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:38:59 +01:00
perploug 51c459d654 Fixes placeholder label overriding name label 2013-11-05 12:38:01 +01:00
Sebastiaan Janssen 01b21dc9eb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:15 +01:00
perploug bcf20f9f3f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:00 +01:00
Sebastiaan Janssen fed8f51de8 Prefixed built in controllers to better avoid conflicts with people's custom code 2013-11-05 12:00:56 +01:00
perploug ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
Niels Hartvig 5a690bcf33 Add progress status on starter kit install 2013-11-05 11:24:53 +01:00
perploug aa4bcdd040 color picker feedback 2013-11-05 11:17:58 +01:00
Shannon 2a52c584f8 Completes: U4-3293 MNTP, Markdown editor, related links should be core property editors in c# - had to hack a bit of the core for the markdown editor JS because we didn't have mapped icons for what they were trying to use. 2013-11-05 12:19:26 +11:00
perploug 9ab423a280 New installer colors 2013-11-04 21:17:18 +01:00
perploug 47733b2bbe starterkits html for installer 2013-11-04 14:58:25 +01:00
perploug b84c2007ef new label for unpublish at 2013-11-04 14:56:10 +01:00
Tim Geyssens 8cd7f26431 Fixes U4-3190 Look for all umbraco.aspx references as there's still some buttons redirecting to there
Using Sebs suggestion
2013-11-04 11:01:13 +01:00
perploug c8cb724508 merge 2013-11-04 08:45:03 +01:00
Sebastiaan Janssen 45d339928a Include missing System.Net.Http/System.Net.Http.WebRequest 2013-11-03 10:57:42 +01:00
perploug 5363cafd7f installer styling 2013-11-01 12:28:35 +01:00
perploug 34f0576a90 Fixes: missign web-service reference in installer 2013-11-01 09:42:24 +01:00
Shannon e4bd459da4 Completes: U4-2666 Change the drop down for selecting an icon/thumbnail for doc/media types to display the new list of icons to choose from 2013-11-01 17:18:57 +11:00
Shannon c722e57914 Moves the our umbraco web reference to where it needs to be. 2013-11-01 09:21:29 +11:00
perploug ce509638e1 Added 7.0 starterkit feed to installer 2013-10-30 19:34:35 +01:00
perploug b0b785954f Dashboard iframe sizing 2013-10-30 19:33:36 +01:00
perploug e5879a4c70 Macro container 2013-10-30 10:54:23 +01:00
perploug a7f5576fee Wires up the help dialog with our and tv feeds 2013-10-29 21:49:40 +01:00
Shannon 2075311773 Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure. 2013-10-29 11:39:34 +11:00
perploug fc2e605fd8 Improves the property safe alias lookup 2013-10-28 22:57:57 +01:00
perploug 0aab5e435a Adds a way to do hotkys on webforms buttons 2013-10-28 21:32:35 +01:00
perploug 7716413015 updates umb.tv feeds on dashboard 2013-10-28 20:25:26 +01:00
perploug eb622504f2 RTE updates for styles and button placement 2013-10-28 20:24:02 +01:00
Shannon 3110b199c6 Completes: U4-3155 Ensure new tree events are fired for legacy trees 2013-10-28 13:45:38 +11:00
Shannon 7679b36f13 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-25 16:29:02 +11:00
Shannon 716def8d33 Completes: U4-3020 Installning package with legacy data types just gives error 2013-10-25 16:28:46 +11:00
Shannon 4ceb16e20d removes contour committed app config 2013-10-25 16:28:26 +11:00
Shannon 61318df0b4 Removes contour files that were committed by accident 2013-10-25 16:27:09 +11:00
diachedelic d09b34dd03 * Updated references to 'umbraco.aspx' in static content
* URI encode query strings in frontend API calls
2013-10-25 16:07:20 +11:00
perploug 7d885e8af0 Visual tweaks for tablet compat 2013-10-23 15:33:35 +02:00
Shannon 322ad6ca26 Completes: U4-3030 Need to remove the starter kit/skin dashboard 2013-10-23 14:30:43 +11:00
Shannon 00486eeaa7 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx
	src/Umbraco.Web/Security/WebSecurity.cs
	src/umbraco.providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
2013-10-23 10:51:06 +11:00
Shannon ae32968efd Updates the legacy membership providers and WebSecurity/Password changer to stay backwards compatible with their previous settings whilst still keeping all of the provider fixes. 2013-10-23 10:19:43 +11:00
Shannon 3f5fdf840a Completes: U4-3212 Support unlocking a member, also fixes quite a few other issues regarding the membership provider properties of the content type. 2013-10-22 17:36:46 +11:00