Commit Graph

281 Commits

Author SHA1 Message Date
Shoaib Ali 9cd3837dbc OSS-905 Added code of conduct 2015-11-07 12:28:34 +13:00
Shoaib Ali 210ffc9645 OSS-905 Added changelog 2015-11-07 12:17:25 +13:00
Christopher Pitt 936cb63826 Merge pull request #99 from shoaibali/contributing
OSS-905 Moved contributing section to contributing.md
2015-11-07 12:04:58 +13:00
Shoaib Ali a586a034d1 OSS-905 Moved contributing section to contributing.md 2015-11-07 12:03:05 +13:00
Shoaib Ali a397764ad7 OSS-905 Added gitattributes 2015-11-07 11:48:19 +13:00
Cam Findlay c202259bc1 Merge pull request #96 from assertchris/add-scrutinizer-support
Added Scrutinizer support
2015-11-07 11:42:11 +13:00
Christopher Pitt ff39cd6eb4 Added Scrutinizer support 2015-11-07 11:07:39 +13:00
Christopher Pitt eee39bca4e Merge pull request #95 from tractorcow/pulls/fix-tests
BUG Prevent non-widget tests from loading WidgetAreaEditorTest_FakePage every query
2015-11-05 10:14:23 +13:00
Damian Mooyman 79db693835 BUG Prevent non-widget tests from loading WidgetAreaEditorTest_FakePage every query 2015-11-04 17:01:46 +13:00
Scott Hutchinson c16db15e9e Merge pull request #94 from tractorcow/pulls/tests
Tests for php 5.6 and framework 3.2
2015-10-30 18:44:59 +13:00
Damian Mooyman ca1bb3d037 Tests for php 5.6 and framework 3.2 2015-10-30 18:11:46 +13:00
☃ Stephen Shkardoon ☃ 17c94ff9ce Merge pull request #93 from hailwood/patch-1
Support widget forms with InheritSidebar
2015-09-22 13:44:40 +12:00
Matthew Hailwood ff0178330a Support widget forms with InheritSidebar
Currently the system assumes that if a widget ends up at "handleWidget" that the widget resides on the current page. This patch checks if we are inheriting the sidebar and if so finds the top level page with the widget.
2015-09-22 13:42:20 +12:00
Damian Mooyman c332a6ab8b Update translations 2015-08-20 12:47:38 +12:00
Daniel Hensby 4d9fc0056c Move to new travis containerised infrastructure 2015-07-20 16:02:21 +01:00
Damian Mooyman b95f204374 Merge pull request #90 from assertchris/update-translations
Updated translations
2015-05-20 09:13:08 +12:00
Christopher Pitt bf5a08da76 Updated translations 2015-05-20 08:57:16 +12:00
Christopher Pitt 791d32a303 Merge pull request #89 from tractorcow/pulls/1.0/fix-cms-fields-bug
BUG Fix incorrect extension variable
2015-05-14 11:19:49 +12:00
Damian Mooyman ed6114a7dc BUG Fix incorrect extension variable
Fixes silverstripe/silverstripe-blog#233
2015-05-14 10:50:33 +12:00
Christopher Pitt cdfec4c7dc Merge pull request #87 from tractorcow/pulls/1.2
Move 3.2+ compat version to 1.2
2015-05-04 12:46:52 +12:00
Damian Mooyman ed8f7d867a Move 3.2+ compat version to 1.2
Fix version constraint
2015-05-04 12:03:29 +12:00
Damian Mooyman ccea929cb9 Merge remote-tracking branch 'origin/1.0' into 1.1
Conflicts:
	code/model/Widget.php
2015-05-04 11:46:37 +12:00
Ingo Schommer 25a1a35a0b Limit 1.0 compat to 3.1.* 2015-04-30 22:58:48 +12:00
Ingo Schommer d0ce44401f 4.x compat, updated Travis build targets 2015-04-30 22:52:09 +12:00
Ingo Schommer f2f6b6e18c 3.2.x compat 2015-04-30 22:49:17 +12:00
Will Rossiter 557a7219f4 Merge pull request #85 from webbuilders-group/1.0
BUGFIX: Fixed issue where Widget::CMSEditor() can't rename the enabled checkbox
2015-04-02 14:45:59 +13:00
UndefinedOffset 54599b98d1 BUGFIX: Fixed issue where Widget::CMSEditor() can't see the enabled checkbox 2015-04-01 11:55:08 -03:00
Christopher Pitt 59e4ba50f2 Merge pull request #84 from tractorcow/pulls/api-customise-title
API Enable Title to be CMS driven
2015-03-06 15:50:23 +13:00
Damian Mooyman b23606b498 API Enable Title to be CMS driven
FIX issue with field scaffolding hiding the "Enabled" checkbox
FIX Safe escaping of CMSTitle / Description fields
2015-03-06 15:41:28 +13:00
Christopher Pitt 871ba84d97 Merge pull request #83 from tractorcow/pulls/modernise
Remove reliance on $_REQUEST global
2015-03-06 15:29:27 +13:00
Damian Mooyman 9c678ca540 Remove reliance on $_REQUEST global
Update to support 4.0
Alias dev-master as 1.0
2015-03-06 12:04:10 +13:00
Damian Mooyman f35800541e Merge pull request #77 from webbuilders-group/master
BUG: Fixed issue where beforeSave() was not being called when saving
2015-03-06 10:20:38 +13:00
Will Rossiter 674ea5d591 Merge pull request #80 from dhensby/master
Adding .editorconfig
2014-12-05 15:17:50 +13:00
Daniel Hensby 1b515b7dea Adding .editorconfig 2014-12-04 16:11:22 +00:00
UndefinedOffset 512a6aafee BUG: Fixed issue where before save was not being called
BUG: Fixed JavaScript error undefined variable when calling sortWidgets
2014-10-06 12:29:21 -03:00
Michael Parkhill 8ee406675e Merge pull request #73 from webbuilders-group/master
Proposed fix for issue #25
2014-08-06 16:03:50 +12:00
Will Rossiter 575654459c Remove sort from CMS. (Fixes #75) 2014-07-02 09:16:53 +12:00
Will Rossiter 2baa195282 Remove ParentID field from the fields
This should not be manually set by default.
2014-07-02 09:14:12 +12:00
UndefinedOffset 025604971c Proposed fix for issue #25 2014-06-17 15:33:02 -03:00
Will Rossiter 6b67ee0ff8 Scaffold widget form fields by default 2014-03-09 21:06:52 +13:00
Michael Parkhill 2c08c173fb Merge pull request #70 from dhensby/patch-1
FIX Setting `$only_available_in` to `private` visibility
2013-10-15 18:49:05 -07:00
Daniel Hensby cad7a65040 FIX Setting `$only_available_in` to `private` visibility
Config engine throws deprecation warnings when this is accessed through the Config engine
2013-10-15 10:54:21 +01:00
TeamCity c8dcbf58cf Updated master strings 2013-08-23 03:05:49 +12:00
Michael Parkhill fb655f3862 Merge pull request #67 from Sixfifty/patch-1
Fixed locale for AJAX requests on addWidget.
2013-08-19 20:16:50 -07:00
Michael Parkhill d1586a5b5e Merge pull request #59 from Mark-M/patch-1
FIX #58 on page duplicate
2013-08-19 20:16:12 -07:00
Michael Parkhill b28a6b27d6 Merge pull request #66 from tractorcow/inherit-sidebar-fix
BUG Fixed issue with nested InheritSideBar not inheriting beyond the first level
2013-08-19 20:14:12 -07:00
Will Rossiter e3c2dec7df Merge pull request #69 from ryanwachtl/onlyavailablein-config
Use Config to get Widget::$only_available_in
2013-08-17 16:40:37 -07:00
Ryan Wachtl eb092e7395 Use Config to get Widget::$only_available_in
Added support for use of Config to set Widget::$only_available_in so widgets bundled with other modules can be hidden, ex. blog module.
2013-08-16 19:46:39 -05:00
Mateusz Uzdowski a596374271 Fix dependency strings to work with rc's. 2013-08-13 10:10:39 +12:00
Michael Parkhill ea6c9a7a25 Merge pull request #68 from TomSpeak/patch-2
NEW Adding support for Translatable
2013-08-08 15:13:31 -07:00