Commit Graph

  • 1987659496 Merge pull request #556 from MorganDawe/7.x-WRLC-mimework Adam 2014-10-03 15:47:31 -0300
  • 4d9a1ce26e added mop back to mimedetect. #556 MorganDawe 2014-10-03 14:14:22 -0300
  • 10cb2c3dfb Merge branch '7.x' of github.com:Islandora/islandora into 7.x MorganDawe 2014-10-03 13:59:29 -0300
  • f548041cf7 Updated mimetype mappings. MorganDawe 2014-10-03 13:59:12 -0300
  • bdd94f9b0e Merge pull request #554 from jordandukart/7.x-1.4 7.x-1.4 7.x-1.4 Nick Ruest 2014-10-03 04:56:57 -0400
  • 35e965c7b8 datastream entity #555 willtp87 2014-10-02 16:11:29 -0300
  • 6185f97c85 Merge pull request #553 from jordandukart/7.x Adam 2014-10-02 15:02:54 -0300
  • 03d16c036a Fix the invalid markup generated by the printer icon. #554 Jordan Dukart 2014-10-02 14:57:19 -0300
  • d2a86da545 Fix the invalid markup generated by the printer icon. #553 Jordan Dukart 2014-10-02 14:56:40 -0300
  • 554ca427dd Merge pull request #552 from matthewperry/7.x-METRO-77 Daniel Lamb 2014-10-02 13:38:02 -0300
  • 3f9ed4cf46 Fixing spelling mistake in ingest message: notifiy changed to notify. #552 Matthew Perry 2014-10-02 10:52:37 -0300
  • e4e0b1b7a9 Version bump for 7.x-1.4 nruest 2014-10-02 04:20:09 -0400
  • 7e88052a22 Merge pull request #551 from willtp87/7.x-1.4 Jordan Dukart 2014-09-29 12:41:19 -0300
  • cd0a9ec255 Merge pull request #550 from willtp87/7.x Jordan Dukart 2014-09-29 12:41:14 -0300
  • 3d33e5b6d3 potx no longer having recomended dl #551 willtp87 2014-09-29 11:15:31 -0300
  • d275eb43a4 potx no longer having recomended dl #550 willtp87 2014-09-29 11:15:31 -0300
  • 0bc26560fb let's just do this right qadan 2014-09-26 09:56:59 -0300
  • e6eb5d93f2 doing this the less stupid way qadan 2014-09-25 14:58:17 -0300
  • b29a66d990 oh qadan you goof qadan 2014-09-25 12:42:23 -0300
  • bf3aae3499 Merge branch '7.x-filter_drupal_is_writeable' of https://github.com/qadan/islandora into 7.x-filter_drupal_is_writeable qadan 2014-09-25 12:10:17 -0300
  • 79f9cc9f96 simple at-a-glance verification of drupal filter writability qadan 2014-09-25 12:09:34 -0300
  • 6f49962b5e Merge pull request #8 from Islandora/7.x Daniel Aitken 2014-09-25 11:26:41 -0300
  • 9a2ac4c7a1 Remove ternary. #548 nruest 2014-09-15 12:36:06 -0400
  • 83f24859ad Re-remove islandora_ingest_form_prepare_new_object && call to it in function islandora_ingest_form. nruest 2014-09-15 11:50:16 -0400
  • a7c5a35166 Merge pull request #547 from ajstanley/EMiC-210 7.x-1.4-RC1 William Panting 2014-09-15 11:18:53 -0300
  • d47e777add removed unused variable, added default #547 Alan Stanley 2014-09-15 10:42:11 -0300
  • 690fb4c70e Put function islandora_ingest_form_prepare_new_object back in. nruest 2014-09-15 08:17:50 -0400
  • 9b49ec7bbf allwed for existing non-standard mimetype Alan Stanley 2014-09-12 10:28:41 -0300
  • cc49c28ddd coder Alan Stanley 2014-09-12 10:10:00 -0300
  • 3253323765 updated mimetype selection Alan Stanley 2014-09-12 09:42:26 -0300
  • b7d20be402 updated mimetype selection Alan Stanley 2014-09-12 09:39:03 -0300
  • dcc81b1fcd added islandora xml default for datastrram replacement Alan Stanley 2014-09-11 11:26:32 -0300
  • 3764973b65 Merge branch '7.x' of github.com:Islandora/islandora into 7.x Alan Stanley 2014-09-11 10:22:49 -0300
  • e97086584d Merge pull request #466 from whikloj/patch-2 Nick Ruest 2014-09-10 13:59:24 -0400
  • 8e67a4932d Merge pull request #546 from lutaylor/7.x Adam 2014-09-05 15:54:29 -0300
  • 087db8b3b0 adding reliable install source #546 lutaylor 2014-09-05 15:06:35 -0300
  • efd7cc73c2 ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE! nruest 2014-09-05 12:13:22 -0400
  • f4f32a72a7 Merge pull request #537 from willtp87/7.x.dd Adam 2014-09-05 10:38:04 -0300
  • 7bba93d92b typo fix #537 willtp87 2014-09-04 10:29:09 -0300
  • 9920669f4f Merge pull request #543 from MorganDawe/7.x-EMIC-210 ajstanley 2014-09-03 16:25:23 -0300
  • 95ca398d11 resolved conflict Alan Stanley 2014-09-03 16:17:48 -0300
  • c41e9ce903 Merge 1e2e183602 into 367e5772db #544 Nelson Hart 2014-09-03 15:02:29 +0000
  • 1e2e183602 ignore cache when working with dsid checks #544 Nelson Hart 2014-09-03 08:51:12 -0600
  • 9e9e7808f9 code review changes Nelson Hart 2014-09-03 08:43:06 -0600
  • 8a117ac234 update api with new dsid param perm check Nelson Hart 2014-09-03 06:47:49 -0600
  • cf67d43c82 merge conflict Nelson Hart 2014-09-03 05:29:49 -0600
  • dc90891c18 code cleanup Nelson Hart 2014-09-03 05:26:21 -0600
  • 442bf160ef clean up Nelson Hart 2014-09-03 05:22:38 -0600
  • 9446b04e79 implement ds xacml checks Nelson Hart 2014-09-03 05:08:16 -0600
  • df6ae00376 Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x.dd willtp87 2014-09-02 17:25:09 -0300
  • d2ecd81ba8 Code review feedback. #543 MorganDawe 2014-09-02 16:19:42 -0300
  • 212276f6d0 Corrected small travis issue. MorganDawe 2014-08-29 08:55:21 -0300
  • 4311be0f0d removed unused code. MorganDawe 2014-08-28 15:36:49 -0300
  • 8efd0c23fc Updated file extension logic on ds download. MorganDawe 2014-08-28 15:34:22 -0300
  • 5110e52590 Merge pull request #542 from qadan/7.x-travis-logging Nick Ruest 2014-08-28 13:48:31 -0400
  • 5caf983df8 make the drush webserver logs go somewhere real #542 qadan 2014-08-28 13:41:52 -0300
  • fecafe19a8 Merge 27a23877a3 into 038b6d704c #518 qadan 2014-08-28 16:35:52 +0000
  • 27a23877a3 readme was lying #518 qadan 2014-08-28 13:35:40 -0300
  • 2b2c5c8601 Updating extestion and mime detection on download to use drupals file_g=default_mimetype_mapping() funcitons. MorganDawe 2014-08-27 16:43:53 -0300
  • e1cd3fa249 Merge 205cc1b878 into 038b6d704c #541 lutaylor 2014-08-27 17:29:36 +0000
  • 205cc1b878 adding reliable package source for travis #541 lutaylor 2014-08-27 14:23:25 -0300
  • 038b6d704c Merge pull request #540 from MorganDawe/7.x-EMIC-210 Jordan Dukart 2014-08-25 16:44:43 -0300
  • f1de655d9a Updated mime detect class. #540 MorganDawe 2014-08-25 16:25:08 -0300
  • 4dbf46adc9 Removed rng => application/xml mapping. MorganDawe 2014-08-25 15:23:49 -0300
  • 83a76787a9 Merge c6a043a428 into 4feca8bc7a #539 lutaylor 2014-08-25 16:17:18 +0000
  • 6288d49b5e Merge c6a043a428 into 4feca8bc7a #538 lutaylor 2014-08-25 14:29:06 +0000
  • c6a043a428 updating travis to use reliable install source #539 #538 lutaylor 2014-08-25 11:07:21 -0300
  • 4feca8bc7a Merge pull request #507 from qadan/7.x Jordan Dukart 2014-08-25 10:19:55 -0300
  • 25b53ba01b copypasta omm nom willtp87 2014-08-25 10:13:24 -0300
  • 42375fc595 Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x.dd willtp87 2014-08-21 15:44:30 -0300
  • 3850720e65 global defer derivatives setting willtp87 2014-08-21 15:30:42 -0300
  • 1dcee46574 Merge pull request #536 from adam-vessey/7.x-INT-372 Daniel Lamb 2014-08-21 14:37:37 -0300
  • 6b69518988 defer derivatives api willtp87 2014-08-21 13:27:39 -0300
  • 862bde2d64 Ermahgerd, lerns ter lerng. #536 Adam Vessey 2014-08-21 09:31:06 -0300
  • f49f709bad Recursive things are exclusively magical. Adam Vessey 2014-08-20 16:45:10 -0300
  • 798079f7eb Merge pull request #535 from MorganDawe/7.x.EMIC-130 Nigel Banks 2014-08-03 22:12:38 -0300
  • 80f076f385 Added application/rdf for file extension rng in mimedetect. #535 MorganDawe 2014-07-31 16:15:34 +0000
  • 349e2ca89e Merge pull request #534 from willtp87/7.x.github_hatest_rebaseing Nick Ruest 2014-07-28 16:57:10 -0400
  • 3b4b6bee01 Merge 5d1d9a8630 into edbeb19a39 #533 William Panting 2014-07-28 17:09:54 +0000
  • 5d1d9a8630 validator fix #534 #533 willtp87 2014-07-28 17:00:13 +0000
  • 075fa84871 Merge a0c668cfe6 into edbeb19a39 #532 William Panting 2014-07-28 17:06:52 +0000
  • a0c668cfe6 validator fix #532 willtp87 2014-07-28 17:00:13 +0000
  • 66f5f9c09f Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x.mimes vagrant 2014-07-28 16:42:58 +0000
  • edbeb19a39 Merge pull request #531 from ruebot/7.x Nigel Banks 2014-07-28 09:35:45 -0300
  • 329e4059f0 Merge pull request #530 from willtp87/7.x.travis qadan 2014-07-24 11:12:46 -0300
  • 369a997123 Add travis #islandora irc notifications #531 nruest 2014-07-22 19:53:05 -0400
  • e65bddc8dc php 5.5 in test matrix #530 willtp87 2014-07-19 15:51:01 +0000
  • 312f3b1ade php 5.5 vagrant 2014-07-19 15:43:34 +0000
  • b96b7fab0a Merge pull request #529 from jordandukart/7.x-METRO-53 Morgan Dawe 2014-07-18 09:05:43 -0300
  • 6ca6dc4c06 Make sure our attribute doesn't break markup. #529 Jordan Dukart 2014-07-18 11:55:44 +0000
  • 40fb47f710 Merge branch '7.x' of github.com:Islandora/islandora into 7.x-METRO-53 Jordan Dukart 2014-07-18 11:55:32 +0000
  • 0a6e8300c1 static context non-static statics contexts pfft #507 qadan 2014-07-16 14:54:05 -0300
  • f0a49fd44e code review changes qadan 2014-07-16 12:43:29 -0300
  • f1d6100d14 Merge pull request #527 from jordandukart/7.x-METRO-53 Adam 2014-07-15 10:40:31 -0300
  • 05d2ccd3f8 Merge pull request #528 from willtp87/7.x.iec Jordan Dukart 2014-07-14 13:10:57 -0300
  • 29b32e2c07 not lying about units #528 willtp87 2014-07-14 13:32:32 +0000
  • d964ea2042 Appease the Travis gods after a merge conflict fail. #527 Jordan Dukart 2014-07-10 18:06:59 +0000
  • b7b4717e49 Unused var. Jordan Dukart 2014-07-10 17:24:14 +0000
  • b602213c20 Merge branch '7.x-METRO-53' of github.com:jordandukart/islandora into 7.x-METRO-53 Jordan Dukart 2014-07-10 17:22:36 +0000
  • 5658f0d06a Merge pull request #526 from jordandukart/7.x-FLVC-64 Adam 2014-07-09 16:35:10 -0300