 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 vuotta sitten |
 Bradford Condon
|
8c4e57c0f0
Merge pull request #616 from tripal/427-Tv3-prop_content_types
|
6 vuotta sitten |
|
Stephen Ficklin
|
2ba6c53752
Fixed merge conflicts
|
6 vuotta sitten |
|
Stephen Ficklin
|
40559c69cc
Merge branch '7.x-3.x' into 427-Tv3-prop_content_types
|
6 vuotta sitten |
|
Stephen Ficklin
|
ac6aa41527
Merge pull request #585 from tripal/465-tv3-pub_reporter
|
6 vuotta sitten |
|
Stephen Ficklin
|
1efcee443a
Fixed merge conflicts
|
6 vuotta sitten |
|
Stephen Ficklin
|
9f247c38fe
Merge branch '7.x-3.x' into 465-tv3-pub_reporter
|
6 vuotta sitten |
|
Bradford Condon
|
dbdfe0f3eb
Merge pull request #584 from tripal/577-tv3-pub_syncing
|
6 vuotta sitten |
|
Stephen Ficklin
|
e1e7ec0c01
Fixed merged conflict
|
6 vuotta sitten |
|
Stephen Ficklin
|
06b1b61977
Merge branch '7.x-3.x' into 465-tv3-pub_reporter
|
6 vuotta sitten |
|
Stephen Ficklin
|
85fa3601e8
Merge pull request #579 from tripal/371-tv3-chado_bundle_type_id
|
6 vuotta sitten |
|
Stephen Ficklin
|
e77f6f0dba
Fixed job display issue
|
6 vuotta sitten |
|
Stephen Ficklin
|
030f828330
Fixed merge conflict, a bug preventing CI from working, and a bit of cleanup
|
6 vuotta sitten |
|
Stephen Ficklin
|
4f9db3475f
Copied fix from PR #611
|
6 vuotta sitten |
|
Stephen Ficklin
|
f0b866f8f3
Merge branch '7.x-3.x' into 465-tv3-pub_reporter
|
6 vuotta sitten |
|
Stephen Ficklin
|
4229d8b98f
Fixed bugs from PR review
|
6 vuotta sitten |
|
Stephen Ficklin
|
a741fc318a
Merge branch '7.x-3.x' into 577-tv3-pub_syncing
|
6 vuotta sitten |
|
Stephen Ficklin
|
3977ae37b1
Merge branch '427-Tv3-prop_content_types' of github.com:tripal/tripal into 427-Tv3-prop_content_types
|
6 vuotta sitten |
|
Stephen Ficklin
|
59970d8197
attempt to improve logging
|
6 vuotta sitten |
|
bradford.condon
|
4a9208ffae
minor suggestions
|
6 vuotta sitten |
|
Stephen Ficklin
|
564aa11819
Forgot to comment back in the function to add fields to views
|
6 vuotta sitten |
|
Bradford Condon
|
e60511585b
Merge pull request #615 from srobb1/patch-1
|
6 vuotta sitten |
|
Bradford Condon
|
0d2acda682
Update upgrade_from_tripal2.rst
|
6 vuotta sitten |
|
Bradford Condon
|
80c3eca359
Update upgrade_from_tripal2.rst
|
6 vuotta sitten |
|
Stephen Ficklin
|
d74d89b22e
oops last image in docs is wrong
|
6 vuotta sitten |
|
Stephen Ficklin
|
821dfd3855
Merge branch '7.x-3.x' into 441-tv3-content_types
|
6 vuotta sitten |
|
Stephen Ficklin
|
2d743df8c0
Fixed a few more bugs and updated docs
|
6 vuotta sitten |
|
Stephen Ficklin
|
80357df75c
Fixed issue with schema__additional_type widget
|
6 vuotta sitten |
|
Stephen Ficklin
|
71fb37f615
Can now add new content type based on prop table
|
6 vuotta sitten |
|
Stephen Ficklin
|
155583fccf
Merge branch '7.x-3.x' into 427-Tv3-prop_content_types
|
6 vuotta sitten |
