Fixed merge conflicts.
Set drupalgap.taxonomy_vocabularies during drupalgap_system connect success.
Fixed merge conflict.
Merge branch '7.x-1.x-alpha' into 7.x-1.x-alpha-issue-160
Brought back in the features for taxonomy term reference field. Added a children array property that can be set on form element items to place additional render objects or html onto an element item.
#160. Brought back in the features for taxonomy term reference field. Added a children array property that can be set on form element items to place additional render objects or markup with them.
#160. Changed drupalgap_jqm_page_event_fire() to convert the callback arguments into a single item array, if the arguments are not an array. Changed options_field_widget_form() to use markup:drupalgap_jqm_page_event_script_code() when placing taxonomy terms in a select list.
Fixing merge conflict.
Merged 7.x-1.x-alpha into 7.x-1.x-alpha-issue-160.
Merged 7.x-1.x-alpha into 7.x-1.x-alpha-issue-160.
Added some code comments.
Changed hook_field_data_string() to also take in the field_info_field.
Changed drupalgap_entity_assemble_data() to also grab the field_info_field and pass it along to hook_field_data_string().
Changed drupalgap_field_key() to support tid. Added options_field_data_string().
Removed some debug statements.