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
Robbie Averill
77f137fcda
Use precise distro to include PHP 5.3
2017-07-31 22:16:47 +12:00
Robbie Averill
b2c16477d1
Use precise distro to include PHP 5.3
2017-07-31 22:16:12 +12:00
Robbie Averill
97d55603d6
Merge remote-tracking branch 'origin/2.0'
2017-07-31 22:04:36 +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
Robbie Averill
f9f56b0ef2
Merge remote-tracking branch 'origin/2.0'
2017-07-27 14:19:32 +12: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
Robbie Averill
06692ee4ae
Merge remote-tracking branch 'origin/2.0'
2017-06-29 17:47:49 +12: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
31b3fff74e
Update branch alias for 2.1.x-dev
2017-06-28 12:21:08 +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
