qadan
|
22c5ad410d
|
conflict resolution
|
11 years ago |
|
qadan
|
9a999b15ac
|
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
|
11 years ago |
|
qadan
|
fc357e6f7d
|
last bit of bugfixes and cleanup
|
11 years ago |
|
qadan
|
8b11d4a051
|
erm, forgot one
|
11 years ago |
|
qadan
|
a13fa13451
|
accept objects with/without wrapper
|
11 years ago |
|
qadan
|
83960d6f02
|
better error handling
|
11 years ago |
|
Nick Ruest
|
3e0fc461d9
|
Merge pull request #509 from willtp87/7.x
less batches
|
11 years ago |
|
willtp87
|
69188416bd
|
less batches
|
11 years ago |
|
Adam Vessey
|
07d082dc76
|
Fix error due to incorrect include.
|
11 years ago |
|
Jordan Dukart
|
1efecd4dfb
|
Merge pull request #508 from adam-vessey/7.x-fix-jpeg-mime
Correct recently broken MIME-type.
|
11 years ago |
|
Adam Vessey
|
8b3d781b3b
|
Correct recently broken MIME-type.
|
11 years ago |
|
Nick Ruest
|
d619fdb6bb
|
Merge pull request #502 from MorganDawe/7.x.cwrcps-9
7.x.cwrcps 9
|
11 years ago |
|
qadan
|
23e8201afe
|
er, add the includes too
|
11 years ago |
|
vagrant
|
ecdc28d619
|
splitting out web test case and unit test case
|
11 years ago |
|
qadan
|
8431310f8f
|
Merge pull request #6 from Islandora/7.x
update 7.x
|
11 years ago |
|
Jordan Dukart
|
451764f4f6
|
Merge pull request #505 from MorganDawe/7.x.chemical_mimetypes
7.x.chemical mimetypes
|
11 years ago |
|
Jordan Dukart
|
b9bbc1a66c
|
Merge pull request #506 from willtp87/7.x.post-release
removing deprecated constants
|
11 years ago |
|
William Panting
|
cd32d05866
|
Merge pull request #476 from MorganDawe/7.x.int196
7.x.int196
|
11 years ago |
|
willtp87
|
5e4388d7b5
|
removing deprecated constants
|
11 years ago |
|
MorganDawe
|
94d517fcf6
|
Coder
|
11 years ago |
|
MorganDawe
|
1ff1b45dec
|
Added Chemical MimeTypes to MimeDetect class.
|
11 years ago |
|
Adam
|
ce6aa90c4f
|
Merge pull request #504 from jordandukart/7.x-filter-name
Return a key for the filter, coding standards.
|
11 years ago |
|
Jordan Dukart
|
24cc6e667d
|
Return a key for the filter, coding standards.
|
11 years ago |
|
William Panting
|
ca96007be7
|
Merge pull request #503 from ruebot/7.x-ISLANDORA-955
7.x-ISLANDORA-955
|
11 years ago |
|
nruest
|
2f0481e94e
|
7.x-ISLANDORA-955
|
11 years ago |
|
MorganDawe
|
794a61d6d2
|
Removed merge statements from info.
|
11 years ago |
|
MorganDawe
|
d466bb054a
|
Added two spaces to comply with coding standards.
|
11 years ago |
|
MorganDawe
|
18badb7999
|
Removed debug statement.
|
11 years ago |
|
MorganDawe
|
9c50193483
|
Updated the mimedetect and added a helper function to process dsids that are not in an objects content model, such as user added.
|
11 years ago |
|
William Panting
|
5f8367badb
|
Merge pull request #499 from MorganDawe/7.x.cwrcps-9
7.x.cwrcps 9
|
11 years ago |
|
Morgan Dawe
|
f2dd480894
|
Merge pull request #2 from willtp87/7.x.cwrcps-9
no need for ds label
|
11 years ago |
|
willtp87
|
e4be61cf55
|
no need for ds label
|
11 years ago |
|
qadan
|
07e8a80ae1
|
Merge pull request #501 from willtp87/7.x
double check 7.28 suspicions
|
11 years ago |
|
willtp87
|
42e80a3b68
|
explaining tests
|
11 years ago |
|
MorganDawe
|
2be0fd0567
|
Fixed sizeof, changed to count.
|
11 years ago |
|
willtp87
|
6aa4b8006d
|
double check 7.28 suspicions
|
11 years ago |
|
qadan
|
2e3b70ffad
|
Merge pull request #500 from willtp87/7.x
New drupal busting batch tests
|
11 years ago |
|
willtp87
|
3b356694bd
|
explanation
|
11 years ago |
|
willtp87
|
b1e7412f77
|
New drupal busting batch tests
|
11 years ago |
|
MorganDawe
|
03f16d85f2
|
Updated permission description
|
11 years ago |
|
MorganDawe
|
af8dcd01ae
|
Code review feedback.
|
11 years ago |
|
MorganDawe
|
82c863c321
|
Deleting variable in uninstall hook.
|
11 years ago |
|
MorganDawe
|
a98ea9dfa7
|
code review feedback.
|
11 years ago |
|
MorganDawe
|
f571de64d0
|
updated permission name.
|
11 years ago |
|
MorganDawe
|
c19bb4b3d2
|
Updated settings logic.
|
11 years ago |
|
MorganDawe
|
a9e838d7ea
|
Added excludable dsid setting in configuration page.
|
11 years ago |
|
MorganDawe
|
9fcfc5882b
|
Added ability to add to the tip of a datastreams latest version
|
11 years ago |
|
Jordan Dukart
|
a9d396a767
|
Merge pull request #498 from willtp87/7.x.travis
trying rm in sh
|
11 years ago |
|
willtp87
|
1c1f3fad62
|
telling travis trouble tales
|
11 years ago |
|
willtp87
|
44b8d9ed21
|
trying rm in sh
|
11 years ago |
