Commit Graph

484 Commits

Author SHA1 Message Date
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
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
Franco Springveldt 45092dfb16 FIX updated gridfieldextension version reference 2017-08-28 17:26:21 +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
Robbie Averill 77f137fcda Use precise distro to include PHP 5.3 2017-07-31 22:16:47 +12:00
Robbie Averill 6c5e70dc33 Merge pull request #191 from xini/patch-1
add dmsassets folder to file system sync exclusion, fixes #190
2017-07-31 22:02:23 +12:00
Robbie Averill b9b7be0417 Add test for exclusion of DMS folder name from Filesystem sync 2017-07-31 21:35:46 +12:00
Florian Thoma 9b31a7071f change folder extraction 2017-07-31 19:22:19 +10:00
Florian Thoma f41375e608 add dmsassets folder to file system sync exclusion, fixes #190 2017-07-31 18:14:04 +10:00
Franco Springveldt 1fd287b264 Merge pull request #189 from creative-commoners/pulls/2.0/fix-injectable-dmsuploadfield
FIX Ensure DMSUploadField called via injection is returned correctly
2017-07-27 14:11:08 +12:00
Robbie Averill d38e493925 Merge pull request #188 from xini/symbiote-change
update dependencies SSAU/symbiote
2017-07-27 14:04:54 +12:00
Robbie Averill ac5a01614b FIX Ensure DMSUploadField called via injection is returned correctly
Fixes an incompatibility with SelectUploadField in CWP
2017-07-27 13:36:50 +12:00
Florian Thoma 0338425cbc update dependencies SSAU/symbiote 2017-07-27 11:16:19 +10:00
sachajudd 9d117d6f49 Merge pull request #184 from creative-commoners/pulls/2.0/bug-can-edit-permissions-fix
FIX Removed duplicate permission check + removed SITETREEE_VIEW_ALL
2017-06-29 17:44:26 +12:00
Franco Springveldt e2eead8888 FIX Removed duplicate permission check + SITETREEE_VIEW_ALL permission from DMSDocument::canEdit 2017-06-29 17:30:45 +12:00
Robbie Averill a5ffec88bd Remove obsolete branch alias 2017-06-28 12:22:41 +12:00
Robbie Averill 1e8ac1fee8 Require stable taxonomy version 2017-06-28 10:09:21 +12:00
Daniel Hensby 6db701104c Merge pull request #182 from creative-commoners/pulls/2.0/fix-italics-for-userguide
DOCS Fix broken markdown italics for the userhelp guide
2017-06-20 15:19:33 +01:00
Daniel Hensby b4e5c29a04 Merge pull request #181 from silverstripe/pulls/2.0/userguide-reference
DOCS Add reference to userguide in main docs index
2017-06-20 15:19:06 +01:00
Sacha Judd 54b9b0b8ea DOCS Fix broken markdown italics for the userhelp guide 2017-06-20 16:42:34 +12:00
Robbie Averill 0d1e57eec6 DOCS Add reference to userguide in main docs index 2017-06-20 16:25:44 +12:00
Robbie Averill e5c7d1aa9a Merge pull request #180 from creative-commoners/pulls/2.0/add-userguide
DOCS Add userguide for DMS 2.0
2017-06-20 09:24:57 +12:00
Sacha Judd 8518739a13 DOCS Add userguide for DMS 2.0 2017-06-19 16:07:31 +12:00
Daniel Hensby d001a9a780 Merge pull request #179 from creative-commoners/pulls/2.0/fix-multi-version-edit-link
FIX Remove fragile logic looking for page edit link between SS versions
2017-06-15 14:09:25 +01:00
Robbie Averill 4ba3e3fa60 FIX Remove fragile logic looking for page edit link between SS versions 2017-06-15 14:31:10 +12:00
Franco Springveldt 4bdeb980d9 Merge pull request #177 from creative-commoners/pulls/2.0/fix-page-association-in-addcontroller
FIX Get page ID from document set and include it in $NewLink for add document buttons
2017-06-14 16:14:40 +12:00
Robbie Averill 9d5e028d10 FIX Ensure that redirection back to pages works for SS 3.6 2017-06-14 15:53:37 +12:00
Robbie Averill d57fc88bfa Merge pull request #168 from creative-commoners/issue/150
FIX document and documentset permissions
2017-06-14 11:59:17 +12:00
Franco Springveldt 79da01513e FIX document and documentset permissions 2017-06-14 11:18:09 +12:00
Robbie Averill d0c2558a1f FIX Get page ID from document set and include it in $NewLink for add document buttons
This helps the module to determine where to return a user to after they've uploaded a file, e.g. either back to a document set in a page context, back to a document set in the ModelAdmin context or back to the ModelAdmin for documents with no context.
2017-06-14 10:57:00 +12:00
sachajudd 4d83b95040 Merge pull request #176 from creative-commoners/pulls/2.0/remove-confirmation-message-on-delete
FIX Remove customised delete confirmation message, it taints the global scope
2017-06-13 16:02:35 +12:00
Robbie Averill a76b1d0256 FIX Remove customised delete confirmation message, it taints the global scope 2017-06-13 15:21:22 +12:00
sachajudd ed32ce949e Merge pull request #174 from creative-commoners/pulls/2.0/add-document-backlink
FIX Redirect back to documents tab after uploading a document
2017-06-13 11:33:53 +12:00
Robbie Averill 1f7b17a2d3 FIX Redirect back to documents tab after uploading a document
Unless you are within a document set or page context
2017-06-13 10:56:26 +12:00
sachajudd 98c20aa4dd Merge pull request #173 from creative-commoners/pulls/2.0/switch-coverage-version
Increase max allowed packets in mysql, add build for SS 3.6 explicitly
2017-06-13 10:56:12 +12:00
Robbie Averill e85e13123e Merge pull request #171 from creative-commoners/pulls/2.0/add-i18n-js-back
FIX Re-add i18n Javascript in documents modeladmin
2017-06-13 09:24:48 +12:00
Robbie Averill 72873608c4 Increase max allowed packets in mysql, add build for SS 3.6 explicitly 2017-06-12 18:50:24 +12:00
Sacha Judd c10109b49b FIX Re-add i18n Javascript in documents modeladmin 2017-06-12 16:24:23 +12:00
sachajudd b0de8b33e5 Merge pull request #167 from creative-commoners/pulls/2.0/fix-backlink-for-documentadmin
FIX Backlink for upload form redirects to document admin if no page is available
2017-06-08 13:43:37 +12:00
Robbie Averill 772198a7fc FIX Backlink for upload form redirects to document admin if no page is available 2017-06-08 12:26:53 +12:00
sachajudd c0dee2f1e5 Merge pull request #165 from creative-commoners/pulls/2.0/rename-getfilename
API Rename DMSDocument::getFileName to getFilename
2017-06-08 10:22:11 +12:00
Robbie Averill 14071eee3c API Rename DMSDocument::getFileName to getFilename 2017-06-08 09:54:44 +12:00