kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-05-29 16:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
719 Commits 19 Branches 26 Tags
56c5f9faa2dcf07c76810cf48dabd4edc2d0ecf7
Commit Graph

719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamon Holmgren
56c5f9faa2 Merge pull request #174 from clearsightstudio/add-pop_to_root 
PR: Allow popping to the root view controller in the nav stack.
 2013-06-29 00:12:55 -07:00
Jamon Holmgren
38854e359b Merge branch 'add-pop_to_root' of https://github.com/clearsightstudio/ProMotion into add-pop_to_root 2013-06-29 00:03:25 -07:00
Mark Rickert
19f2151e70 implemented and tested "close to_screen: :root" 
Also accepts other close parameters like animated:true|false
 2013-06-29 00:03:04 -07:00
Mark Rickert
92e2d7a52e Not sure why these changes aren't in my code. 2013-06-29 00:03:04 -07:00
Mark Rickert
a2c6bca354 Scope test better so it actually passes. 2013-06-29 00:02:23 -07:00
Mark Rickert
ed862648bb Allow popping to the root view controller in the nav stack. 2013-06-29 00:02:22 -07:00
Jamon Holmgren
2da5fe93df Merge pull request #179 from clearsightstudio/feature_tabs_for_all 
PR: Tab bar refactor
 2013-06-28 23:52:41 -07:00
Jamon Holmgren
66505be537 Merge pull request #180 from toshiwo/change_open_screen_return_a_screen 
change open_screen return a screen
 2013-06-28 23:51:01 -07:00
Mark Rickert
ac177d82fb implemented and tested "close to_screen: :root" 
Also accepts other close parameters like animated:true|false
 2013-06-28 15:29:48 -04:00
Mark Rickert
b482a15724 Not sure why these changes aren't in my code. 2013-06-28 15:29:03 -04:00
toshiwo
6172209643 change open_screen return a screen 2013-06-29 04:25:29 +09:00
Jamon Holmgren
d82bd03771 Travis bump 2013-06-28 12:22:34 -07:00
Mark Rickert
12b7ae2ef8 Merge branch 'refs/heads/version-1.0' into add-pop_to_root 
* refs/heads/version-1.0:
  Use KVO for WebScreen tests instead of arbitrary timeouts.
 2013-06-28 15:11:49 -04:00
Jamon Holmgren
4bb30302a1 Remove tab_bar_item 2013-06-28 12:03:09 -07:00
Jamon Holmgren
8d83966e2f Merge branch 'master' into feature_tabs_for_all 2013-06-28 12:00:00 -07:00
Jamon Holmgren
c2b096ef93 Merge pull request #177 from clearsightstudio/webscreen-test-reliability 
Use KVO for WebScreen tests instead of arbitrary timeouts.
 2013-06-28 11:59:34 -07:00
Jamon Holmgren
cb88e225fe Tab bar refactor 
* Fixes issue #167
* Added PM::TabBarController
* Moved some PM::Tab methods into PM::TabBarController
* Moved some tab-related accessors into PM::Tab
* Allowed `open_tab` from AppDelegate and on the PM::TabBarController
directly
* Added tests
* Added a method: set_tab_bar_badge(number)
* Also fixed an error in the cell identifier creation code that was
creating too many identifiers

75 specifications (144 requirements), 0 failures, 0 errors
 2013-06-28 11:58:05 -07:00
Mark Rickert
888b5be3f1 Merge branch 'refs/heads/version-1.0' into add-pop_to_root 
* refs/heads/version-1.0:
  Working test for geocoding an address using MapScreen
  Assume if a string is passed that they want an address
  Fixing Teacup integration with PM::TableScreen
  Added a few more requirements to improve tests.
  Add specs for will_present, on_presented, will_dismiss, and on_dismiss.
  Use correct method to check.
  Remove 'ProMotion' file.
  Add will_present, on_presented, will_dismiss, and on_dismiss methods.
  Added a look_up_address convenience method

Conflicts:
	spec/functional/func_screen_spec.rb
 2013-06-28 14:46:09 -04:00
Mark Rickert
a6c847a1f2 Merge pull request #168 from clearsightstudio/feature/map_look_up_address 
PR: Added a look_up_address convenience method
 2013-06-28 11:29:44 -07:00
Mark Rickert
b253b88c17 Use KVO for WebScreen tests instead of arbitrary timeouts. 2013-06-28 14:20:15 -04:00
Mark Rickert
8faafef4ba Working test for geocoding an address using MapScreen 2013-06-28 14:11:47 -04:00
Mark Rickert
ea150f54f6 Assume if a string is passed that they want an address 2013-06-28 13:47:17 -04:00
Jamon Holmgren
be5c9bb0a3 Merge pull request #175 from clearsightstudio/fix_teacup_integration_tablescreen 
Fixing Teacup integration with PM::TableScreen
 2013-06-27 17:35:48 -07:00
Jamon Holmgren
210cbefbf1 Fixing Teacup integration with PM::TableScreen 2013-06-27 16:56:58 -07:00
Jamon Holmgren
38c2cef9ad Merge pull request #173 from silasj/version-1.0 
Add will_present, on_presented, will_dismiss, and on_dismiss methods.
 2013-06-27 15:33:26 -07:00
Silas J. Matson
e80a6e46ec Added a few more requirements to improve tests. 2013-06-27 13:34:46 -07:00
Silas J. Matson
e20433afb4 Add specs for will_present, on_presented, will_dismiss, and on_dismiss. 2013-06-27 13:14:35 -07:00
Silas J. Matson
14f915f2d7 Use correct method to check. 2013-06-27 12:25:15 -07:00
Mark Rickert
aa91f4fce7 Scope test better so it actually passes. 2013-06-27 15:12:05 -04:00
Mark Rickert
adf5d2b0db Allow popping to the root view controller in the nav stack. 2013-06-27 15:07:55 -04:00
Silas J. Matson
e44fa8e17c Remove 'ProMotion' file. 2013-06-27 11:47:41 -07:00
Silas J. Matson
30d0bb726e Add will_present, on_presented, will_dismiss, and on_dismiss methods. 2013-06-27 11:45:54 -07:00
Jamon Holmgren
12a4758af0 Merge pull request #170 from clearsightstudio/refactor_table_data 
Fixes switch accessory issue, refactor methods from TableData to Table...
 2013-06-26 18:26:55 -07:00
Jamon Holmgren
b8b5d2e99d Fixes switch accessory issue, refactor methods from TableData to Table module where they should be 2013-06-26 18:17:27 -07:00
Silas J. Matson
d39b0dd424 Revert "Remove rescue since RubyMotion bug was fixed." 
Specs are still failing.
This reverts commit 63ea07f4f7.
 2013-06-25 12:41:46 -07:00
Silas J. Matson
63ea07f4f7 Remove rescue since RubyMotion bug was fixed. 2013-06-25 12:34:22 -07:00
Jamon Holmgren
1eec4b6334 Added a look_up_address convenience method 
Hard to test since you have to wait for the response, but it works in
the REPL.
 2013-06-24 23:51:48 -07:00
Jamon Holmgren
189e1e154e Merge pull request #165 from clearsightstudio/refactor_folder_structure 
Refactor folder structure, remove pm_main_controller monkey-patch
 2013-06-24 23:10:13 -07:00
Jamon Holmgren
4986724263 Merge branch 'version-1.0' into refactor_folder_structure 2013-06-24 23:01:55 -07:00
Jamon Holmgren
a7fc8e3fc0 Fix for issue #167, tab bar tests. 2013-06-24 22:58:16 -07:00
Jamon Holmgren
600106475f Merge pull request #166 from clearsightstudio/webscreen-data-detectors 
Webscreen data detectors
 2013-06-24 10:38:03 -07:00
Mark Rickert
5ca392fe0f Move detector types into the set_attributes of the webscreen. 2013-06-23 15:05:39 -04:00
Mark Rickert
1066e08ba0 Merge branch 'refs/heads/version-1.0' into webscreen-data-detectors 
* refs/heads/version-1.0:
  Fixed failing test
  Ensuring background image is settable
  Scroll the tableview all the way to the top when there's a search field and the table index begins with "{search}". Fixes #159 on MASTER branch.
  Scroll the tableview all the way to the top when there's a search field and the table index begins with "{search}". Fixes #159
 2013-06-23 14:54:48 -04:00
Jamon Holmgren
1add1bc093 Passing test 2013-06-21 23:43:11 -07:00
Jamon Holmgren
648cc87930 Removing main_controller references 2013-06-21 23:33:12 -07:00
Jamon Holmgren
3dcf2a251e removing dependency on monkey-patching UIViewController 2013-06-21 22:55:45 -07:00
Jamon Holmgren
e81a4f6240 Fixed failing test 2013-06-21 22:21:32 -07:00
Jamon Holmgren
85c5a1ec3d Merge branch 'version-1.0' of https://github.com/clearsightstudio/ProMotion into version-1.0 2013-06-21 21:57:43 -07:00
Jamon Holmgren
230f8829c8 Merge pull request #160 from clearsightstudio/search-tableindex 
Fix for table index and search field item
 2013-06-21 21:57:33 -07:00
Jamon Holmgren
fba5b89246 Merge branch 'master' of https://github.com/clearsightstudio/ProMotion into version-1.0 2013-06-21 21:56:13 -07:00