lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4,252 Commits 83 Branches 32 Tags
6b88f4f859972111ae5408579d3abe2b246ff6fd
Commit Graph

4252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renaud Paquay
6b88f4f859 Fix merge errors 
--HG--
branch : dev
 2011-02-19 19:14:17 -08:00
Renaud Paquay
4883ffa5c9 Merge default => dev 
--HG--
branch : dev
 2011-02-19 18:14:08 -08:00
Renaud Paquay
efa13104d1 Fixing csproj file 
--HG--
branch : dev
 2011-02-19 17:58:31 -08:00
Renaud Paquay
df1249bab5 Adding recent modules to Azure solution 
--HG--
branch : dev
 2011-02-19 17:55:52 -08:00
Renaud Paquay
030999dda3 Ensure Azure specific IStorageProvider is registered properly 
The AzureBlobStorageProvider components must be registered as a
per-lifetime-scope in the "Shell" container, not in the "Host" container.

This is why it must be registered in the "Config/Sites.Config" file instead
of the "Config/Host.config" files.

This also allows us to remove the "AZURE" compilation directive from
Orchard.Framework implementation.

All in all, this ensures that the files stored in the "Media" folder
are stored in the Azure Blob Storage even when running locally in
Visual Studio.

--HG--
branch : dev
extra : transplant_source : %3E%E2%82g%18M%AB%26xi%CA%19%99H%3A%A0%20%F0%B2F
 2011-02-19 16:13:23 -08:00
Renaud Paquay
8a0cfa7805 Ensure SqlCe assembly is copied to ~/bin even if present in the GAC 
--HG--
branch : dev
extra : transplant_source : %F0%02/%D4%F3y%D9%D6%03%DD%28%ECh%EC%0F/%A9%C0%C6T
 2011-02-19 16:03:47 -08:00
Renaud Paquay
feb927485d Support for running and debugging Azure.Web in Visual Studio 
We need to copy contents files from Modules, Themes and Core directory
of Orchard.Web into the respective directory in Orchard.Azure.Web.

This is because when running Orchard.Azure.Web in Visual Studio, the web
application runs from the Orchard.Azure.Web directory.

Also update .hgignore file to ignore these directories.

--HG--
branch : dev
extra : transplant_source : %BB%F5j%1ANvL%B2g%2C%7EQ%3A%10VT%EA%D7%28%B5
 2011-02-19 16:02:47 -08:00
jowall
ec92526a78 Added a hook so the media picker CSS can override jQuery UI. 
--HG--
branch : dev
 2011-02-18 17:16:25 -08:00
jowall
6bd16d8ec3 Initial CSS for media picker. 
--HG--
branch : dev
 2011-02-18 17:08:54 -08:00
Dave Reed
d82b9e4e19 Making MediaPicker controller an admin controller, fixes incorrect css loading. 
--HG--
branch : dev
 2011-02-18 16:20:29 -08:00
Dave Reed
3ad849c22d ThemeFilter is wholly responsible for determining if a request is themed. Previously, LayoutAwareViewEngine had some theme business logic which made it impossible to have an un-themed admin controller. 
--HG--
branch : dev
 2011-02-18 15:03:38 -08:00
jowall
4768b99d51 Added margin to publish date field. 
--HG--
branch : dev
 2011-02-18 13:09:38 -08:00
jowall
1a04afa2bb Updated recently installed module background color. 
--HG--
branch : dev
 2011-02-18 12:59:32 -08:00
jowall
80674907a7 Fixed margin on modules page. 
--HG--
branch : dev
 2011-02-18 12:52:02 -08:00
jowall
82e18caec4 Updated admin button styles. 
--HG--
branch : dev
 2011-02-18 12:24:05 -08:00
jowall
0adca1a065 Positioned page titles in admin. 
--HG--
branch : dev
 2011-02-18 09:09:40 -08:00
Andre Rodrigues
6050e585be Integrating package manager for package updates. 
--HG--
branch : dev
rename : src/Orchard.Web/Modules/Orchard.Packaging/Services/NugetLogger.cs => src/Orchard.Web/Modules/Orchard.Packaging/Models/NugetLogger.cs
rename : src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageData.cs => src/Orchard.Web/Modules/Orchard.Packaging/Models/PackageData.cs
rename : src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingEntry.cs => src/Orchard.Web/Modules/Orchard.Packaging/Models/PackagingEntry.cs
 2011-02-18 08:21:19 -08:00
andrerod
3e17f21eaf Merge 
--HG--
branch : dev
 2011-02-17 16:28:55 -08:00
andrerod
7ffb7e02d4 Delegating title positioning to Layout.cshtml. 
--HG--
branch : dev
rename : src/Orchard.Web/Themes/TheAdmin/Views/BeforeContent.cshtml => src/Orchard.Web/Themes/TheAdmin/Views/Title.cshtml
 2011-02-17 16:27:21 -08:00
jowall
063dbfd0a8 Fixed padding on navigation submenu items. 
--HG--
branch : dev
 2011-02-17 15:27:05 -08:00
jowall
3d6a2c369f Fixed content zone on widgets admin page. 
--HG--
branch : dev
 2011-02-17 15:08:46 -08:00
jowall
fe5ef56ed9 CSS updates to buttons in admin. 
--HG--
branch : dev
 2011-02-17 12:50:32 -08:00
jowall
05d482a382 Hover states added for all menu items. 
--HG--
branch : dev
 2011-02-17 11:57:20 -08:00
jowall
0e301982d6 More changes to the admin nav and tabs CSS. 
--HG--
branch : dev
 2011-02-17 11:49:59 -08:00
Nathan Heskew
fe1362e544 Some work on the admin menu. 
Still a work in progress.
Also need to think about splitting the module-specific icons (and relevent CSS) into their own respective modules (not just to see how many CSS files we can get the admin to load on the initial request, BTW)...

--HG--
branch : dev
 2011-02-17 10:22:55 -08:00
Andre Rodrigues
788a9fed77 Adding recently installed indication. 
--HG--
branch : dev
 2011-02-17 09:17:49 -08:00
Andre Rodrigues
508ebed3fd Adding missing "@". 
--HG--
branch : dev
 2011-02-17 06:59:24 -08:00
Sebastien Ros
2bc030e1ca Merge 
--HG--
branch : dev
 2011-02-16 16:52:17 -08:00
Sebastien Ros
4abf761d4a Removing dead code 
--HG--
branch : dev
 2011-02-16 16:51:21 -08:00
jowall
28836fe81c CSS tweak to tabs. 
--HG--
branch : dev
 2011-02-16 16:43:08 -08:00
jowall
7cbd9f7e7a Initial CSS for tabs. 
--HG--
branch : dev
 2011-02-16 16:21:13 -08:00
jowall
00f13fd838 More updates to the CSS for background images. 
--HG--
branch : dev
 2011-02-16 15:16:23 -08:00
Dave Reed
165644972a Replacing OpenAjax with a jQuery solution. 
--HG--
branch : dev
 2011-02-16 14:55:51 -08:00
Nathan Heskew
8c8aed694b Adding a "selected" class to the appropriate first and second level menu items in the (main) menu. 
--HG--
branch : dev
 2011-02-16 13:19:21 -08:00
jowall
b5beb34994 Added "sticky" footer. 
--HG--
branch : dev
 2011-02-16 12:49:44 -08:00
Dave Reed
2ef3bae5c2 Merge 
--HG--
branch : dev
 2011-02-16 11:13:36 -08:00
Dave Reed
aefbacd59f Remove upload parameter from mediapicker, it already knows it. 
Improve thumbnail centering.

--HG--
branch : dev
 2011-02-16 11:12:59 -08:00
Andre Rodrigues
c8d7c8c1c8 Merge 
--HG--
branch : dev
 2011-02-16 11:05:01 -08:00
Andre Rodrigues
1951b30189 Updating titles to new position. 
--HG--
branch : dev
 2011-02-16 11:04:36 -08:00
Sebastien Ros
b3d1ac6ae2 Addind a unit test for Search 
--HG--
branch : dev
 2011-02-16 10:56:04 -08:00
Andre Rodrigues
4bf1b2e389 Updating installed themes page. 
--HG--
branch : dev
 2011-02-16 10:22:09 -08:00
Nathan Heskew
ec478ec34b Updating the admin layout to not use abs positioning for the fixed-width sidebar w/ a fluid content area. 
--HG--
branch : dev
 2011-02-16 08:51:47 -08:00
Dave Reed
df39f5a43c Merge 
--HG--
branch : dev
 2011-02-15 16:25:04 -08:00
Dave Reed
fbf9f79506 Added missing files :) 
--HG--
branch : dev
 2011-02-15 16:24:34 -08:00
jowall
52e686c172 Added a default icon to the admin menu. 
--HG--
branch : dev
 2011-02-15 16:20:15 -08:00
Dave Reed
a5dd56f6b9 Merge 
--HG--
branch : dev
 2011-02-15 16:02:53 -08:00
Dave Reed
a2e177de76 Smoothing over some MediaPicker rough edges. 
- Can now upload images to a specific folder
- Can now create folders in gallery tab
- Images are scaled before drawn
- Added throbber on image uploads
- Clicking image ensures Chrome displays the image instead of downloads it
- After uploading image the image is selected

--HG--
branch : dev
 2011-02-15 16:02:02 -08:00
jowall
2b3a17e858 Updated primary button. 
--HG--
branch : dev
 2011-02-15 15:50:01 -08:00
jowall
a38aeb011f Some more updates to the admin CSS. 
--HG--
branch : dev
 2011-02-15 15:25:20 -08:00
Andre Rodrigues
62ee211557 updating tabs CSS. Moving title to before local navigation. 
--HG--
branch : dev
 2011-02-15 11:58:26 -08:00