Commit Graph

9410 Commits

Author SHA1 Message Date
Sebastien Ros
aa2e2cf1d0 Ignoring VS 2015 settings files 2015-06-16 11:16:35 -07:00
Bertrand Le Roy
8eea9a6771 Add missing reference to media library from image editor web config so that views compile properly. 2015-06-15 12:42:50 -07:00
Lombiq
1d445c5438 Fixing that Custom Forms didn't display a submit button text if there was none configured
The button text not being configured can happen on an 1.8 to 1.9 upgrade for example.
2015-06-15 00:07:01 +02:00
Lombiq
6aabc4d9f9 Fixing that the Audit Trail Recycle Bin caused YSOD if a content item didn't have a display text (like Comments) 2015-06-14 23:18:25 +02:00
Bertrand Le Roy
14172fec51 Fix compilation issue on dynamic forms admin views that use namespaces from layouts. 2015-06-13 16:42:09 -07:00
Sipke Schoorstra
9e88d16273 Added missing null check to Projection element driver's export method. 2015-06-13 19:11:25 +03:00
Lombiq
66af4a8cdf Adding null check for query string parameters in AuditTrail to prevent possible YSOD 2015-06-13 01:02:16 +02:00
Sipke Schoorstra
9466d91438 #5379: Improved LayoutPartDriver to safely handle recursive layout rendering.
This prevents a SO exception when you for example have a Projection element that renders content including the content item rendering that Projection element.
2015-06-12 13:28:53 +03:00
Bertrand Le Roy
e3a9758331 Add a break element that renders the hr tag. 2015-06-11 20:47:37 -07:00
Bertrand Le Roy
564eeacf04 Merge branch '1.9.x' of https://github.com/OrchardCMS/Orchard into 1.9.x 2015-06-11 10:03:57 -07:00
Daniel Stolt
83429f4000 Restoring commit: Render fieldset as a fieldset in the editor canvas (by Bertrand Le Roy). 2015-06-11 16:11:30 +03:00
Bertrand Le Roy
47a0a87dc0 Render fieldset as a fieldset in the editor canvas. 2015-06-10 13:10:59 -07:00
Daniel Stolt
c8590fd934 Added missing NPM dependency in Orchard.Layouts. 2015-06-10 23:06:41 +03:00
Sipke Schoorstra
1ee4664c50 Removed two more non-existing files. 2015-06-10 22:36:34 +03:00
Daniel Stolt
e8de82b611 Added Gulp build to Orchard.DynamicForms. 2015-06-10 20:43:59 +03:00
Bertrand Le Roy
c16de7f20a Fix flashing popup when adding a fieldset to the layout canvas. 2015-06-10 10:26:47 -07:00
Daniel Stolt
c1eff70f4a Refactored client-side asset build automation to fix watch triggering. 2015-06-10 16:26:51 +03:00
Rob King
92bde1ac71 Merge pull request #2 from gcsuk/ImprovedRecipeJournal
Replaced string.format with Localizable T
2015-06-10 12:24:32 +01:00
Rob King
7e149c4bc1 Replaced string.format with Localizable T 2015-06-10 10:07:04 +01:00
Sipke Schoorstra
9fbaed9123 Removed non-existing files from Orchard.Layouts.csproj. 2015-06-10 11:04:17 +03:00
Bertrand Le Roy
ef3ca907c7 Remove editor completely when adding a fieldset to the layout editor. 2015-06-09 13:48:58 -07:00
Bertrand Le Roy
7a1983b47f Add a fieldset element 2015-06-09 13:08:57 -07:00
Sipke Schoorstra
230d1b5d5d Fixed missing view file issue. 2015-06-09 21:54:48 +03:00
Daniel Stolt
5d40be8390 Removing an MSBuild property that was not supposed to be committed. 2015-06-09 21:31:27 +03:00
Daniel Stolt
452b8cfeac Added sticky positioning to layout editor toolbox. 2015-06-09 19:38:44 +03:00
Rob King
d78afaeb51 Merge pull request #1 from gcsuk/ImprovedRecipeJournal
Improved Recipe Journal Logging Detail
2015-06-09 16:09:53 +01:00
Rob King
a0279f2d9c Improved recipe logging to give a trail of executed tasks 2015-06-09 15:59:44 +01:00
Daniel Stolt
d86a5ec8c5 Replaced Web Essentials with Gulp for Orchard.Layouts.
Starting with VS2015, Web Essentials will no longer perform tasks such as bundling, minification and LESS compilation. Developers are expected to use either Grunt or Gulp for front-end build automation. In order to enable working with the codebase in VS2015 going forward, this change is therefore necessary.
2015-06-09 14:09:03 +03:00
Sipke Schoorstra
711948fd64 Implemented import/export for VectorImage element. 2015-06-09 13:57:22 +03:00
Sipke Schoorstra
c4dacc1f62 Fixed that VectorImage would not render in TinyMCE. 2015-06-09 13:37:04 +03:00
Sipke Schoorstra
6a2b6d81f4 Formatted placement file. 2015-06-09 13:30:58 +03:00
Sipke Schoorstra
d6154078dc Fixed VectorImage placement. 2015-06-09 13:30:32 +03:00
Daniel Stolt
d9208bcc14 #5295: Fixed clipboard operations in layout element property popups. 2015-06-09 02:08:58 +03:00
Sipke Schoorstra
88679bd7ca Corrected bad merge. 2015-06-09 01:33:46 +03:00
Sipke Schoorstra
e03df31e50 Fixed unit tests. 2015-06-09 01:23:06 +03:00
Sipke Schoorstra
aba53e122d Cherry picked ce630f980c. 2015-06-09 01:22:41 +03:00
Sipke Schoorstra
c9887f4d39 Cherry picked 1e83068b8c. 2015-06-09 01:17:37 +03:00
Sipke Schoorstra
f0cd135993 Cherry picked 9bf6ac5718. 2015-06-09 01:14:49 +03:00
Daniel Stolt
d3ccd743e9 Added a missing MVC dependency assembly.
For people with MVC 4 installed on their local box, this DLL was in the GAC so this was not an issue. However, with only VS2015 installed and no pre-nuget version of MVC, this causes a YSOD.
2015-06-09 00:24:19 +03:00
Sipke Schoorstra
0b309677f8 #5367: Implemented import/export for the Projection Element. 2015-06-09 00:04:59 +03:00
Daniel Stolt
b2b6ea4bc2 Removed orphaned reference in Orchard.Layouts. 2015-06-08 23:49:39 +03:00
Sipke Schoorstra
e810d885a0 #5270: Fixed Shape type not found error. 2015-06-07 00:25:58 +02:00
Lombiq
0c7b52e1be #5355: Fixing that the selected terms in a TaxonomyField were cleared out when updating an editor group the field isn't displayed in 2015-06-06 00:34:55 +02:00
Lombiq
30411b6be5 #5348: Splitting ItemDisplayText in two (fixing the fix) 2015-06-06 00:32:29 +02:00
Sébastien Ros
c3379489d7 #5348: Splitting ItemDisplayText in two 2015-06-04 12:51:58 -07:00
Sébastien Ros
5c5ce99083 Merge pull request #5338 from qt1/IBN-Labs/Schemabuilder.TableDbName
Provide full table name prefix for migrations
2015-06-04 12:32:30 -07:00
Sébastien Ros
e709593197 Merge pull request #5321 from Xeevis/1.9.x
#5109: Email field shouldn't specify email type in design mode
2015-06-04 12:23:18 -07:00
Sébastien Ros
1b8e00a9c6 Merge pull request #5256 from jtkech/patch-4
#5235: Awaiting activities not cleared on saving
2015-06-04 12:04:31 -07:00
qt1
5b468b0ce0 remove fix for automatic addition of is null (maybe a different PR) 2015-06-01 03:33:14 +03:00
qt1
6e94264df2 Provide full table name prefix for migrations 2015-06-01 02:07:42 +03:00