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
8,965 Commits 83 Branches 32 Tags
df483c3a8e1fc9ead290d670d7f321674342c933
Commit Graph

8965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bing Huan Chio
df483c3a8e Adding modified by to common part 2015-04-22 12:22:00 -07:00
Sipke Schoorstra
96b41fb9b7 Added autofocus to index creation screen. 2015-04-22 13:40:52 +02:00
Sipke Schoorstra
eb517fccaf Added default empty option. 
This avoids confusion when the current default index is no longer present and thus another index is displayed.
 2015-04-22 13:36:18 +02:00
Sipke Schoorstra
fcbd77c02a Removed unused namespace imports. 2015-04-22 13:10:24 +02:00
Sipke Schoorstra
c32d4f485b Merge branch 'feature/layoutzones' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-22 13:09:36 +02:00
Sipke Schoorstra
b639d893c0 Work on selectable container elements. 2015-04-21 23:08:29 +02:00
Sipke Schoorstra
5dabbf7aec Merge branch '1.9-int' into 1.x 2015-04-21 15:00:42 +02:00
Sébastien Ros
7c0f4500eb Merge pull request #5179 from Ermesx/pr/site-settings 
Moving default SiteSettings values to a handler.
 2015-04-20 21:23:57 -07:00
Sébastien Ros
af8df72f5e Merge pull request #5177 from sfmskywalker/feature/searchwidget 
Search Widget Enhancements
 2015-04-20 21:20:49 -07:00
Sipke Schoorstra
5d7988650e Fixed view compilation issue. 2015-04-20 23:12:18 +02:00
Sipke Schoorstra
54c53b7a12 Incremental work on selectable elements. 2015-04-20 23:07:27 +02:00
Sipke Schoorstra
c61e08abd9 Fixed view compilation issues. 2015-04-20 17:49:19 +02:00
Sipke Schoorstra
dd34d87ac9 Relaxed focus targets to allow pasting of elements into templated containers. 2015-04-19 22:18:43 +02:00
Sipke Schoorstra
dacdbdffb2 Canvas everywhere. 2015-04-19 22:13:09 +02:00
Sipke Schoorstra
8a300065c9 Fixed Form element design template. 2015-04-19 22:12:56 +02:00
Sipke Schoorstra
f5e4ef8fe5 Merged Rules with Properties. 2015-04-19 21:42:39 +02:00
Sipke Schoorstra
b239a492b4 Improved design view of Menu and Breadcrumbs elements. 2015-04-19 21:38:02 +02:00
Sipke Schoorstra
195d8711f9 Removed Zones integration. 2015-04-19 21:18:31 +02:00
Sipke Schoorstra
7be9428fac Implemented Menu and Breadcrumbs elements. 2015-04-19 21:12:28 +02:00
Sipke Schoorstra
df9eb83a6c Restored broken collapsible implementation. 2015-04-19 20:51:15 +02:00
Sipke Schoorstra
73ee4d1e37 Fixed Notifications issue by handling null HTTP contexts. 2015-04-19 19:33:10 +02:00
Sipke Schoorstra
8f84a011b6 Fixed popup CSS. 2015-04-19 19:30:43 +02:00
Sipke Schoorstra
a9df078ce3 Fixed a Notifications design display bug. 2015-04-19 18:45:53 +02:00
Sipke Schoorstra
838cd0a99a Added Notifications element. 2015-04-19 18:43:27 +02:00
Sipke Schoorstra
eb6285012a Added CreatingDisplay event to ElementDriver. 2015-04-19 18:43:05 +02:00
Sipke Schoorstra
65e951eee1 Core change: refactored NotifyFilter. 
This change enables other parts of the system to access the notifications without removing them from TempData.
 2015-04-19 18:42:28 +02:00
Sipke Schoorstra
bfa6f1326e Updated Snippet design shape template. 2015-04-19 17:26:02 +02:00
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
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