tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,147 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

5147 Commits

Author SHA1 Message Date
Daniel Hensby 524067caaa Setting default branch in .codecov.yml 2016-11-24 10:58:57 +00:00
Daniel Hensby bbaec8c913 Merge pull request #1684 from open-sausages/pulls/4.0/framework-test-namespace 
API Update tests to reflect renamed services
 2016-11-23 20:11:54 +00:00
Damian Mooyman 38070ab2d3 API Update tests to reflect renamed services 2016-11-23 19:28:10 +13:00
Ingo Schommer c8865761d1 Synced up badges with framework 2016-11-21 16:54:17 +13:00
Ingo Schommer 8b29228cf2 Added Code Coverage badge 2016-11-21 16:52:39 +13:00
Ingo Schommer 0d788ddfbc NEW: Code Coverage via CodeCov.io (#1631) 
* Add phpunit.xml.dist for code coverage whitelist
* Fixed @covers with namespaces
* Increase memory_limit to allow code coverage run. phpdbg can peak to more than 1GB built-in.

Travis allows up to 3GB of useable memory:
https://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error
https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments

https://github.com/silverstripe/silverstripe-cms/pull/1631
 2016-11-21 15:17:25 +13:00
Daniel Hensby 7797ab4e00 Merge pull request #1680 from open-sausages/pulls/4.0/safari-layout-bugs 
Safari layout bugs
 2016-11-08 10:46:37 +00:00
Paul Clarke 23a056758a Remove scroll for preview auto as its in iframe 2016-11-08 17:23:26 +13:00
Paul Clarke eca1fb1cd1 safari fix for scroll 2016-11-08 17:23:26 +13:00
Daniel Hensby 703b93fdc5 Merge pull request #1679 from open-sausages/pulls/4.0/safari-layout-bugs 
Safari layout bugs for page actions toolbar and menu toggle area
 2016-11-07 13:11:59 +00:00
Paul Clarke 962519c6a7 Fix for safari height in main container – shows action bar 2016-11-07 13:57:58 +13:00
Daniel Hensby 510ea8bb6f Merge pull request #1677 from webbuilders-group/windows-cms-dir-fix 
BUGFIX: Fixed issue on windows where the CMS_DIR constant would be set containing a backslash
 2016-11-04 21:47:09 +00:00
UndefinedOffset 8bd5349e42 BUGFIX: Fixed issue on windows where the CMS_DIR constant would be set containing a backslash causing a crash in the cms 2016-11-04 13:29:22 -03:00
Daniel Hensby 5bd7662cb4
Merge branch '3' 2016-11-03 15:32:47 +00:00
Damian Mooyman 35b38ff29c Update translations 2016-11-03 13:36:56 +13:00
Damian Mooyman f4e163e9db Merge pull request #1667 from open-sausages/pulls/4.0/fix-campaign-archived 
BUG Prevent archived pages from having add to campaign action
 2016-10-31 17:12:34 +13:00
Damian Mooyman 4bf4fca416 BUG Prevent archived pages from having add to campaign action 
Fixes #1626
 2016-10-31 15:24:07 +13:00
Sam Minnée 062c8205c1 Merge pull request #1661 from sminnee/simpler-test-run 
Simplify the test run so as to not need a regular SS project structure
 2016-10-31 14:57:42 +13:00
Damian Mooyman 741c515cb2 ENHANCEMENT: Improved behaviour for flexbox on smaller screens 2016-10-31 14:17:56 +13:00
Paul Clarke 17ef686f61 Fix for History versions extending outside collapsed panel 2016-10-31 11:56:20 +13:00
Damian Mooyman e242af48df Remove @todo behat test 2016-10-31 10:01:44 +13:00
Sam Minnee 7d18cda7ee FIX: Test fixes needed for the new simplified test run structure. 2016-10-28 17:48:51 +13:00
Sam Minnee eef14c1afc FIX: Fix behat tests. 
Update behat test config for simplified test run.
 2016-10-28 17:47:59 +13:00
Sam Minnee bf9939e32c NEW: Refactor test bootstrap to be more modular. 
The test bootstrap is broken into units that can be combined for
different test situations:

 - phpunit
 - behat
 - serve
 2016-10-28 17:47:53 +13:00
Sam Minnee d946a3b240 FIX: Allow CMS_DIR at the root. 
CMS_DIR is now inferred from the file location and may be at the
project root.
 2016-10-28 17:47:53 +13:00
Sam Minnee added2129f NEW: Simplified travis run 
Travis no longer relies on travis-support or special project structures.
Instead, behat and silverstripe-serve are provided as dev dependencies
and used within a normal composer install structure.

tests/fixtures/Page.php should be copied into the project root before
a test run. .travis.yml does this.
 2016-10-28 17:47:21 +13:00
Paul Clarke d0619c1f0f Fix for double scroll in history area 2016-10-28 16:34:26 +13:00
Paul Clarke 7969f70c25 images in history to limit size to panel 2016-10-28 16:28:30 +13:00
Paul Clarke 3e256ddd58 Build 2016-10-28 16:28:30 +13:00
Paul Clarke 5cb431d9fd add flexbox layout to sitetree area 2016-10-28 16:28:30 +13:00
Paul Clarke df9b73725a Make minor buttons smaller, change conflicting class (used elsewhere) 2016-10-28 15:44:31 +13:00
Paul Clarke c0623a4962 Remove break as text should be fluid for responsive layout 2016-10-28 15:44:31 +13:00
Paul Clarke 18c1a4470f Add back button on edit panel for smaller screens only 2016-10-28 15:44:31 +13:00
Damian Mooyman a8cb4a516f Merge pull request #1665 from open-sausages/pulls/4.0/fix-listview 
API Update listview / treeview to use pjax instead of deferred loading
 2016-10-28 13:40:47 +13:00
Damian Mooyman e5550dd680 BUG Fix search not respecting view mode 2016-10-27 17:05:36 +13:00
Damian Mooyman 8c87ea6b79 API Update listview / treeview to use pjax instead of deferred loading 
Fixes #1645
 2016-10-27 17:05:36 +13:00
Damian Mooyman c4d748cb7d
BUG Fix firefox compatibility 2016-10-27 17:02:06 +13:00
Damian Mooyman 424008cff4 BUG Fix installer for 4.0 (#1644) 2016-10-26 14:44:25 +13:00
Damian Mooyman 7c6eec3a01 Merge pull request #1658 from open-sausages/pulls/4.0/search-bg 
Remove JS from filter height and replace with flexbox
 2016-10-26 14:27:36 +13:00
Christopher Joe 57fb0e0b33 moved cms-tree-filtered up with flexbox-area-grow 2016-10-26 10:43:34 +13:00
Sam Minnée 75b185092e FIX: Remove reference to Object class. (#1634) 
The Object class is due to be removed and so this removes dependence on it.
 2016-10-25 10:01:21 +01:00
Paul Clarke 6762f43511 Add scroll to panel for filtered results 2016-10-25 15:07:51 +13:00
Paul Clarke 172072df03 Remove JS from filter height and replace with flexbox 2016-10-25 14:38:58 +13:00
Damian Mooyman 13d40f96f3 API Rename _versions table to _Versions (#1655) 
See https://github.com/silverstripe/silverstripe-framework/pull/6203
 2016-10-25 14:03:45 +13:00
Damian Mooyman d54ae8bb26 API Consolidate "Delete from draft" and "Archive" actions into a consistent behaviour (#1653) 
API Update to support new versioned dataobject behaviour
 2016-10-25 13:22:31 +13:00
Damian Mooyman 06c8402f03 Merge pull request #1651 from open-sausages/pulls/4.0/split-pages-toolbar 
Split top toolbar for Pages section
 2016-10-18 18:43:56 +13:00
Christopher Joe 0d1cd1ba44 Split top toolbar to their horizontal containers for Pages section 2016-10-18 14:22:47 +13:00
Daniel Hensby ad2b2a044e
Merge branch '3.4' into 3 2016-10-16 22:43:01 +01:00
Daniel Hensby 147181e96f
Merge branch '3.3' into 3.4 2016-10-16 22:42:40 +01:00
Daniel Hensby bc71f2de01
Merge branch '3.2' into 3.3 2016-10-16 22:42:26 +01:00