Suha Can
2b1ac82ca8
Merge
...
--HG--
branch : 1.x
2011-03-29 14:42:46 -07:00
Suha Can
fa44ab37fd
Fixing #17526 : Escape "/" in content identities
...
--HG--
branch : 1.x
2011-03-29 14:18:35 -07:00
Sebastien Ros
5ef0ec23e1
Fixing Azure unit tests
...
--HG--
branch : 1.x
2011-03-29 14:09:35 -07:00
Sebastien Ros
d65eda0f02
#17347 : Fix AzureFileSystem implementation
...
--HG--
branch : 1.x
2011-03-29 13:39:17 -07:00
Nathan Heskew
2d2ff2d9a4
Fixing the logic for the toggleWhatYouControl show/hide bit.
...
work item: 17528
--HG--
branch : 1.x
2011-03-29 13:14:04 -07:00
Sebastien Ros
f966a2d369
#17597 : Fixing shape tracing conflict with DateTimeRelative shape
...
Work Items:17597
--HG--
branch : 1.x
2011-03-29 12:34:19 -07:00
jowall
8e61b21a63
Removed "green flash" from features screen.
...
--HG--
branch : 1.x
2011-03-29 12:28:20 -07:00
Sebastien Ros
06f47d44dd
Initializing shells in warmup to speed up the first dynamic query
...
--HG--
branch : 1.x
2011-03-29 12:14:41 -07:00
Dave Reed
13f4fa195d
#17387 : Failure to save media from a zip file with directory structure that corresponds to a directory in tenant media folder that does not exist yet.
...
--HG--
branch : 1.x
2011-03-29 11:50:36 -07:00
jowall
200f44fb69
Added visibility icon to .widgets-this-layer class on widgets screen.
...
--HG--
branch : 1.x
2011-03-29 11:44:39 -07:00
Sebastien Ros
be4f208222
Removing margin in html code editor
...
--HG--
branch : 1.x
2011-03-29 11:27:18 -07:00
Sebastien Ros
fafa2efcbb
Updating CodeMirror to version 2.0
...
--HG--
branch : 1.x
2011-03-29 11:26:44 -07:00
jowall
7b8f95d50e
Updated footer background image.
...
--HG--
branch : 1.x
2011-03-29 11:10:31 -07:00
jowall
ce09e61030
Some margin and padding cleanup in side navigation.
...
--HG--
branch : 1.x
2011-03-29 10:46:42 -07:00
jowall
dd736ece9c
Some updates to the admin CSS.
...
--HG--
branch : 1.x
2011-03-29 10:36:39 -07:00
Sebastien Ros
b156300f39
Reverting UseIIS alteration
...
--HG--
branch : 1.x
2011-03-29 10:19:17 -07:00
Sebastien Ros
f2586d06d2
Fixing ContentItem.ContentType indexing so it can be queried by search
...
--HG--
branch : 1.x
2011-03-28 22:13:25 -07:00
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