 Lacey Sanderson
|
c197792a9c
Small fix to class for compatibility with lower versions of PHP.
|
6 years ago |
|
Lacey Sanderson
|
8b0de45b08
Merge branch '7.x-3.x' into 491-Tv3-renamed_ws_content_types
|
6 years ago |
 Lacey-Anne Sanderson
|
fefa46a68b
Merge pull request #622 from tripal/620-tv3-performance_views_clear
|
6 years ago |
 Abdullah Almsaeed
|
e833e2a592
Fix undefined property bundle error
|
6 years ago |
 Stephen Ficklin
|
a8f5cc497c
Fixed type for content types in prop tables, and added back in missing update function that somehow got lost on merge conflicts
|
6 years ago |
 Bradford Condon
|
8c4e57c0f0
Merge pull request #616 from tripal/427-Tv3-prop_content_types
|
6 years ago |
 Lacey Sanderson
|
2985c316fa
Chado Field getValueList: fixes from review :-)
|
6 years ago |
|
Stephen Ficklin
|
c529bacba2
Fixed bad arg to db_query
|
6 years ago |
|
Stephen Ficklin
|
d3637ed73e
Merge branch '7.x-3.x' into 620-tv3-performance_views_clear
|
6 years ago |
|
Stephen Ficklin
|
2ba6c53752
Fixed merge conflicts
|
6 years ago |
|
Stephen Ficklin
|
40559c69cc
Merge branch '7.x-3.x' into 427-Tv3-prop_content_types
|
6 years ago |
|
Stephen Ficklin
|
ac6aa41527
Merge pull request #585 from tripal/465-tv3-pub_reporter
|
6 years ago |
|
Stephen Ficklin
|
1efcee443a
Fixed merge conflicts
|
6 years ago |
|
Stephen Ficklin
|
9f247c38fe
Merge branch '7.x-3.x' into 465-tv3-pub_reporter
|
6 years ago |
|
Bradford Condon
|
dbdfe0f3eb
Merge pull request #584 from tripal/577-tv3-pub_syncing
|
6 years ago |
|
Stephen Ficklin
|
496cb4e680
Improvements to performance for views integration of TripalFields
|
6 years ago |
|
Lacey Sanderson
|
41d5a3a3e8
Chado Field getValueList: added more tests.
|
6 years ago |
|
Stephen Ficklin
|
e1e7ec0c01
Fixed merged conflict
|
6 years ago |
|
Stephen Ficklin
|
06b1b61977
Merge branch '7.x-3.x' into 465-tv3-pub_reporter
|
6 years ago |
|
Stephen Ficklin
|
85fa3601e8
Merge pull request #579 from tripal/371-tv3-chado_bundle_type_id
|
6 years ago |
|
Stephen Ficklin
|
e77f6f0dba
Fixed job display issue
|
6 years ago |
|
Stephen Ficklin
|
030f828330
Fixed merge conflict, a bug preventing CI from working, and a bit of cleanup
|
6 years ago |
|
Stephen Ficklin
|
4f9db3475f
Copied fix from PR #611
|
6 years ago |
|
Stephen Ficklin
|
f0b866f8f3
Merge branch '7.x-3.x' into 465-tv3-pub_reporter
|
6 years ago |
|
Abdullah Almsaeed
|
536e84e889
Fix issue 618
|
6 years ago |
|
Stephen Ficklin
|
4229d8b98f
Fixed bugs from PR review
|
6 years ago |
|
Stephen Ficklin
|
a741fc318a
Merge branch '7.x-3.x' into 577-tv3-pub_syncing
|
6 years ago |
|
Stephen Ficklin
|
3977ae37b1
Merge branch '427-Tv3-prop_content_types' of github.com:tripal/tripal into 427-Tv3-prop_content_types
|
6 years ago |
|
Stephen Ficklin
|
59970d8197
attempt to improve logging
|
6 years ago |
|
bradford.condon
|
4a9208ffae
minor suggestions
|
6 years ago |
