lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,281 Commits 94 Branches 33 Tags
988d60e306cab47b8acc6f5a795d000d29c3cd3a
Commit Graph
4281 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Heskew 988d60e306 "versioning" the TheAdmin theme's main CSS file 
--HG--
branch : dev
 2011-02-22 10:58:30 -08:00
Dave Reed 3e28060cba Merge 
--HG--
branch : dev
 2011-02-22 10:37:06 -08:00
Dave Reed a58650076c Improving initial size of mediapicker popup. Fixing width/height assignment in gallery view. 
--HG--
branch : dev
 2011-02-22 10:27:33 -08:00
Nathan Heskew c07a806c20 Merge 
--HG--
branch : dev
 2011-02-22 10:19:44 -08:00
Nathan Heskew 1e4820166e Fixing a spec test. 
--HG--
branch : dev
 2011-02-22 10:18:56 -08:00
Andre Rodrigues 60b8df8710 Merge 
--HG--
branch : dev
 2011-02-22 10:14:18 -08:00
Nathan Heskew 21b4db2281 Including some images in csprojs which hadn't been committed. 
--HG--
branch : dev
 2011-02-22 10:13:33 -08:00
Andre Rodrigues dba42a394f Fixing azure solution. 
--HG--
branch : dev
 2011-02-22 10:13:25 -08:00
Andre Rodrigues 037903cb75 Merge 
--HG--
branch : dev
 2011-02-22 10:04:20 -08:00
Andre Rodrigues e7e60d2435 Aligning package update page to gallery. Moving the update feature to the packaging module as a feature. 
--HG--
branch : dev
 2011-02-22 10:01:21 -08:00
jowall aed0e3fb58 Fixed tab vertical alignment. 
--HG--
branch : dev
 2011-02-22 09:59:02 -08:00
jowall d0f9829a42 Updated content area alignment. 
--HG--
branch : dev
 2011-02-22 09:51:15 -08:00
Jonathan Wall 7d4cd0c9d8 Updated layout in media picker so height and width inputs are inline. 
--HG--
branch : dev
 2011-02-21 17:30:02 -08:00
andrerod b1075d50a7 Adding missing reference 
--HG--
branch : dev
 2011-02-21 17:03:06 -08:00
Nathan Heskew 0aa6537238 Merge 
--HG--
branch : dev
 2011-02-21 15:30:55 -08:00
Nathan Heskew 6c5c36f17d Adding admin menu icons for navigation, media, modules, tags, themes, users and widgets. 
--HG--
branch : dev
 2011-02-21 15:28:55 -08:00
Jonathan Wall 018f7ef2e1 Added scroll to gallery view. 
--HG--
branch : dev
 2011-02-21 15:17:55 -08:00
Jonathan Wall 09c071b941 Removed some inline styles from the media picker. 
--HG--
branch : dev
 2011-02-21 14:38:16 -08:00
Andre Rodrigues 03353c743c Adding paging and search to installed modules. 
--HG--
branch : dev
 2011-02-21 13:58:31 -08:00
Nathan Heskew 4d298d8a69 Adding a little more padding for the admin menu icons. 
--HG--
branch : dev
 2011-02-21 13:48:42 -08:00
Nathan Heskew f5d35ca3ae Admin menu icons configured for page, list(s), comments, blog content plus an updated dashboard icon (8 bit) 
--HG--
branch : dev
 2011-02-21 13:40:32 -08:00
Andre Rodrigues e8f36dcf21 Correcting last updated, adding paging footer, and searching packages by title instead of id. 
--HG--
branch : dev
 2011-02-21 13:00:18 -08:00
Nathan Heskew 79b1a288b3 Progress made on the menu icons. 
- Styles being inherited correctly down to the "New" section's sub items.
- Menu using the TextHint for generating class names instead of the menu text for predictability across localized sites.

--HG--
branch : dev
 2011-02-21 12:16:31 -08:00
Andre Rodrigues 68e8e7aef4 Merge 
--HG--
branch : dev
 2011-02-21 12:03:38 -08:00
Andre Rodrigues 4a640ded06 Converting module and themes entries to shapes on module and theme projects. Adding recently updated notifications. Fixing small issue in Layout.Title. 
--HG--
branch : dev
rename : src/Orchard.Web/Modules/Orchard.Modules/ViewModels/Module.cs => src/Orchard.Web/Modules/Orchard.Modules/Models/ModuleEntry.cs
rename : src/Orchard.Web/Modules/Orchard.Modules/ViewModels/ModuleFeature.cs => src/Orchard.Web/Modules/Orchard.Modules/Models/ModuleFeature.cs
 2011-02-21 12:03:06 -08:00
Andre Rodrigues 34c841818e Preventing edit link to be added to an in memory content item. 
--HG--
branch : dev
 2011-02-21 11:15:13 -08:00
Jonathan Wall 1185f4d4d2 Some fixes to the media picker UI. 
--HG--
branch : dev
 2011-02-21 10:50:10 -08:00
Andre Rodrigues a480aaa746 Adding simple search to gallery. Fixinx ratings CSS. 
--HG--
branch : dev
 2011-02-20 11:59:26 -08:00
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
Nathan Heskew 90d81f69c1 Some work on letting modules be responsible for their own piece of the menu (wrt menu item icons & style) 
--HG--
branch : dev
 2011-02-18 15:31:52 -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