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,367 Commits 94 Branches 33 Tags
4a3ba3b4d61eb135172f2036a07411e2fdccba1c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Reed b85fa673d3 Fixing upload from client to new folder in mediaservice. 
--HG--
branch : dev
 2011-02-22 15:19:23 -08:00
Dave Reed ec0dfec53f Active tab kept in sync after creating a default level folder. 
--HG--
branch : dev
 2011-02-22 11:56:21 -08:00
Dave Reed 1b1f57b6c4 MediaPicker: Fix routes wrt creating folders at the default path 
--HG--
branch : dev
 2011-02-22 11:50:21 -08:00
Dave Reed 1c09a89280 Fixing MediaPicker error when there is no media folder for the tenant. 
--HG--
branch : dev
 2011-02-22 11:30:09 -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
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
Dave Reed 165644972a Replacing OpenAjax with a jQuery solution. 
--HG--
branch : dev
 2011-02-16 14:55:51 -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
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
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
Dave Reed 2b2c519e55 Merge 
--HG--
branch : dev
 2011-02-11 17:35:06 -08:00
Dave Reed 2720f6d94a Initial version of the generic MediaPicker module (note: currently largely unstyled html, but functional). 
--HG--
branch : dev
 2011-02-11 17:24:04 -08:00
Dave Reed 258477900e Adding jQuery UI tabs plugin to jQuery module. 
--HG--
branch : dev
 2011-02-11 15:44:29 -08:00
Dave Reed abdfb9a25b Add missing openajax.js 
--HG--
branch : dev
 2011-02-11 15:39:18 -08:00
Dave Reed 533af426f2 Including OpenAjax.js in admin pages as our client-side event bus. 
e.g.:
OpenAjax.hub.subscribe("orchard.someeventname.*, function(name, eventdata) { });
OpenAjax.hub.publish("orchard.someeventname.somethingspecific", eventdata);

--HG--
branch : dev
 2011-02-11 15:37:50 -08:00
Dave Reed e24cefd99b Fix stackoverflow on ResourceManager.Include overload. 
--HG--
branch : dev
 2011-02-11 15:35:41 -08:00
Dave Reed 11363d1062 Merge 
--HG--
branch : dev
 2011-01-31 20:51:08 -08:00
Dave Reed 11b37286a2 #17286: ResourceManager should allow condition to be applied. 
Actually, it did, but this wasn't useful for stylesheets that wanted a different 'media' type. You can now set any attribute in addition to the condition, which would also be great for scripts if you need to set an ID or other script attribute.

--HG--
branch : dev
 2011-01-31 20:49:30 -08:00
Dave Reed 9adfa13a56 #17237: Multiple clicks of Sign-in link cause multiple ReturnUrl values to be appended 
--HG--
branch : dev
 2011-01-31 16:36:23 -08:00
Dave Reed 8c1b1e4c31 #17252: Also updating ~/themes/web.config 
--HG--
branch : dev
 2011-01-31 16:04:10 -08:00
Dave Reed 30795a0969 Merge 
--HG--
branch : dev
 2011-01-31 15:56:18 -08:00
Dave Reed be99957432 #17252: Adding web.configs too module roots, and codegen commands, to enable razor intellisense. 
--HG--
branch : dev
 2011-01-31 15:52:03 -08:00
Dave Reed a67af4edce Merge 
--HG--
branch : dev
 2011-01-31 14:52:00 -08:00
Dave Reed 92ef22bd58 #17217: Exception thrown if a theme includes a static resource with the same name as a static resource in its BaseTheme (and varies by case) 
--HG--
branch : dev
 2011-01-31 12:47:10 -08:00
Dave Reed 574aa2648b Adding System.Web.WebPages.Deployment dependency. 2010-12-16 14:11:03 -08:00
Dave Reed 905a1126df Merge 2010-12-16 13:29:04 -08:00
Dave Reed b9ce74e941 Updating binaries to MVC3 RC2. Fixes breaking change, Controller.ViewData->Controller.ViewBag. 2010-12-16 13:28:23 -08:00
Dave Reed 629a48958f #17021 Redirects in actions using returnUrl need to only redirect to the returnUrl if Url.IsLocalUrl 
We did this in a lot of places. Adds a controller extension method that makes this easier.

--HG--
branch : dev
 2010-12-10 14:20:08 -08:00
Dave Reed 9a91c4d741 #16825: Exception in background task. 
Return null for authenticated user if there is none set and there's no HttpContext.
Somehow the correct owner is already being assigned, so the previously created OwnedScheduledTaskHandler was unnecessary.

--HG--
branch : dev
 2010-12-10 12:55:06 -08:00
Dave Reed 625880f9e1 #16998: Publish Later UI now much less confusing with 3 buttons: Save, Publish Now, and Publish Later. 
This also moves some publish-later specific css from the admin css to the publish later css, and makes the _Archive_ Later UI look better when active.

--HG--
branch : dev
 2010-12-10 11:12:29 -08:00
Dave Reed ead7d07b0f Fix typo 
--HG--
branch : dev
 2010-12-09 13:49:04 -08:00
Dave Reed 622b47b9e0 #17000: No longer show themes with the 'hidden' tag on the admin UI. 
--HG--
branch : dev
 2010-12-09 12:15:54 -08:00
Dave Reed 5465e22122 #16984: Removing a media folder doesn't work 
--HG--
branch : dev
 2010-12-09 11:51:01 -08:00
Dave Reed 1295cc8949 #16825: Exception in background task 
--HG--
branch : dev
 2010-12-09 11:34:57 -08:00
Dave Reed eab448cb21 #16949: Fixing scaffolded modules and themes when used in a non-source distribution 
--HG--
branch : dev
 2010-12-07 16:04:16 -08:00
Dave Reed c80af4ae1c #16959: Moving 'Comments' admin menu entry below 'Blogs' 
--HG--
branch : dev
 2010-12-07 14:30:21 -08:00
Dave Reed ac9166f037 Added webpages:Enabled appsetting to root config, too. 
--HG--
branch : dev
 2010-12-06 15:51:06 -08:00
Dave Reed 4741f33e28 #16911: Prevent YSOD when a gallery feed doesn't respond or responds unexpectedly. 
--HG--
branch : dev
 2010-12-06 13:37:11 -08:00
Dave Reed 374020b3ed #16944: Fix null reference error when localizing a content item and not picking a culture. 
--HG--
branch : dev
 2010-12-06 12:26:03 -08:00
Dave Reed f5c88ea616 Merge 
--HG--
branch : dev
 2010-12-06 11:28:26 -08:00
Dave Reed c5fdb792b6 #16919: Setting customErrors to 'RemoteOnly' 
--HG--
branch : dev
 2010-12-06 11:27:54 -08:00
Dave Reed 7b4025b8cb #16705: Themes may now override stylesheets alone by filename. 
--HG--
branch : dev
 2010-12-03 15:53:27 -08:00
Dave Reed 466135eccf Merge 
--HG--
branch : dev
 2010-12-02 15:52:37 -08:00
Dave Reed b8c2baea57 Missing files 
--HG--
branch : dev
 2010-12-02 15:51:24 -08:00
Dave Reed aa870505f1 Merge 
--HG--
branch : dev
 2010-12-02 15:35:23 -08:00
Dave Reed aa2db37190 Fix setup loading indicator issue in IE 
--HG--
branch : dev
 2010-12-02 15:34:53 -08:00
Dave Reed a6d1786e00 #16899: Added a simple js 'loading' indicator to setup. 
--HG--
branch : dev
 2010-12-02 15:17:46 -08:00
Dave Reed 625ad33476 #16903: Remove the Widget Page content type (and WidgetBagPart) 
--HG--
branch : dev
 2010-12-02 14:05:09 -08:00
Dave Reed 42b572f648 Merge 
--HG--
branch : dev
 2010-12-02 13:23:43 -08:00
Dave Reed d86fb19308 #16922: Added webpages:Enabled=false to web.configs 
--HG--
branch : dev
 2010-12-02 13:22:32 -08:00
Dave Reed 4762b1d3f6 #16906: You can no longer add fields with an empty name 
--HG--
branch : dev
 2010-12-02 12:32:15 -08:00
Dave Reed 665e641a13 #16523: Don't allow creating a part with an empty name or a name containing only invalid/filtered-out characters. 
--HG--
branch : dev
 2010-12-01 13:24:47 -08:00
Dave Reed 6d52280a16 #16855: When adding a field you may no longer use spaces or special characters (breaks overrides and searching). Added a 'hint' to the UI for the format. 
--HG--
branch : dev
 2010-12-01 13:06:37 -08:00
Dave Reed 59a874aa28 #16897: Adding back the Orchard generator meta tag. 
Its a default MetaEntry like before.

--HG--
branch : dev
 2010-12-01 12:50:21 -08:00
Dave Reed 40ea652bf2 Removing more Areas as modules code. 
--HG--
branch : dev
 2010-12-01 12:02:26 -08:00
Dave Reed 93f26469fb Merge 
--HG--
branch : dev
 2010-12-01 11:41:58 -08:00
Dave Reed aad6d6a309 #16748: Removing AreaExtensionLoader 
--HG--
branch : dev
 2010-12-01 11:40:56 -08:00
Dave Reed ff8eceefc9 Merge 
--HG--
branch : dev
 2010-11-29 15:00:46 -08:00
Dave Reed b1f88725b0 #16692: Better stack trace when loading a module fails because the types cannot be exported. 
--HG--
branch : dev
 2010-11-29 15:00:04 -08:00
Dave Reed aec516a89e Merge 
--HG--
branch : dev
 2010-11-29 14:17:07 -08:00
Dave Reed 59a57413c5 #16800: Add a Condition property on RequireSettings. 
You can now say Require("foo").UseCondition("lte IE7") for example.

--HG--
branch : dev
 2010-11-29 14:16:26 -08:00
Dave Reed 891705c0ec Merge 
--HG--
branch : dev
 2010-11-29 13:30:59 -08:00
Dave Reed 4ecb35bc99 #16822: Display missing features in admin features view. 
--HG--
branch : dev
 2010-11-29 13:30:26 -08:00
Dave Reed 77c202bf6d Merge 
--HG--
branch : dev
 2010-11-29 12:15:53 -08:00
Dave Reed 32474bff72 Merge 
--HG--
branch : perf
 2010-11-29 12:14:35 -08:00
Dave Reed 067daabdb0 Fix YSOD when a module has a missing dependency. 
--HG--
branch : dev
 2010-11-29 12:12:11 -08:00
Dave Reed 04c8724547 Merge 
--HG--
branch : dev
 2010-11-19 16:40:29 -08:00
Dave Reed 838b75b934 Removing link from the 'New' menu item. Needed to add option to MenuItem to avoid the auto-linking to the first child item. 
--HG--
branch : dev
 2010-11-19 16:39:59 -08:00
Dave Reed 15328ac0d6 Fixing theme.png previews again 
--HG--
branch : dev
 2010-11-19 14:39:10 -08:00
Dave Reed c03c075082 #16642: PO lines are now unescaped when parsed. Previously they weren't which also made the translation lookup fail since the scoped key didn't match. 
Note: currently the orchard.core.po file is out of date and not working for other reasons

--HG--
branch : dev
 2010-11-19 12:56:04 -08:00
Dave Reed ee8c482bef Use DisplayName (which is now called Name) in web UI list of features and modules. Note that not all modules have a name, so we fall to Id if not given. 
--HG--
branch : dev
 2010-11-18 16:42:05 -08:00
Dave Reed 67cb21d12b Related to #16712. Rename Feature/ExtensionDescriptor Name -> Id, and DisplayName -> Name. 
--HG--
branch : dev
 2010-11-18 15:37:47 -08:00
Dave Reed ab570906d5 Merge 
--HG--
branch : dev
 2010-11-17 13:45:34 -08:00
Dave Reed 624a6166bd #16423: Log error w/ module name when unable to load manifest. 
--HG--
branch : dev
 2010-11-17 13:43:45 -08:00
Dave Reed 58499abb10 #16653: Resource resolution is case sensitive. 
--HG--
branch : dev
 2010-11-17 10:58:48 -08:00
Dave Reed e869a4f467 Fixing some basic fx cop warnings 
--HG--
branch : dev
 2010-11-12 12:47:06 -08:00
Dave Reed 4e8c5d2eae Merge 
--HG--
branch : dev
 2010-11-11 16:39:07 -08:00
Dave Reed 7b127e5a9f Merge 
--HG--
branch : dev
 2010-11-11 16:26:09 -08:00
Dave Reed ae885952a8 Added "Orchard Basic Correctness" analysis ruleset 
--HG--
branch : dev
 2010-11-11 16:25:44 -08:00
Dave Reed a9a2c87fe6 Suppressing a few code analysis warnings. 
--HG--
branch : dev
 2010-11-11 16:23:32 -08:00
Dave Reed ca74da5ea5 Setting code analysis ruleset to paired down Security rules. 
--HG--
branch : dev
 2010-11-10 16:16:54 -08:00
Dave Reed 2317c4674f Ammending MSDeploy package for db parameters and /modules and /themes acls 
--HG--
branch : dev
 2010-11-10 15:48:47 -08:00
Dave Reed 1868a296a3 Fixing controller factory from last change and disabling unit test for now 2010-11-10 12:09:02 -08:00
Dave Reed 6c9319e70d Fixing controller factory from last change and disabling unit test for now 
--HG--
branch : dev
 2010-11-10 12:09:02 -08:00
Dave Reed 2a9cf8686a - Use default controller factory behavior if no workcontext present. 
- Fix unit tests.
 2010-11-10 11:15:19 -08:00
Dave Reed db733373e5 - Use default controller factory behavior if no workcontext present. 
- Fix unit tests.

--HG--
branch : dev
 2010-11-10 11:15:19 -08:00
Dave Reed cb05f7ecdf Updated libraries to webstack beta 3. 
Core now needs to reference System.Web.WebPages due to TagBuilder moving there.
 2010-11-10 09:39:37 -08:00
Dave Reed 0a7a88b535 Updated libraries to webstack beta 3. 
Core now needs to reference System.Web.WebPages due to TagBuilder moving there.

--HG--
branch : dev
 2010-11-10 09:39:37 -08:00
Dave Reed 29c38d5a0b Merge 
--HG--
branch : dev
 2010-11-17 15:47:16 -08:00
Dave Reed 39a40c143b #16667: Fixed edit link on welcome text to use correct ID and relative url. 
--HG--
branch : dev
 2010-11-17 15:37:06 -08:00
Dave Reed 5b8bbfb3cf Merge 
--HG--
branch : dev
 2010-11-17 14:55:03 -08:00
Dave Reed 2363d97092 Removing dead code (related to #16484) 
--HG--
branch : dev
 2010-11-17 14:54:13 -08:00
Dave Reed a28327d64b Merge 
--HG--
branch : dev
 2010-11-04 14:00:36 -07:00
Dave Reed 5421028cdd Adding str length annotation to model 
--HG--
branch : dev
 2010-11-04 14:00:12 -07:00
Dave Reed 93ea6aae64 Merge 
--HG--
branch : dev
 2010-11-04 12:05:56 -07:00