Commit Graph

  • 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
  • 79da2b549b Merge d67aee56fe into cb06593a65 Chris Joe 2017-01-09 22:53:48 +0000
  • d67aee56fe Update icon Paul Clarke 2016-12-20 16:13:46 +1300
  • 417fb81ae4 add font-icon to menu Paul Clarke 2016-12-20 13:30:50 +1300
  • cb06593a65
    Merge branch '3' Daniel Hensby 2016-11-30 11:22:46 +0000
  • b10955d985
    Merge branch '3.5' into 3 Daniel Hensby 2016-11-28 14:14:09 +0000
  • dcb8024158
    Merge tag '3.5.0' into 3.5 3.5.3-rc1 3.5.3 3.5.2-rc1 3.5.2 3.5.1-rc2 3.5.1-rc1 3.5.1 Daniel Hensby 2016-11-28 14:13:29 +0000
  • 469c57bca6 Set CodeCov default branch to master Ingo Schommer 2016-09-27 14:10:01 +1300
  • cdebdc63fa Added phpunit.xml.dist with coverage whitelist Ingo Schommer 2016-09-27 10:44:08 +1300
  • c3742b56cc Code Coverage via CodeCov.io Ingo Schommer 2016-09-27 10:43:55 +1300
  • 9c5974a13b
    Merge branch '3.4' into 3.5.0 3.5.0-rc3 3.5.0 Daniel Hensby 2016-11-15 12:09:14 +0000
  • da4aeda90e
    Merge branch '3.3' into 3.4 3.4.5-rc1 3.4.5 3.4.4-rc1 3.4.4 3.4.3-rc1 3.4.3 3.4.2 Daniel Hensby 2016-11-15 12:08:32 +0000
  • 65e0b6ef35
    Merge branch '3.2' into 3.3 3.3.4 Daniel Hensby 2016-11-15 12:08:05 +0000
  • 8e5462794d
    Merge pull request #1 from silverstripe-security/patch/3.2/SS-2016-012 3.2.6 Daniel Hensby 2016-11-15 12:06:53 +0000
  • a0eda1edd1 Increment 3 alias to 3.6 Damian Mooyman 2016-11-14 10:04:09 +1300
  • 804ff7c247
    FIX Fixing test errors Daniel Hensby 2016-11-10 13:01:37 +0000
  • 537f4da88f
    Merge branch '3' Daniel Hensby 2016-11-10 11:53:48 +0000
  • 43462f1afa Merge pull request #55 from open-sausages/features/4.0/jlayout-to-flexbox 4.0.0-alpha3 Damian Mooyman 2016-10-11 17:36:26 +1300
  • 8dd40b3c26 Merge pull request #50 from open-sausages/pulls/4.0/reports-filter-spacing Damian Mooyman 2016-10-05 19:42:45 +1300
  • 97eac2eb09 Replace Layout CSS classes for flexbox classes Paul Clarke 2016-10-05 17:48:03 +1300
  • fa7e0825c5 Merge pull request #54 from sminnee/the-chrisening Loz Calver 2016-09-28 09:22:40 +0100
  • c813488412 MINOR: Make use of static::class Sam Minnee 2016-09-28 11:34:42 +1300
  • 2c7846cb72 Merge pull request #53 from sminnee/no-class-property Daniel Hensby 2016-09-27 22:15:51 +0100
  • fe0ca63c7a FIX: Remove referencies to Object::$class Sam Minnee 2016-09-28 10:00:51 +1300
  • 3d144b3afc Add spacing below filter action Paul Clarke 2016-09-20 17:27:49 +1200
  • 0008f474b8 Update Travis build URL 4.0.0-alpha2 Will Rossiter 2016-09-19 19:17:07 +1200
  • 3b32047f28 Merge pull request #49 from open-sausages/pulls/4.0/alignment-and-spacing Will Rossiter 2016-09-19 19:05:45 +1200
  • c4ba67c1fb Merge pull request #48 from open-sausages/webpack Loz Calver 2016-09-15 09:45:36 +0100
  • 9cee3c25fb Remove custom reportAdmin css overrides Paul Clarke 2016-09-15 15:44:03 +1200
  • 1e8d94afe1 Remove HTMLEditorField.js include Ingo Schommer 2016-09-15 15:25:14 +1200
  • b2f3902996 Rename SS_ prefixed classes (#46) Damian Mooyman 2016-09-09 18:11:38 +1200
  • 59ab0fcfcb
    Rename SS_ prefixed classes Damian Mooyman 2016-09-09 11:28:23 +1200
  • c6b6c5fb2a Merge pull request #45 from open-sausages/pulls/4.0/namespace-everything Ingo Schommer 2016-09-08 17:57:19 +1200
  • bd17cca223
    Upgrade code for namespaces Apply SilverStripe\Reports namespace Damian Mooyman 2016-08-29 13:55:43 +1200
  • f759a7c6db Merge pull request #44 from open-sausages/pulls/4.0/namespace-admin Daniel Hensby 2016-08-17 11:45:37 +0100
  • a96ab15af3 API Fix issue with namespaced reports Add permission code to reports Fix include paths Damian Mooyman 2016-08-12 15:55:47 +1200
  • 8f14b94433 Merge 3.4 into 3 3.5.0-rc2 3.5.0-rc1 Damian Mooyman 2016-08-15 19:05:25 +1200
  • 20f929ba8b Merge 3.3 into 3.4 Damian Mooyman 2016-08-15 19:01:57 +1200
  • 8395a55442 Merge 3.2 into 3.3 Damian Mooyman 2016-08-15 18:47:45 +1200