Commit Graph

268 Commits

Author SHA1 Message Date
Dylan Wagstaff
86bc9ec509 Merge up 2.1 into master 2018-04-11 14:08:13 +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
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
Florian Thoma
f36b439f8f fix page edit link slug 2018-01-12 13:48:14 +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
046047e49f FIX Cast shortcode document ID as int 2017-12-07 16:41:52 +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
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
Raissa North
0d27e614cd API Rename the DocumentSets tab name to remove spaces 2017-12-01 14:29:41 +13: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
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
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
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
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
Robbie Averill
a76b1d0256 FIX Remove customised delete confirmation message, it taints the global scope 2017-06-13 15:21:22 +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
Sacha Judd
c10109b49b FIX Re-add i18n Javascript in documents modeladmin 2017-06-12 16:24:23 +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
Robbie Averill
14071eee3c API Rename DMSDocument::getFileName to getFilename 2017-06-08 09:54:44 +12:00
Daniel Hensby
bacc3db4ef Merge pull request #163 from creative-commoners/pulls/2.0/add-more-tests
Add some more tests
2017-06-07 21:39:18 +01:00
Robbie Averill
4c3206e200 Add tests for the document autocompleter and conditions in getter for page and document set 2017-06-07 17:00:25 +12:00
Robbie Averill
832eb14fad Add tests for returning link with content in shortcode handler and error handling 2017-06-07 16:29:19 +12:00
Franco Springveldt
ce37b81c2b NEW pages link to document sets 2017-06-07 15:54:10 +12:00
Franco Springveldt
5824c1b0eb NEW info notices added to QueryBuilder 2017-06-07 10:30:44 +12:00
sachajudd
5bea2fb5f1 Merge pull request #160 from creative-commoners/pulls/2.0/friendly-direction-labels
FIX Add friendly labels for ASC and DESC in query builder. Remove extension point in addQueryFields.
2017-06-07 09:36:40 +12:00
Robbie Averill
f296c89dc0 FIX Add friendly labels for ASC and DESC in query builder. Remove extension point in addQueryFields.
Use updateCMSFields instead
2017-06-06 16:53:52 +12:00
sachajudd
84c7233b79 Merge pull request #159 from creative-commoners/pulls/2.0/fix-orderable-documents
FIX Ensure documents are drag-and-drop reorderable in document sets
2017-06-06 16:47:03 +12:00
sachajudd
8208822400 Merge pull request #149 from creative-commoners/pulls/2.0/add-existing-doc-sets
NEW Allow existing document sets to be linked to pages
2017-06-06 16:18:47 +12:00
Robbie Averill
58ac37a1e8 FIX Ensure documents are drag-and-drop reorderable in document sets 2017-06-06 16:14:14 +12:00
Robbie Averill
8a7fe273a6 NEW Allow existing document sets to be linked to pages 2017-06-06 16:03:52 +12:00
Robbie Averill
7fb2662958 FIX Remove "Page" literal field when editing a doc set in a page context. Simplify exception test. 2017-06-06 12:08:06 +12:00
Robbie Averill
d8f3685601 Merge pull request #145 from creative-commoners/pulls/2.0/add-set-button
FIX Add 'add document set' button and update label for Page
2017-06-06 11:05:08 +12:00
Sacha Judd
cbd3a65fa9 FIX Add 'add document set' button and update label for Page 2017-06-03 08:24:14 +12:00
Franco Springveldt
3d19b9fc75 FIX title validation on DMSDocumentSet 2017-06-02 16:05:10 +12:00
Franco Springveldt
886fd217f2 Merge pull request #141 from creative-commoners/pulls/2.0/doc-sets-modeladmin
NEW Add ModelAdmin interface for managing DMSDocumentSets
2017-05-31 10:34:32 +12:00
Sacha Judd
aedc970cf4 NEW Reorder summary fields and make getFieldsForFile extensible 2017-05-30 13:51:56 +12:00
Robbie Averill
cbc53fd7d2 NEW Add ModelAdmin interface for managing DMSDocumentSets 2017-05-29 10:15:21 +12:00
sachajudd
11819a1e16 Merge pull request #140 from creative-commoners/pulls/2.0/rename-json-field
FIX Rename JsonField to DMSJsonField to add a pseudo-namespace
2017-05-24 15:38:34 +12:00
Robbie Averill
0ffd4d8584 FIX Rename JsonField to DMSJsonField to add a pseudo-namespace 2017-05-24 14:29:51 +12:00
Robbie Averill
80e36c3350 NEW Add friendly URL segments for DMS documents 2017-05-24 11:43:23 +12:00
Robbie Averill
9b42effeb5 FIX Refactor SCSS, convert to more BEM-like names, add admin icon
* Remove "small" class from inline edit form for documents
* Swap relationeditor GridFieldConfig for record editor to ensure that document sets can be deleted from a page context rather than unlinked (natively)
* Fix to ensure that related documents can be autocompleted via partial matching on filename
* Add 2 space indentation rule to editorconfig for .js and .scss files
2017-05-22 15:20:16 +12:00
Robbie Averill
489a62abb2 API Remove DMSGridFieldDeleteAction, add query builder filter for taxonomy terms 2017-05-18 17:30:25 +12:00
Robbie Averill
17d97d65ce API Remove DMSTag, replace with optional extension for taxonomy module 2017-05-18 17:30:24 +12:00