lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 02:44:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4,120 Commits 83 Branches 32 Tags
30795a0969fb00cb10c53b37e072e049a34d0e71
Commit Graph

4120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andre Rodrigues
4f922640e7 #17202: Fixing incorrect stylesheet import. Adding null condition checker to avoid null point exception. 
--HG--
branch : dev
 2011-01-31 15:24:39 -08:00
Suha Can
c2e5fc7b28 Making sure we have Private=True across the board (Orchard.Web and Azure Orchard.Web projects) for MVC 3 binaries so they are properly copied if installed into the GAC. 
--HG--
branch : dev
 2011-01-31 15:03:45 -08:00
Dave Reed
a67af4edce Merge 
--HG--
branch : dev
 2011-01-31 14:52:00 -08:00
Suha Can
252ec47b65 Removing duplicate entry from Azure solution for SW.WebPages.Deployment. 
Removing same from Orchard.Web.csproj

--HG--
branch : dev
 2011-01-31 13:30:50 -08:00
Suha Can
69461a4921 Merge 
--HG--
branch : dev
 2011-01-31 13:22:14 -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
Andre Rodrigues
fa25bca5f5 #17280: Limiting access to media folder. 
--HG--
branch : dev
 2011-01-31 12:12:22 -08:00
Suha Can
907e4cd78f Bug 17222: When building Orchard.Web from sources System.Web.WebPages.Deployment.dll is not copied to Bin 
Removing a stale duplicate reference to an MVC 3 RTM binary.

--HG--
branch : dev
 2011-01-31 11:58:54 -08:00
Andre Rodrigues
1372fe250d Merge 1.x => dev 
--HG--
branch : dev
 2011-01-31 11:49:31 -08:00
Suha Can
fdc6972745 Minor alteration to previous contribution 
--HG--
branch : 1.x
 2011-01-31 10:43:44 -08:00
Suha Can
fbea90e905 Merge 
--HG--
branch : 1.x
 2011-01-31 10:36:24 -08:00
freeflying1222
19f34c0fce Refactor: 
There are duplicate code blocks for getting area from "Route" in ShellRoute.cs and OrchardControllerFactory.cs.
And I don't think it's a good idea assigning the responsibility to OrchardControllerFactory.cs

--HG--
branch : 1.x
 2011-01-29 19:37:22 +08:00
bertrandleroy
e5fa2c097f Fixing typo 
--HG--
branch : 1.x
 2011-01-18 16:16:26 -08:00
Suha Can
ebc9667649 Minor code convention tweak to a recently contributed unit test. 
--HG--
branch : 1.x
 2011-01-18 11:06:07 -08:00
Suha Can
cae67e8989 Merge 
--HG--
branch : 1.x
 2011-01-18 10:37:49 -08:00
Renaud Paquay
9ca3eef776 Merge default => dev 
--HG--
branch : dev
 2011-01-17 15:17:58 -08:00
Renaud Paquay
55805459b3 Added tag 1.0 for changeset 16f874f7c4f3 2011-01-17 15:15:44 -08:00
Renaud Paquay
9722c92226 Merge 1.x => default 2011-01-17 15:15:21 -08:00
Kevin LaBranche
f999b9d859 Fix for http://orchard.codeplex.com/workitem/17054. Email address is not validated for a registered user. 
Added code to the AccountController's ValidateRegistration to fix.  Also added two unit tests and went ahead and added the data annotation's
to the UserCreateViewModel and the UserEditViewModel as well since if we are accepting email addresses they might as well be valid (well-formed). :-)

--HG--
branch : 1.x
 2011-01-17 16:14:05 -07:00
Renaud Paquay
99e4ed8857 Updating version #s to match 1.0 release 
--HG--
branch : 1.x
 2011-01-17 15:04:57 -08:00
Kevin LaBranche
956fcd8e56 Fix for http://orchard.codeplex.com/workitem/17112. The Get Started, Register Account and Add User had different min lengths for password. 
In looking at the membershipSettings class in Orchard the min length setting is 7.  I changed the add user (UserCreateViewModel) and the get
started (SetupViewModel) to match the min of 7 by modifying/adding a data annotation.

--HG--
branch : 1.x
 2011-01-17 14:31:33 -07:00
Suha Can
dc81f4c8a6 Porting contribution from Kevin Labranche. Fix for 17111 
--HG--
branch : 1.x
 2011-01-14 11:48:06 -08:00
bertrandleroy
ad60ca57c0 Merge 
--HG--
branch : 1.x
 2011-01-13 16:08:34 -08:00
Renaud Paquay
a74a807089 Added tag 1.0 for changeset 5cc01ad95f11 
--HG--
branch : 1.x
 2011-01-12 19:08:43 -08:00
Renaud Paquay
ceb9ead9b0 Fixing solution file 
--HG--
branch : 1.x
 2011-01-12 19:07:12 -08:00
Andre Rodrigues
d054ce1e08 Added tag 1.0 for changeset 83536b451ffe 
--HG--
branch : 1.x
 2011-01-12 19:00:47 -08:00
Andre Rodrigues
5d514cf871 Merge 
--HG--
branch : 1.x
 2011-01-12 19:00:27 -08:00
Sebastien Ros
8f8d839e77 Improving encryption utilities 
--HG--
branch : 1.x
 2011-01-12 18:58:02 -08:00
Andre Rodrigues
4013fe539d Adding missing dynamic object casts. 
--HG--
branch : 1.x
 2011-01-12 18:18:32 -08:00
bertrandleroy
50acdb284c Using fwlink as per team´s suggestion for MVC 3 license. 
--HG--
branch : 1.x
 2011-01-12 15:35:24 -08:00
bertrandleroy
829609c34c Final MVC Eula link 
--HG--
branch : 1.x
 2011-01-12 15:28:06 -08:00
bertrandleroy
3f325c4bf4 Merge 
--HG--
branch : 1.x
 2011-01-12 14:52:16 -08:00
bertrandleroy
20318d40a7 Changed the license URL for MVC to point at the EULA as we´re not redistributing source code. 
--HG--
branch : 1.x
 2011-01-12 14:51:37 -08:00
Renaud Paquay
55e2bd15db Remove unused entries 
--HG--
branch : 1.x
 2011-01-12 13:52:15 -08:00
bertrandleroy
b82e3320b3 More credits.txt fixes. 
--HG--
branch : 1.x
 2011-01-12 12:03:37 -08:00
Renaud Paquay
4f09893445 Updating credits.txt file 
--HG--
branch : 1.x
 2011-01-12 11:22:06 -08:00
Renaud Paquay
a79ce210a6 Merge 
--HG--
branch : 1.x
 2011-01-12 00:51:53 -08:00
Renaud Paquay
4dd978f304 Update the way we copy c++ run time for SqlCe 
--HG--
branch : 1.x
 2011-01-12 00:47:26 -08:00
andrerod
d1d87eada4 Fixing issue with themes screenshots. 
--HG--
branch : 1.x
 2011-01-12 00:32:40 -08:00
Renaud Paquay
8e7004b82d Display banner message pointing to Themes page after installation 
--HG--
branch : 1.x
 2011-01-11 20:26:03 -08:00
Renaud Paquay
bc5ec3e014 Better error message when package installation failed 
Work Item: 17194

--HG--
branch : 1.x
 2011-01-11 20:04:12 -08:00
Renaud Paquay
de42a2d4a9 Adding link to Gallery in "Modules" and "Themes" pages 
--HG--
branch : 1.x
 2011-01-11 19:01:46 -08:00
Renaud Paquay
29cefd8a13 Merge 
--HG--
branch : 1.x
 2011-01-11 18:37:27 -08:00
Renaud Paquay
f9f0e671e1 Adding missing files 
--HG--
branch : 1.x
 2011-01-11 18:34:27 -08:00
Sebastien Ros
671fc84349 Merge 
--HG--
branch : 1.x
 2011-01-11 17:51:13 -08:00
Sebastien Ros
3305fd81b6 Fixing search API when searching for all documents 
--HG--
branch : 1.x
 2011-01-11 17:50:19 -08:00
Renaud Paquay
94563832d9 Updating version # to 1.0 
--HG--
branch : 1.x
 2011-01-11 16:47:30 -08:00
Renaud Paquay
3930c234e4 Merge 
--HG--
branch : 1.x
 2011-01-11 16:43:09 -08:00