Sebastiaan Janssen
a009cad200
Wrong bootstrap file reference, error was hidden by Client Dependency framework
2013-11-18 18:08:38 +01:00
perploug
4dbd1d3ca7
adds section to page title
2013-11-18 11:48:58 +01:00
perploug
e3ec0c1019
fixes missing tinymce buttons
2013-11-18 10:48:46 +01:00
Shannon
2784e2a22d
removes ref to missing file
2013-11-15 17:30:26 +11:00
Shannon
89481405b5
Fixes: U4-3534 Sorting content items
2013-11-15 12:57:28 +11:00
Shannon
f1d837dfd1
fixes: U4-3539 Cannot set a scheduled publish at date/time gives a warning message
2013-11-15 12:46:55 +11:00
Shannon
6d2caaa723
Fixes: U4-3430 Save Properties not working for usercontrol macro
2013-11-14 21:56:01 +11:00
perploug
f4861fb344
fixes broken font on icon picker on windows
2013-11-14 09:16:46 +01:00
Shannon
35315e0331
Removes touchDevice from rootScope and navigationService, now we detect this on app startup and add to the globalState which can be retrieved whenever.
2013-11-13 16:22:47 +11:00
Shannon
ba72991929
refactored out the usage of "ui.showContextMenu" with the usage of appState. Added a new init.js instead of having the startup scripts embedded in the routes file (we should make a 'startup' naming convention like we have for 'controllers' to combine into one file)
2013-11-13 16:16:11 +11:00
Shannon
d0c5dd208f
Reverted to Newtonsoft.Json 4.5.11
2013-11-13 11:28:14 +11:00
perploug
c4a0e1e923
changes options to actions
2013-11-12 19:01:24 +01:00
Shannon
a532b49485
Fixes: U4-3482 keepUserLoggedIn setting ignored? and streamlines some of the auth methods.
2013-11-12 17:38:32 +11:00
Shannon
c28f800fe6
Removes the re-committed app plugins property editor that shouldn't be there
2013-11-12 17:38:09 +11:00
Shannon
ad0b7e4259
Changed default (development) macro error handling to throw.
2013-11-11 10:16:25 +11:00
Shannon
367cdde35e
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
...
Conflicts:
src/umbraco.cms/businesslogic/workflow/Notification.cs
2013-11-08 08:55:22 +11:00
Sebastiaan Janssen
0dc3920309
Merge pull request #191 from dipeshhirani/U4-2756
...
Fixed the issue below: U4-2756
2013-11-07 08:38:44 -08:00
Per Ploug Krogslund
7440855c72
merge
2013-11-07 17:16:22 +01:00
perploug
937bda9c16
select on focus directive
2013-11-07 17:11:32 +01: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
