Commit Graph
4782 Commits
Author SHA1 Message Date
Sebastien Ros d0af08fce9 Merge
--HG--
branch : 1.x
2011-03-28 17:13:30 -07:00
Sebastien Ros 7fba9036eb #17581: Fixing Content attribute on static files
Work Items:17581

--HG--
branch : 1.x
2011-03-28 17:13:05 -07:00
Suha Can 9f5adef34a Fixing UT.
--HG--
branch : 1.x
2011-03-28 17:11:00 -07:00
Andre Rodrigues 2f4f44f016 #17554: Placing content items transactions within transaction scopes.
--HG--
branch : 1.x
2011-03-28 17:02:48 -07:00
Andre Rodrigues 136e214ed1 Merge
--HG--
branch : 1.x
2011-03-28 16:29:36 -07:00
Andre Rodrigues 8115f9bfab #17311: Hooking feature manager warnings into theme services so that warnings are shown.
--HG--
branch : 1.x
2011-03-28 16:28:02 -07:00
Dave Reed 151a6d2f02 Merge
--HG--
branch : 1.x
2011-03-28 16:27:32 -07:00
Dave Reed f333723f8a 17368: Multiple tinymce editors on a page broken in some browsers.
Problem was due to multiple init calls. We now no longer need any dynamic content in the init script, allowing this script to become a library and only included once.
Also made the tinymce init selection more specific to tinymce in case any other modules use the 'html' class at the same time as this.

--HG--
branch : 1.x
2011-03-28 16:26:39 -07:00
Sebastien Ros 3e58074473 #17340: Fixing users list refresh on bulk actions
Work Items: 17340

--HG--
branch : 1.x
2011-03-28 16:25:11 -07:00
Dave Reed 71631d3ef5 17324: <object> tags being mangled by TinyMCE
--HG--
branch : 1.x
2011-03-28 14:35:28 -07:00
Suha Can f0d6bdb341 Fixing 17531: The homepage is not checked after imported [4661 (68d8f1db090f)]
--HG--
branch : 1.x
2011-03-28 14:19:32 -07:00
jowall bfcdbdba57 Made selected state for buttons darker.
--HG--
branch : 1.x
2011-03-28 13:32:17 -07:00
jowall 0231217526 Added top padding to shape tracing tree.
--HG--
branch : 1.x
2011-03-28 13:11:09 -07:00
jowall 326795d7d4 New zone preview image for widgets screen.
--HG--
branch : 1.x
2011-03-28 12:58:39 -07:00
Andre Rodrigues f46744eab0 Merge
--HG--
branch : 1.x
2011-03-28 12:55:24 -07:00
Andre Rodrigues a942d6b6ea #17517: Adding missing content-type.
--HG--
branch : 1.x
2011-03-28 12:52:42 -07:00
Suha Can ef1b7cc2f3 Merge
--HG--
branch : 1.x
2011-03-28 12:51:25 -07:00
Suha Can 03df768aa5 Fixing 17327: Add BlogArchives in Widget cause site crash [4182 (87e9e18ad238)]
--HG--
branch : 1.x
2011-03-28 12:48:09 -07:00
Dave Reed d69a22dc35 #17061: Codegen'ing a theme should put the theme in the themes folder of the solution, not the modules folder.
--HG--
branch : 1.x
2011-03-28 12:35:45 -07:00
Andre Rodrigues 0afaf13b47 Merge
--HG--
branch : 1.x
2011-03-28 12:15:54 -07:00
Andre Rodrigues 132dad57e2 #17518: Correcting temporary file name.
--HG--
branch : 1.x
2011-03-28 12:15:19 -07:00
Dave Reed 6bc856ca7b refactoring jquery isolation in shape tracing script
--HG--
branch : 1.x
2011-03-28 12:14:07 -07:00
Sebastien Ros 930decd725 #17579: Fixing full trust exception on Warmup
Work Items: 17579

--HG--
branch : 1.x
2011-03-28 12:03:45 -07:00
Sebastien Ros 73d21a6c9e Fixing typo in users settings
Work Items: 17400

--HG--
branch : 1.x
2011-03-28 11:57:23 -07:00
Nathan Heskew ee38c329e9 Ensuring duplicate notification messages aren't displayed.
A problem in general. Helps to resolve...

work item: 17529

--HG--
branch : 1.x
2011-03-28 11:00:17 -07:00
Nathan Heskew b369eaa11b Making sure the global widget admin page is still usable when no layers are defined.
work item: 17538

--HG--
branch : 1.x
2011-03-28 10:27:35 -07:00
Nathan Heskew adbd9da232 Merge
--HG--
branch : 1.x
2011-03-28 10:15:22 -07:00
Nathan Heskew 6425afd199 Making sure the edit content control style contains its children('s floats)
work item: 17405

--HG--
branch : 1.x
2011-03-28 10:14:43 -07:00
Andre Rodrigues 6a90e8fe2e Adding Orchard Service Host Factory and IoC behavior for WCF support.
--HG--
branch : 1.x
extra : transplant_source : %93%05%12%2Ag8%08c%D5%7Co%DA%5B%5C%B2%C4%81%C3w%3A
2011-03-28 09:29:51 -07:00
Sebastien Ros d1962c2615 Refactoring jQuery isolation in shape tracing
--HG--
branch : 1.x
extra : transplant_source : %80U3%A6%05%FC%AB%27%DE%B0%1AJzJ%11%60%0F%C7%AC_
2011-03-27 15:13:12 -07:00
Suha Can aecf79781b Fixing merge issue.
--HG--
branch : 1.x
2011-03-26 13:17:15 -07:00
Suha Can e44343ef3c Merge integration -> 1.x
--HG--
branch : 1.x
2011-03-26 12:50:51 -07:00
Suha Can 5c1f421c36 Merge contributions -> integration
--HG--
branch : integration
2011-03-26 12:26:26 -07:00
Suha Can 7ad9bd5716 Merge dev -> integration
--HG--
branch : integration
2011-03-26 12:11:33 -07:00
Sebastien Ros 02480f47d5 Improving code editor display, and fixing IE9 rendering
--HG--
branch : dev
2011-03-25 21:43:55 -07:00
Sebastien Ros 036d4b2bb3 Displaying only meaningful text in breadcrumb
--HG--
branch : dev
2011-03-25 21:15:17 -07:00
Nathan Heskew f8467c108e Bringing the widget layer control back to the front.
--HG--
branch : dev
2011-03-25 20:20:33 -07:00
Jonathan Wall 8bece06389 Added background to breadcrumbs.
--HG--
branch : dev
2011-03-25 18:51:13 -07:00
Sebastien Ros 7b787996af Fixing resize enabling/disabling
--HG--
branch : dev
2011-03-25 18:26:39 -07:00
Sebastien Ros 4ec6eabfc3 Moving breadcrumb
--HG--
branch : dev
2011-03-25 18:17:44 -07:00
Jonathan Wall 65d59872b8 Added CSS for buttons.
--HG--
branch : dev
2011-03-25 18:00:29 -07:00
Sebastien Ros b9b4a1bbe0 Fixing fixed stuff
--HG--
branch : dev
2011-03-25 17:29:58 -07:00
Jonathan Wall d6d5b76ca2 Added CSS for tabs.
--HG--
branch : dev
2011-03-25 16:37:26 -07:00
Dave Reed a29b642e14 Wordsmithing
--HG--
branch : dev
2011-03-25 16:36:43 -07:00
Sebastien Ros b1a179b26d Fixing resize handle bug when hovering shape overlay
--HG--
branch : dev
2011-03-25 16:34:07 -07:00
Dave Reed 941d15fbce Bulk actions on content items ensures permission for every item.
--HG--
branch : dev
2011-03-25 16:30:09 -07:00
Jonathan Wall 1c18c4445e More CSS updates for shape tracing.
--HG--
branch : dev
2011-03-25 16:19:55 -07:00
Sebastien Ros 9df8fb94d9 Removing extra margin on the right
--HG--
branch : dev
2011-03-25 16:14:57 -07:00
Sebastien Ros 3d8d6429fc Fixing meta content scroll bar
--HG--
branch : dev
2011-03-25 16:10:52 -07:00
Jonathan Wall 1dfb696b1b Added background color CSS for hover.
--HG--
branch : dev
2011-03-25 16:04:36 -07:00