tonyair/silverstripe-dms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-dms synced 2024-10-22 14:05:56 +02:00
Code Issues Projects Releases Wiki Activity
259 Commits 18 Branches 23 Tags 2.2 MiB
0d9f011ea9
Commit Graph

259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Shkardoon
0d9f011ea9 Merge pull request #33 from ajshort/pull-1 
Extend content controller to make sure the correct stage is used.
 2013-10-03 22:11:13 -07:00
Andrew Short
63e0417363 Extend content controller to make sure the correct stage is used. 
The staging system is initialised inside ContentController::init(). As
the DMS serving bypassed this, the stage was not set correctly, meaning
permissions were not always correctly applied.
 2013-10-03 23:54:40 +10:00
Stephen Shkardoon
ef2f8d35a1 Merge pull request #32 from ss23/master 
Compatbility with master - allowed_actions private
 2013-10-02 23:32:52 -07:00
Stephen Shkardoon
075974edbb Compatbility with master - allowed_actions private 2013-10-03 19:29:21 +13:00
Stephen Shkardoon
5746922904 Merge pull request #31 from richardmward/patch-1 
FIX #29 - 'linkdocument' needed adding to allowed_actions
 2013-09-21 03:49:45 -07:00
richardmward
b74b4f2de1 FIX #29 - 'linkdocument' needed adding to allowed_actions 2013-09-21 11:42:21 +01:00
Stephen Shkardoon
0765b90da8 Merge pull request #28 from ss23/master 
FIX #25 - documentautocomplete need allowed_action
 2013-09-19 15:18:41 -07:00
Stephen Shkardoon
049a1c8d84 FIX #25 - documentautocomplete need allowed_action 2013-09-20 10:17:30 +12:00
Julian Seidenberg
c2639d86d1 Merge pull request #24 from ss23/master 
FIX Don't show the upload field when inappropriate
 2013-09-10 22:13:14 -07:00
Stephen Shkardoon
8d4b24b68d FIX Don't show the upload field when inappropriate 
This fix is quite ugly, but in theory, it's fine. By ugly,
  I mean the interface is kind of weird without it.
Because 3.1 allows uploading when a DataObject doesn't exist,
  we need to override the new defaults to not allow such if
  the DO isn't saved yet.
 2013-09-10 21:03:42 +12:00
Stephen Shkardoon
f678b74fc3 Merge pull request #23 from ss23/master 
3.1 compat -- Add action to allowed_actions
 2013-09-10 02:03:33 -07:00
Stephen Shkardoon
144043c437 3.1 compat -- Add action to allowed_actions 2013-09-10 20:59:59 +12:00
Stephen Shkardoon
45849c5833 Merge pull request #22 from ss23/allowed_actions-3.1 
Add allowed_actions to make it work for 3.1
 2013-08-28 19:55:16 -07:00
Stephen Shkardoon
cb96c474da Add allowed_actions to make it work for 3.1 2013-08-29 14:50:43 +12:00
Stephen Shkardoon
5d3f232d58 Merge pull request #21 from ss23/fix-14 
Fix #14 - Shortcode download link fixed
 2013-08-28 18:07:58 -07:00
Stephen Shkardoon
6d0af08f1a Fix #14 - Shortcode download link fixed 2013-08-29 13:05:51 +12:00
Ingo Schommer
75899876d2 3.1 compat (controller code) 2013-08-22 17:21:55 +02:00
Ingo Schommer
e61a1d66d4 Merge pull request #20 from ss23/fix-master-deprecation 
Fix deprecation warnings for master
 2013-08-22 08:02:36 -07:00
Stephen Shkardoon
aa190ea7a5 Fix deprecation warnings for master 2013-08-22 23:50:14 +12:00
Ingo Schommer
c4586c7404 Remove 3.0 builds from DMS master, no longer supported 2013-08-14 12:16:08 +02:00
Ingo Schommer
1c4b309018 Fixed composer constraint to allow for RC releases (composer fixed its tilde behaviour now) 2013-08-14 11:59:42 +02:00
Stephen Shkardoon
e2994833d2 Update composer.json to indicate 3.1 compat 2013-07-10 15:00:53 +12:00
Ingo Schommer
0c39cda95b Transifex translation support 2013-07-08 12:53:17 +02:00
Julian Seidenberg
028d17de57 Merge pull request #18 from normann/master 
solving Issue #17
 2013-06-25 15:19:30 -07:00
Normann Lou
ea7b2c0471 BUG add $allowed_actions for both DMSDocumentAddController and DMSUploadField 2013-06-26 04:57:36 +12:00
Cam Findlay
da7e1ccc34 FIX display the date and time fields for embargo and expires. 2013-05-09 10:19:30 +12:00
Julian Seidenberg
6ecfa61ca1 BUG removing content method again, since it doesn't work reliably 2013-05-01 17:48:53 +12:00
Julian Seidenberg
f02303793d BUG moving new getContent method into DataObject, not Controller 2013-04-30 18:14:13 +12:00
Julian Seidenberg
687b4f5f97 NEW adding content method for compatibility with TextExtraction module 2013-04-30 18:07:57 +12:00
Cam Findlay
5bf804c1af FIX the autocomplete for adding a document to a page that already exists in the DMS. 2013-04-18 13:38:29 +12:00
Cam Findlay
3276320234 Added CRUD settings to allow non-admin CMS users to use parts of the dmx module. 2013-04-18 13:02:32 +12:00
Ryan O'Hara
2c96aada8a Change to use loop in templates instead of control 2013-04-16 10:00:42 +12:00
Cam Findlay
1b6c76b405 Further updates for 3.1 compatibility. 2013-04-15 14:03:58 +12:00
Ingo Schommer
cad9042d5f Simplified travis support (using external scripts) 
Also testing the 3.1 release
 2013-03-29 10:07:05 +01:00
Julian Seidenberg
bde2880812 Merge pull request #12 from adrexia/html 
BUG: malformed html causing rendering issues in IE8
 2013-03-19 17:28:06 -07:00
Naomi Guyer
aefb78da8b BUG: malformed html causing rendering issues in IE8 2013-03-20 13:23:47 +13:00
Ingo Schommer
f7e4e279ee More DB quoting 2013-03-11 15:32:51 +01:00
Ingo Schommer
ebcd6caa26 Fixed DB quoting (mainly for non-MySQL compat) 2013-03-11 15:20:55 +01:00
Ingo Schommer
38c99fc66b Added cms dependency to travis scripts 2013-03-11 14:31:20 +01:00
Ingo Schommer
437e6a4326 Exclude travis from manifest 2013-03-11 13:46:38 +01:00
Ingo Schommer
6b9ffa39d3 Travis support 2013-03-11 01:44:45 +01:00
Julian Seidenberg
e4ea9a8a0f Merge pull request #11 from ryanwachtl/patch-1 
BUG getList() now returns the filtered DataList
 2013-03-10 14:40:53 -07:00
Ryan Wachtl
9802e05a13 BUG getList() now returns the filtered DataList 
In SilverStripe 3.1.x getList() was returning the unfiltered DataList and as a result all pages in the SiteTree were showing as having a reference to the given document.
 2013-03-08 21:27:18 -06:00
Julian Seidenberg
ca9c84240a Merge pull request #10 from ARNHOE/patch-1 
added nl.yml language
 2013-01-29 13:17:34 -08:00
ARNHOE
a64f0d1e4c added nl.yml language 2013-01-29 03:11:47 -08:00
Ingo Schommer
d95af01fbb Delete fixtures BEFORE test teardown, avoid problems with shutdown registrations 
We've had some custom code register shutdown methods for reindexing.
This code is triggered on delete() amongst other actions.
It's conditional on SapphireTest::is_running_tests() which is
unset in SapphireTest->tearDown(), so we have to place any
delete operations before that.
 2013-01-09 23:54:35 +01:00
Ingo Schommer
5e6b77a0a9 BUGFIX Using toMap() in create_version() to avoid DataObject::__construct() failures 2013-01-08 13:22:25 +01:00
Ingo Schommer
5d3f06b69a Force versioning on in tests 2013-01-07 17:38:14 +01:00
Ingo Schommer
6b7ee0623a Only return DMSDocument->FullPath() when filename exists 
Fixes a regression introduced with 18c2081b when uploading new files
 2013-01-07 17:31:04 +01:00
Ingo Schommer
597e393630 BUG DMSUploadField JS template usage 
Instead of relying on JavaScript requirements blocking,
configure a more specific template name to use
in certain situations. We can't control JS files
loaded by the browser already by previous requests,
so Requirements blocking does not override the
template in all cases, creating execution-path specific
edge cases (like showing "save to refresh" messages
in the background of a "add document" upload success)
 2013-01-07 10:11:55 +13:00