Commit Graph

542 Commits

Author SHA1 Message Date
dependabot[bot]
4a11c7c0c7
Merge pull request #227 from silverstripe/dependabot/npm_and_yarn/lodash-4.17.19 2020-07-21 20:23:25 +00:00
dependabot[bot]
f3c1614aea
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-18 23:26:09 +00:00
Aaron Carlino
42540b6a10
META: Add github action to build docs 2019-12-19 13:56:43 +13:00
Aaron Carlino
85dce59716
Merge pull request #226 from silverstripe/pulls/master/new-docs
Update userguide for compliance with new docs site
2019-12-19 12:49:04 +13:00
Steve Boyd
9f23ed4769 Merge branch '2.2' 2019-12-16 15:07:03 +13:00
Steve Boyd
3b21e4cf88 Merge branch '2.1' into 2.2 2019-12-16 15:05:00 +13:00
Serge Latyntsev
37c79d257a
Merge pull request #225 from creative-commoners/pulls/2.1/update-unit-test-date
Change date on unit test - 2.1
2019-12-16 14:57:40 +13:00
Serge Latyntsev
6c1fcf6266
Merge pull request #223 from creative-commoners/pulls/master/update-travis
Fix travis build
2019-12-16 14:55:53 +13:00
Serge Latyntcev
402dc77ed6 Require spyc 0.6.2 or less (0.6.3 requires at least php 5.6) 2019-12-16 12:04:38 +13:00
Steve Boyd
209737c4b6 Change date on unit test 2019-12-16 11:50:40 +13:00
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
Aaron Carlino
9cf74f57c2 Update userguide for compliance with new docs site 2019-12-06 14:47:40 +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
Robbie Averill
63b6fa567a
Merge pull request #216 from dnadesign/2.1
FIX: Ensure Version gridfield has correct field formatting and variables
2018-08-21 09:47:32 +12:00
James Ayers
42275f5d13 FIX: Escape double quotes so Field can be safely eval()’d 2018-08-20 20:23:14 +12: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
Robbie Averill
eb85a86296
Merge pull request #207 from silverstripe/revert-206-fix-page-history
Revert "fix page history: remove DMSSiteTreeExtension.getDocumentSets()"
2018-04-11 14:16:13 +12:00
Dylan Wagstaff
95d37b282d
Revert "fix page history: remove DMSSiteTreeExtension.getDocumentSets()" 2018-04-11 14:10:55 +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