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
9,091 Commits 94 Branches 33 Tags
99f7285e80175408772b9499c2ac600bd72d83ba
Commit Graph

9091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra
1a889594d9 Improved UI element style. 2015-04-19 17:23:08 +02:00
Andre Rodrigues
21b1fb9105 Moving default SiteSettings values to a handler. 
--HG--
branch : dev

Ermesx:
Added missing time zone data and fixed conflicts
 2015-04-19 14:35:12 +02:00
Sipke Schoorstra
6727e61f6c Merge branch '1.9-int' into feature/layoutzones 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Column.cshtml
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-19 14:33:40 +02:00
Sipke Schoorstra
c525bda388 Added rule editor to other element types. 2015-04-19 11:40:13 +02:00
Sipke Schoorstra
d5f75a242d Implemented element rules. 2015-04-19 11:31:53 +02:00
Sipke Schoorstra
24776bf9ee Fixed copy/paste issue with Html element. 2015-04-18 20:48:50 +02:00
Sipke Schoorstra
b3b75b3d74 Fixed copy/paste issue with Html element. 2015-04-18 20:48:16 +02:00
Sipke Schoorstra
79e4aa199f Reverted all Orchard.Widgets modifications. 2015-04-18 20:38:39 +02:00
Sipke Schoorstra
d6a0242433 Simplified Admin Search. 2015-04-18 20:16:40 +02:00
Sipke Schoorstra
b88d08b0ff Initial work on configurable search widget. 2015-04-18 19:48:25 +02:00
Sébastien Ros
5cd169d4fe Merge pull request #5176 from jtkech/patch-2 
#5148: Default recipe error on setup
 2015-04-18 08:44:38 -07:00
jtkech
009edb8d75 #5148: Default recipe error logged on setup 2015-04-18 01:03:04 +02:00
Sébastien Ros
456e2ccbbd Merge pull request #5174 from keesd/1.x 
Fixed projectreference (copy local = false) for CodeGen generated Module...
 2015-04-17 15:46:37 -07:00
Kees Damen
cbb5a2f9fc Fixed projectreference (copy local = false) for CodeGen generated Modules 2015-04-17 20:54:56 +02:00
Sipke Schoorstra
3e6043b6d7 Merge branch '1.9-int' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/MediaFileName/MediaFileNameEditorSettings.cs
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-17 15:12:28 +02:00
Sipke Schoorstra
a93cc9cdbc Fixed minor CSS issue. 2015-04-17 15:04:56 +02:00
Sipke Schoorstra
dea42e518b Cleaned up element views. 2015-04-17 14:34:00 +02:00
Sipke Schoorstra
66248a7005 #4957: Fixed search settings. 2015-04-17 00:46:39 +02:00
Sébastien Ros
3bb36ab010 Merge pull request #5156 from MpDzik/pr/users-consts2 
Define constants for maximum username/email length
 2015-04-16 12:57:47 -07:00
Sipke Schoorstra
792f5162e4 Moved CustomForms to Deprectaed folder. 2015-04-16 17:18:18 +02:00
Sipke Schoorstra
fc85aff463 Merge pull request #5165 from Xeevis/1.9-int 
#5138: Added missing validation message
 2015-04-16 16:59:54 +02:00
Sipke Schoorstra
0d9a4a295c Merge pull request #5170 from keesd/1.x 
1.x
 2015-04-16 16:56:07 +02:00
Kees Damen
ee1b7a5088 Merge branch '1.x' of https://github.com/keesd/Orchard into 1.x 2015-04-16 16:29:42 +02:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
bcb6f2c4ac Merge branch '1.9-int' into 1.x 2015-04-16 16:10:57 +02:00
Lombiq
db0c8c3d1f Changing all Codeplex issue links to GitHub links 2015-04-15 21:00:20 +02:00
Lombiq
06070fbb03 Wrapping stream usage into using() instead of manual Dispose() in FileSystemStorageProvider 2015-04-15 20:54:39 +02:00
Lombiq
f8e82be4b9 Rolling back streams in storage providers, fixes #4860 2015-04-15 20:45:11 +02:00
Lombiq
566d23ec55 Untabifying Text class 2015-04-15 20:34:28 +02:00
Xeevis
69316fe3ae #5138: Added missing validation message 2015-04-15 17:59:58 +02:00
Nicholas Mayne
ef135d348c Fixes #5164 2015-04-15 16:35:59 +01:00
Nicholas Mayne
441e6056fa Fixes #4276 : removing Persist Security Info=True 2015-04-15 16:27:01 +01:00
Nicholas Mayne
1bc9adae0d Fixes #4301 : Renaming file 2015-04-15 16:24:31 +01:00
Nicholas Mayne
eca6f9177d Fixes #4295 - removing erroneous check in publish later part 2015-04-15 14:56:41 +01:00
Nicholas Mayne
e3249cc02c removing a dependency 2015-04-15 13:51:17 +01:00
Sipke Schoorstra
dad113feed #5116: Fixed failing tests. 2015-04-15 14:00:16 +02:00
Marek Dzikiewicz
c9ebd1db67 Define constants for maximum username/email length 2015-04-15 09:06:34 +02:00
Sipke Schoorstra
840aea5ff0 #21391: Fixed layout and shape rendering from background processes. 2015-04-13 15:44:40 +02:00
Daniel Stolt
920819544a Merge branch 'feature/outputcache' into 1.9-int 2015-04-10 23:04:47 +02:00
Daniel Stolt
8b1f00e31c Disabled ASP.NET OutputCacheModule in Web.config. 2015-04-10 22:35:47 +02:00
Sipke Schoorstra
1f3c5cc1a4 Simplified URL encoding/decoding of layout editor data. 
This also fixes an issue with certain rendered HTML as part of he element editor model object.
 2015-04-10 17:38:48 +02:00
Sipke Schoorstra
1729e73a73 Merge branch '1.9-int' into 1.x 2015-04-10 11:40:54 +02:00
Sipke Schoorstra
3241458017 Fixed a typo. 2015-04-05 14:08:51 +02:00
Sipke Schoorstra
8383572ce1 Optimized widget layer evaluation. 2015-04-05 14:06:43 +02:00
Sipke Schoorstra
1a02d106a8 Added unique zone name validation. 2015-04-05 13:49:39 +02:00
Sipke Schoorstra
c044118b3f Implemented blended positioned rendering. 2015-04-05 12:10:51 +02:00
Sipke Schoorstra
11dc9309f0 Implemented collapsible columns. 2015-04-04 17:22:17 +02:00
Sipke Schoorstra
42d7eeec18 Implemented layout zones caching and changed zone harvesting to collect zones from all layouts. 2015-04-04 15:08:29 +02:00
Sipke Schoorstra
ffd68ec5d6 Incremental work on collapsible columns. 2015-04-03 18:43:57 +02:00
Sipke Schoorstra
721004306d Merge branch '1.9-int' into feature/layoutzones 2015-04-03 17:44:23 +02:00