Commit Graph

  • 6112ae6ac7
    Merge 4 into master Damian Mooyman 2017-10-12 13:28:52 +1300
  • 8020e36409
    Merge remote-tracking branch 'origin/4.0' into 4 Damian Mooyman 2017-10-12 12:58:30 +1300
  • c5ca89a173
    Update editorconfig Damian Mooyman 2017-10-12 12:57:05 +1300
  • 7a2344117e Remove obsolete branch-alias 4.0.0-beta4 Damian Mooyman 2017-10-11 17:31:46 +1300
  • 1919cb984e Merge 25e3aac235 into 4a80bd9166 Dylan Wagstaff 2017-10-04 23:46:29 +0000
  • 25e3aac235 FIX convert CI bootstrap references to new their new locations in vendor Dylan Wagstaff 2017-10-05 10:07:57 +1300
  • 4a80bd9166 Merge pull request #85 from open-sausages/pulls/4.0/vendor-phpunit Chris Joe 2017-10-05 10:06:15 +1300
  • ca60b94f2e
    BUG Fix vendor bootstrap path Damian Mooyman 2017-10-05 09:50:04 +1300
  • 418ac59e90 Merge pull request #84 from open-sausages/pulls/4/vendorise-me-baby Damian Mooyman 2017-10-03 16:22:47 +1300
  • 0383ab4801
    Merge branch '4' Daniel Hensby 2017-09-28 17:25:20 +0100
  • 9ce1eedf2f Expose as vendor module Ingo Schommer 2017-09-27 18:09:56 +1300
  • 04e4c7d1a4 Merge pull request #82 from open-sausages/pulls/1.0/toolbar-style-layout Chris Joe 2017-09-21 16:47:51 +1200
  • 9afcf7780a Merge pull request #83 from dhensby/pulls/4/travis-composer-updates Damian Mooyman 2017-09-21 00:23:47 +1200
  • 448955d82f
    Make composer installs on travis more efficient Daniel Hensby 2017-09-15 11:57:32 +0100
  • cda78e2d88 FIX add space below report filter form Saophalkun Ponlu 2017-09-19 10:15:08 +1200
  • 5351ba670f FIX toolbar title layout Saophalkun Ponlu 2017-09-15 15:44:31 +1200
  • 3455a630b9
    Merge branch '4' Daniel Hensby 2017-08-15 11:13:25 +0100
  • e9c7273bb4 Update translations 4.0.0-beta3 4.0.0-beta2 Damian Mooyman 2017-08-07 14:34:14 +1200
  • 4fdc54c43e
    Merge branch '4' Daniel Hensby 2017-07-26 11:32:49 +0100
  • d0f65850fa
    Merge branch '3' into 4 Daniel Hensby 2017-07-26 10:45:44 +0100
  • 6025de29cc
    Merge branch '3.6' into 3 Daniel Hensby 2017-07-26 10:45:27 +0100
  • e8fef7ebdd
    Merge branch '3.5' into 3.6 3.6.4 3.6.3-rc2 3.6.3 3.6.2-beta2 3.6.2-beta1 3.6.2 Daniel Hensby 2017-07-26 10:45:00 +0100
  • 28b79c88ff
    Stay on travis precise for now 3.5.5-beta2 3.5.5-beta1 3.5.5 Daniel Hensby 2017-07-26 10:43:43 +0100
  • a7a08c7a06
    Merge branch '4' Daniel Hensby 2017-07-26 10:39:25 +0100
  • 09bd6fc231 Adds missing PreviewPanel template file to the main reports folder (#75) Marco Hermo 2017-07-21 09:14:51 +1200
  • 569ead77c4 Adds missing PreviewPanel template file to the main reports folder (#75) Marco Hermo 2017-07-21 09:14:51 +1200
  • 879ce3086c Merge pull request #80 from robbieaverill/pulls/4.0/make-excluded-reports-configurable Daniel Hensby 2017-07-17 14:06:12 +0100
  • 36d745ab24 Add .codecov.yml file Daniel Hensby 2017-07-17 14:04:44 +0100
  • 92ffc87e97 Merge pull request #81 from robbieaverill/pulls/4.0/enable-code-coverage Daniel Hensby 2017-07-17 14:04:05 +0100
  • 85c79d4e66 FIX Re-enable code coverage runs with phpdbg Robbie Averill 2017-07-16 16:42:16 +1200
  • 4aefa50087 Remove unused test report stubs Robbie Averill 2017-07-16 16:37:08 +1200
  • c3d2ba06c6 Update SilverStripe version requirement in readme Robbie Averill 2017-07-16 16:36:22 +1200
  • f4af1fab77 API Remove Report::add_excluded_report() and make excluded_reports configurable Robbie Averill 2017-07-16 16:36:12 +1200
  • ad9290e68b
    Merge branch '4' Daniel Hensby 2017-07-15 17:05:48 +0100
  • bf4e7224e0 Update composer alias Christopher Joe 2017-07-06 09:20:17 +1200
  • 405ef635a5 Update composer alias Christopher Joe 2017-07-05 14:51:20 +1200
  • 3060af38a3
    Update composer alias Daniel Hensby 2017-07-04 14:18:00 +0100
  • 4df5f54800
    Indent composer.json Damian Mooyman 2017-07-04 11:35:39 +1200
  • af807d08ba
    Update master branch alias Damian Mooyman 2017-07-04 11:35:04 +1200
  • 894663ad37
    Merge remote-tracking branch 'origin/4.0' Damian Mooyman 2017-07-04 09:19:35 +1200
  • fdbd6015d8
    Fix dependencies 4.0.0-beta1 Damian Mooyman 2017-07-04 09:18:21 +1200
  • 62419d748d Update translations Damian Mooyman 2017-07-03 17:17:41 +1200
  • 614ebcfcd9 Remove obsolete branch-alias Damian Mooyman 2017-07-03 16:53:55 +1200
  • e532d01821 Merge pull request #79 from open-sausages/pulls/4.0/upgrader-tweaks Chris Joe 2017-07-03 15:59:12 +1200
  • b1ec225246
    Add extra upgrade rules Damian Mooyman 2017-07-03 14:32:26 +1200
  • 84fb64bf8f
    Merge branch '3' Daniel Hensby 2017-06-28 11:18:15 +0100
  • 9e7108420b Merge pull request #78 from sminnee/resource-loading Ingo Schommer 2017-06-28 21:00:19 +1200
  • cf5115624d API : Remove REPORTS_DIR and its use. Sam Minnee 2017-06-28 10:24:31 +1200
  • 76b59e7464
    Merge branch '3.6' into 3 Daniel Hensby 2017-06-27 13:17:31 +0100
  • 108869841c Merge pull request #77 from open-sausages/pulls/4.0/namespace-in-docs Daniel Hensby 2017-06-27 12:47:32 +0100
  • ab0b3d8a2f FIX namespaces in docs Saophalkun Ponlu 2017-06-27 15:52:13 +1200
  • 1e386c83f6 Merge remote-tracking branch 'origin/3' Damian Mooyman 2017-06-27 13:41:28 +1200
  • a58416b6f6 New style travis tests Ingo Schommer 2017-04-13 13:52:16 +1200
  • a4cc0a4829 New style travis tests Ingo Schommer 2017-04-13 13:52:16 +1200
  • 19fa5355ce Merge pull request #76 from creative-commoners/pulls/3.6/add-php7-build Ingo Schommer 2017-06-26 15:16:01 +1200
  • 83dae0fbac Add PHP 7.1 and SS 3.6 build to Travis configuration Robbie Averill 2017-06-23 16:01:58 +1200
  • da988eba84 Adds missing PreviewPanel template file to the main reports folder vagrant 2017-06-23 12:33:11 +1200
  • 179310e457 Merge pull request #74 from open-sausages/pulls/4.0/app-object Ingo Schommer 2017-06-22 23:00:52 +1200
  • 7bab717c8d Update phpunit Damian Mooyman 2017-06-21 21:05:12 +1200
  • 8dbdc98cc2
    Upgrade module for app object refactor Damian Mooyman 2017-06-21 16:30:14 +1200
  • 03125b8c6c API Changes for Authenticator refactor Simon Erkelens 2017-06-09 16:48:30 +1200
  • 215b108212 NEW Add wrapper for mobile menu toggle Saophalkun Ponlu 2017-06-08 15:57:49 +1200
  • e9ad11d030 Move Member::currentUser() to Security::getCurrentUser() Simon Erkelens 2017-06-03 13:58:14 +1200
  • 2aa6433357
    Merge branch '3.6' into 3 Daniel Hensby 2017-05-31 00:06:39 +0100
  • 2e29bf27fe
    Merge branch '3.5' into 3.6 3.6.1-alpha2 3.6.1-alpha1 3.6.1 Daniel Hensby 2017-05-31 00:06:19 +0100
  • c249173e48
    Merge tag '3.6.0' into 3.6 Daniel Hensby 2017-05-31 00:06:19 +0100
  • be44c5e7df
    Merge branch '3.4' into 3.5 Daniel Hensby 2017-05-31 00:05:59 +0100
  • 63bbc0bae4
    Merge tag '3.5.4' into 3.5 Daniel Hensby 2017-05-31 00:05:59 +0100
  • d1764ffc08
    Merge tag '3.4.6' into 3.4 Daniel Hensby 2017-05-31 00:05:32 +0100
  • a0fc3aa86f
    Merge remote-tracking branch 'security/3.5.4' into 3.6.0 3.6.0-rc1 3.6.0 Daniel Hensby 2017-05-29 01:30:58 +0100
  • c2e804ad72
    Merge remote-tracking branch 'security/3.4.6' into 3.5.4 3.5.4-rc1 3.5.4 Daniel Hensby 2017-05-29 01:04:35 +0100
  • c927870432
    Merge branch '3.3' into 3.4 3.4.6-rc2 3.4.6-rc1 3.4.6 Daniel Hensby 2017-05-28 21:37:05 +0000
  • 3f112ecfcd Merge pull request #71 from open-sausages/pulls/4.0/remove-toolbar-header Daniel Hensby 2017-05-18 11:18:05 +0100
  • c37c69097d Remove empty toolbar header from reports list Ingo Schommer 2017-05-18 22:06:02 +1200
  • 19974fe1f2 Fix PHPDoc for Report::add_excluded_reports method. Garion Herman 2017-04-21 11:31:57 +1200
  • 664fa75a02 Reorganise i18n keys Aaron Carlino 2017-05-08 17:56:43 +1200
  • ba0330a2ad
    Synchronise with transifex Damian Mooyman 2017-05-08 12:25:41 +1200
  • 40a07f5002
    Add tx config Damian Mooyman 2017-05-08 10:30:50 +1200
  • 24afd61131 Merge pull request #70 from sminnee/drop-php55 Ingo Schommer 2017-05-04 16:13:55 +1200
  • 4332d2fa8e FIX: Drop php5.5, add php7.1, simplify build Sam Minnee 2017-05-04 15:25:14 +1200
  • 799038ea0e Relocate all foreign keys to their correct modules Aaron Carlino 2017-05-04 13:54:45 +1200
  • b9f9e933db Upgrade template keys, re-run upgrader Aaron Carlino 2017-05-04 12:59:52 +1200
  • 7172eecd08
    Aliasing 3 as 3.7.x-dev Daniel Hensby 2017-04-21 16:13:40 +0100
  • 4a6bf37c42 Fix PHPDoc for Report::add_excluded_reports method. Garion Herman 2017-04-21 11:31:57 +1200
  • 575c3908f3 Merge 469c57bca6 into 27b2037c68 Ingo Schommer 2017-04-03 23:04:10 +0000
  • c1d2696514 Merge pull request #65 from sminnee/fix-php-req 3.6.0-beta2 3.6.0-beta1 Loz Calver 2017-04-04 00:03:05 +0100
  • e5f51b14a3 FIX: Relax PHP version requirement. Sam Minnee 2017-04-04 10:50:26 +1200
  • 27b2037c68 Merge pull request #64 from sminnee/license-file 4.0.0-alpha7 4.0.0-alpha6 Damian Mooyman 2017-03-29 17:34:30 +1300
  • 59a9ff8459 FIX: Rename license file to match module standard. Sam Minnee 2017-03-29 12:53:10 +1300
  • 5dace88830 Merge pull request #63 from open-sausages/pulls/add-admin-dep Damian Mooyman 2017-03-15 14:24:46 +1300
  • 02446a47a5 Add silverstripe/admin dep Ingo Schommer 2017-03-15 14:09:09 +1300
  • 376d2bfbc1 Merge pull request #62 from open-sausages/pulls/4.0/admin-module-split Ingo Schommer 2017-03-15 12:02:05 +1300
  • 4599b2b52c
    API move CMSPreviewable to ORM Damian Mooyman 2017-03-15 10:38:36 +1300
  • 240723b378 Merge pull request #60 from silverstripe/fix-composer 4.0.0-alpha5 Damian Mooyman 2017-02-27 14:39:07 +1300
  • c9e2c249c2 FIX: Allow pre-release versions of SS4. Sam Minnee 2017-02-27 09:19:43 +1100
  • 015b400fb7 Merge pull request #59 from open-sausages/pulls/4.0/i18n-locale Ingo Schommer 2017-02-16 10:56:51 +1300
  • b4e047b39f
    Remove unnecessary tinymce config Damian Mooyman 2017-01-26 17:22:54 +1300
  • 37a7e68f2d Merge pull request #58 from open-sausages/pulls/4.0/i18n-symfony Daniel Hensby 2017-01-24 12:19:07 +0000
  • 3c8a56f904
    BUG Fix missing default on _t(‘GridField.Filter’) Damian Mooyman 2017-01-24 12:30:06 +1300
  • 3cadebf595 Merge pull request #57 from open-sausages/features/4.0/ui-button-refresh 4.0.0-alpha4 Damian Mooyman 2017-01-11 14:27:02 +1300