Mark Rickert 6028acc27b Merge branch 'refs/heads/version-1.0' into webscreen ...

* refs/heads/version-1.0:
  Removed unnecessary and commented out code from the map spec.
  Simplify the code for adding annotations.
  Better params handling for initializing an annotation.
  Rename to support 1.0 folder structure.
  Convert all CLLocationCoordinate2DMake calls to CLLocationCoordinate2D.new
  Unit & Functional tests for MapScreen. All tests passing.
  Big red error message if CoreLocation and MapKit aren't included frameworks.
  Add corelocation and mapkit to the project rakefile.
  Get and set center position of the map.
  Decided against the metaprogramming for now.
  Added args to add_nav_bar call in ProMotion::ScreenModule
  Why was this .DS_Store file here?
  Metaprogramming FTW!
  Don't *require* a subtitle to be set in the annotation.
  First attempt at providing a more "table_data" like DSL for the mapkit annotations.
  Fixed but in adding multiple annotations.
  Better defaults handling in the MapScreenAnnotation.
  Handle annotations, regions and zooming to coordinates.
  Support annotations.
  Initial mapview module working and setting initial location.

Conflicts:
	lib/ProMotion/screen/screen_module.rb

2013-06-17 18:04:09 -04:00

..

ProMotion

Merge branch 'refs/heads/version-1.0' into webscreen

2013-06-17 18:04:09 -04:00

ProMotion.rb

Push notifications, delegate methods, cleaning up delegate.

2013-05-23 22:20:47 -07:00