Commit Graph

527 Commits

Author SHA1 Message Date
Steve Boyd a09499b4bd Use 3.7 branch, change to dms dir before running yarn, install dev dependencies 2019-12-16 11:19:52 +13:00
Maxime Rainville 09fea7961e
Merge pull request #222 from creative-commoners/pulls/master/update-unit-test-date
Change date on unit test
2019-12-12 17:45:11 +13:00
Steve Boyd e2dc05b0ff Change date on unit test 2019-12-12 17:33:38 +13:00
Maxime Rainville f2ef1b82ea
Merge pull request #219 from creative-commoners/pulls/master/add-lock-file
Add yarn.lock file
2019-12-02 17:28:44 +13:00
Maxime Rainville 8aba8cd8d7 Upgrade travis build set up 2019-11-13 12:40:21 +13:00
Maxime Rainville 49239899fa Add yarn.lock file 2019-11-13 12:00:59 +13:00
Loz Calver 945119a1da
Update branch alias 2019-01-02 15:33:31 +00:00
Robbie Averill e7535a6af6
Merge pull request #217 from kinglozzer/php72
PHP 7.2 compatibility
2019-01-02 12:58:39 +00:00
Loz Calver 1fc11a7854 PHP 7.2 compatibility 2019-01-02 11:08:48 +00:00
Daniel Hensby c0fbe98851
Merge pull request #214 from InnisMaggiore/dmc/download-behavior-on-write
Save default DownloadBehaviour on a DMSDocument when initially uploading a new one
2018-07-06 16:57:19 +01:00
Dave Collins cf278fd8e2 Save default DownloadBehaviour on a DMSDocument when initially uploading a new one
- array key check for behavior before using
2018-07-06 08:59:10 -04:00
Dave Collins 52772ae879 documentation fix for DownloadBehavior fix 2018-07-05 12:06:14 -04:00
Dave Collins 5561e4a7af minor formatting fix 2018-07-05 12:04:33 -04:00
Dave Collins 71c09244f7 Make sure default DownloadBehavior is stored when initially uploading a document 2018-07-05 12:00:30 -04:00
Robbie Averill d94aa25ac7
Merge pull request #212 from sekjal/patch-1
Add support for GridfieldOrderableRows
2018-06-19 09:13:24 +12:00
Ian Walls dfbddb49a2
Add support for GridfieldOrderableRows
GridfieldExtensions' GridfieldOrderableRows is functionally quite similar (if not identical) to GridFieldSortableRows, and not all developers may want to support both modules.  This commit adds fallback support for sorting Document Sets using GridfieldOrderableRows if it is installed, and GridFieldSortableRows is not.

To test:
1. Uninstall GridFieldSortableRows (or start with an install without it)
2. Install GridFieldExtensions
3. Create/Open a Document Set
4. Make sure there are multiple files within.
5.  Drag/drop reorder without errors
2018-06-18 15:14:08 -04:00
Robbie Averill 4f5dddc17d
Merge pull request #211 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:48:14 +12:00
Dylan Wagstaff 6d36c67195 Add supported module badge to readme 2018-06-15 17:34:06 +12:00
Dylan Wagstaff 86bc9ec509 Merge up `2.1` into `master` 2018-04-11 14:08:13 +12:00
Dylan Wagstaff fad86bd93c
Merge pull request #206 from xini/fix-page-history
fix page history: remove DMSSiteTreeExtension.getDocumentSets()
2018-04-11 12:53:24 +12:00
Florian Thoma 1c226239f4 re-introduce getDocumentSets() as deprecated method to allow patch release 2018-04-11 10:34:52 +10:00
Florian Thoma 86e01cb6d1 fix template and tests 2018-03-01 12:31:44 +11:00
Florian Thoma 2c204bb0b6 remove DMSSiteTreeExtension.getDocumentSets() because it messes with the page history (readonly mode) 2018-03-01 12:15:44 +11:00
Robbie Averill eb96f4fd87 Merge branch '2.1' 2018-01-12 14:28:23 +13:00
Robbie Averill fb6bdf59c2
Merge pull request #205 from xini/patch-1
fix page edit link slug
2018-01-12 14:25:32 +13:00
Florian Thoma f36b439f8f fix page edit link slug 2018-01-12 13:48:14 +13:00
Robbie Averill b5f9602eb5 Merge branch '2.1' 2017-12-08 00:00:25 +13:00
Robbie Averill 35423c9aeb Merge remote-tracking branch 'origin/2.0' into 2.1 2017-12-07 23:59:44 +13:00
Robbie Averill 96bac3fdc9
Merge pull request #204 from creative-commoners/pulls/2.0/cast-number-as-int
FIX Cast shortcode document ID as int
2017-12-07 23:58:22 +13:00
Robbie Averill 046047e49f FIX Cast shortcode document ID as int 2017-12-07 16:41:52 +13:00
Robbie Averill ab9d361f98 Merge branch '2.1' 2017-12-07 15:46:32 +13:00
Robbie Averill b7a3a1df6e Merge branch '2.0' into 2.1 2017-12-07 15:45:42 +13:00
Damian Mooyman bcf2ac9757
Merge pull request #202 from creative-commoners/pulls/2.0/escape-file-execution
FIX Escape file path before loading file from filesystem
2017-12-07 14:59:36 +13:00
Robbie Averill 8efedf3158 FIX Escape file path before loading file from filesystem 2017-12-07 12:40:11 +13:00
Dylan Wagstaff 82a8a4b142
Merge pull request #201 from silverstripe/pulls/2.0/escape-panel-keys
FIX Ensure actions panel keys and values have possible HTML escaped
2017-12-06 14:01:31 +13:00
Dylan Wagstaff b7aaadf7bb
Merge pull request #200 from silverstripe/pulls/2.0/cast-dsid-as-ints
FIX Ensure document set IDs are cast to integers
2017-12-06 13:48:46 +13:00
Robbie Averill 0e84799f59
FIX Ensure actions panel keys and values have possible HTML escaped 2017-12-06 13:40:46 +13:00
Robbie Averill 854d1f9150
FIX Ensure document set IDs are cast to integers 2017-12-06 13:37:13 +13:00
Robbie Averill 1bceff58dd Merge branch '2.1' 2017-12-01 14:57:57 +13:00
Robbie Averill 99ee72e17f Merge branch '2.0' into 2.1 2017-12-01 14:55:41 +13:00
Robbie Averill eeca59f190 Remove obsolete branch alias 2017-12-01 14:54:14 +13:00
Robbie Averill 14b615f1e4
Merge pull request #199 from creative-commoners/pulls/2.1/rename-documentsets-tab-name
API Rename the DocumentSets tab name to remove spaces
2017-12-01 14:52:15 +13:00
Raissa North 0d27e614cd API Rename the DocumentSets tab name to remove spaces 2017-12-01 14:29:41 +13:00
Franco Springveldt 45092dfb16 FIX updated gridfieldextension version reference 2017-08-28 17:26:21 +12:00
Robbie Averill 2922e83dc1 Merge pull request #195 from qunabucom/master
Allow more sophisticated trackview as data extension
2017-08-16 22:20:32 +12:00
Mateusz Qunabu a61d294419 Allow more sophisticated trackview
adds `$this->extend('trackView');` into `trackView` function so developers can work on more sophisticated  track view of downloaded file, eg how had downloaded or when.
2017-08-16 11:23:59 +02:00
Robbie Averill ee9d2dfb58 Merge remote-tracking branch 'origin/2.0' 2017-08-07 14:21:11 +12:00
Franco Springveldt 16f0bef034 Merge pull request #194 from creative-commoners/pulls/2.0/fix-insert-document-toolbar
FIX Missing shortcode field and broken Javascript when inserting document
2017-08-07 13:34:21 +12:00
Robbie Averill 5efe1a4a87 FIX Add CSS bundle to link edit context document add form 2017-08-07 11:49:55 +12:00
Robbie Averill 6a67cddc38 FIX Missing shortcode field and broken Javascript when inserting document in TinyMCE 2017-08-07 11:21:35 +12:00