kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-05-25 01:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
909 Commits 19 Branches 26 Tags
4dc6ce8cefc9b6e7f5ea4e08fed34f1bc366a079
Commit Graph

909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamon Holmgren
4dc6ce8cef Merge pull request #280 from clearsightstudio/feature/added_formotion_on_submit 
PM::FormotionScreen - Added on_submit method and test.
 2013-09-10 07:46:14 -07:00
Jamon Holmgren
b98b2325e3 Merge pull request #292 from dchersey/edge 
Adding support for open(Screen, animated: false)
 2013-09-10 07:31:50 -07:00
David Hersey
2a8c91e544 Merge branch 'edge' of https://github.com/clearsightstudio/ProMotion into edge 
Conflicts:
	.ruby-version
 2013-09-09 12:37:22 -04:00
Jamon Holmgren
092dee541c Merge pull request #285 from clearsightstudio/set-frames-x-y 
Set frames x y
 2013-09-03 12:07:13 -07:00
Mark Rickert
1980f5ac0a Add passing test for setting frames with x/y instead of left/top 2013-09-01 13:08:40 -04:00
Mark Rickert
cd5401593a Allow user to pass x,y and it's auto-turned into left, top for frames. 2013-09-01 13:06:11 -04:00
Jamon Holmgren
6b0b9f2d35 Added on_submit method and test. 2013-08-22 09:36:50 -07:00
David Hersey
d137d60ceb Adding support for open(Screen, animated: false) with specs 2013-08-20 10:32:11 -04:00
Jamon Holmgren
78d4378f95 Merge branch 'master' into edge 2013-08-19 20:48:00 -07:00
Jamon Holmgren
36b8ff860d Turning on detect_dependencies explicitely 2013-08-19 20:47:53 -07:00
Jamon Holmgren
aabb6fd3d6 Merge branch 'master' into edge 2013-08-19 20:20:08 -07:00
Jamon Holmgren
e17f808cd9 Proper Getting Started Guide link 2013-08-19 20:19:57 -07:00
Jamon Holmgren
141aa2e103 Bundled 2013-08-19 20:13:27 -07:00
David Hersey
5cee8f326c added functional tests for animation support for navigation controller push animated 2013-08-17 15:34:42 -04:00
David Hersey
6b0e56ae18 added functional tests for animation support for navigation controller push 2013-08-17 15:29:57 -04:00
David Hersey
2bfedb339e added functional tests for animation support for navigation controller push 2013-08-17 15:27:42 -04:00
David Hersey
450f9ec137 support for open(Screen, animated:false) with nav_bar 2013-08-15 17:46:37 -04:00
Jamon Holmgren
da14f38165 Merge pull request #271 from clearsightstudio/stopped_searching 
Searching callbacks
 2013-08-15 14:24:56 -07:00
Mark Rickert
80f51245ec Changed on_ to will_ 2013-08-15 17:07:39 -04:00
Jamon Holmgren
96629acdde Merge pull request #269 from AmoebaConsulting/back_button_support 
Back button support
 2013-08-15 13:03:54 -07:00
Mark Rickert
b1e4ef754e Updated end search callback name and added on_begin_search callback. Also updated tests to pass. 2013-08-15 15:42:21 -04:00
Jamon Holmgren
d827f732ed Merge pull request #267 from AmoebaConsulting/add_flat_tabs 
Add flat tabs
 2013-08-15 11:37:16 -07:00
Jamon Holmgren
4c10697fc8 Merge branch 'master' into edge 2013-08-15 10:58:59 -07:00
Jamon Holmgren
1318babe51 Merge pull request #266 from AmoebaConsulting/fix_gitignore 
.gitignore updates
 2013-08-15 10:58:06 -07:00
Jamon Holmgren
7786c7359b Internal update to 1.0.3 2013-08-15 10:49:47 -07:00
Jamon Holmgren
b13d54df30 Revert "Merge branch 'edge' of github.com:clearsightstudio/ProMotion into edge" 
This reverts commit 62fd1c1970, reversing
changes made to a139d36879.
 2013-08-15 10:47:56 -07:00
Daniel Jabbour
b40cba500a Adding spec for :back nav bar button 2013-08-14 23:12:52 -07:00
Daniel Jabbour
beb7a8af48 Adding support for back button 2013-08-14 18:52:26 -07:00
Mark Rickert
69881535c2 Add test for stopped_searching callback. 2013-08-14 20:29:24 -04:00
Mark Rickert
23eba38466 Add a callback to the tablescreen class that is called when the user stops searching (hits the cancel button) 2013-08-14 20:20:31 -04:00
Daniel Jabbour
819553af82 Tab icons support selected & unselected state 2013-08-14 16:48:59 -07:00
Jamon Holmgren
62fd1c1970 Merge branch 'edge' of github.com:clearsightstudio/ProMotion into edge 2013-08-14 16:17:00 -07:00
Jamon Holmgren
a139d36879 Merge branch 'master' into edge 2013-08-14 16:16:44 -07:00
Daniel Jabbour
4de5e9d079 .gitignore updates 
* Removing .ruby-version and .ruby-gemset from repo as they are in
   the .gitignore file already.
 * Adding IDE / Editor specific entries to the .gitignore for Sublime,
   TextMate, and RubyMine.
 2013-08-14 16:01:42 -07:00
Jamon Holmgren
fd6053daa1 Merge pull request #265 from AmoebaConsulting/fix_tab_image_support 
Updating Tabs :icon attribute to accept UIImage
 2013-08-14 01:10:11 -07:00
Daniel Jabbour
ce96dc05bd Updating Tabs :icon attribute to accept UIImage 2013-08-13 19:18:34 -07:00
Jamon Holmgren
d07e035840 Merge pull request #262 from rheoli/accessibility 
Add accessibilityLabel for easier testing with Calabash
 2013-08-09 11:35:20 -07:00
Stephan Toggweiler
865f492a98 fix spec bug 2013-08-09 17:49:22 +02:00
Stephan Toggweiler
7905c4b914 small fix 2013-08-09 16:59:54 +02:00
Stephan Toggweiler
ca207753f6 more generalized version 2013-08-09 16:57:59 +02:00
Jamon Holmgren
a0ee91367d Merge pull request #260 from clearsightstudio/feature/map_annotation_image_string 
Feature/map annotation image string
 2013-08-06 11:46:49 -07:00
Jamon Holmgren
23d53a2ca0 Added ability to specify a string OR UIImage for map screen annotation image 2013-08-06 11:31:22 -07:00
Jamon Holmgren
883af37402 Merge pull request #258 from thebeansgroup/feature/map_annotation_image 
Allow MapScreen annotations to be images
 2013-08-06 11:13:41 -07:00
Ad Taylor
b68891aa43 Fixes repeated line in image annotation IF 2013-08-06 12:36:29 +01:00
Ad Taylor
fae7d2d8d5 Adds functional tests for MKAnnotation images 2013-08-06 11:37:02 +01:00
Jamon Holmgren
fce0e7fa12 Merge pull request #257 from bastos/add-on_open_url 
Add support to application:openURL:sourceApplication:annotation
 2013-08-05 12:07:36 -07:00
Tiago Bastos
e911c1c2a2 Add support to application:openURL:sourceApplication:annotation 
Now you can use `on_open_url` instead.

http://developer.apple.com/library/ios/documentation/uikit/reference/UIApplicationDelegate_Protocol/Reference/Reference.html#//apple_ref/occ/intfm/UIApplicationDelegate/application:openURL:sourceApplication:annotation:
 2013-08-05 15:37:26 -03:00
Jamon Holmgren
976cc6dd7f Fixing conflicts. 2013-08-05 11:33:57 -07:00
Ad Taylor
7011955485 Ensures MK Annotation is of correct type for image. Updates identifier when image is set 2013-08-02 16:21:02 +01:00
Ad Taylor
da058d5043 Adds image param to MapScreen annotation data 2013-08-02 14:45:03 +01:00