Mark Rickert 93644e9214 Fix merge conflict & merge branch 'master' into header_will_display ...

* master: (21 commits)
  Version 2.2.0
  Refactored a little
  Auto-hide the toolbar when passed nil or false.
  table view auto size row height functionality
  Fixes issue #572
  Add longpressable example table screen to demo app.
  Implement @silasjmatson's idea about moving move_cell into promotion_table_data
  Allow the user to restrict the cell's movement within a section.
  Fix failing tests.
  Moar specs! 🙀
  Change edit? to edit_mode?
  Make cell_moved on_cell_moved to conform to on_cell_deleted.
  Fix true|false bug.
  Tests for moveable cells.
  Initial moveable cells functionality.
  Scroll the table to show the refresh control unless the user initiates the refresh manually.
  Version 2.1.0 + README update
  Added on_load and on_styled hooks for UIViews and on_reuse for UITableViewCells
  Make second param a hash instead of just the animation.
  Allow screens to choose their status bar style.
  ...

Conflicts:
	app/test_screens/test_table_screen.rb

2014-12-08 12:05:36 -07:00

..

test_screens

Fix merge conflict & merge branch 'master' into header_will_display

2014-12-08 12:05:36 -07:00

test_views

Tests passing

2014-05-10 15:33:22 -07:00

app_delegate.rb

Tests passing

2014-05-10 15:33:22 -07:00