kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-06-04 19:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
448 Commits 19 Branches 26 Tags
378616af67f02f1c38caa5f3779efbdde2a72842
Commit Graph

448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamon Holmgren
378616af67 Merge branch 'master' into version-0.7 2013-05-20 09:40:30 -07:00
Jamon Holmgren
81f1ab0d58 Merge pull request #85 from macfanatic/pm_wrapper_controller 
Added PM::BehavesLikeScreen module to inject into UIViewController
 2013-05-20 09:38:19 -07:00
Matt Brewer
0ed76baef3 alias :main_controller method to :pm_main_controller 2013-05-20 12:16:49 -04:00
Matt Brewer
54c013c6d7 Added PM::BehavesLikeScreen module to inject into UIViewController 2013-05-20 11:24:06 -04:00
Matt Brewer
5784cbdd32 Merge pull request #84 from clearsightstudio/feature/functional_tests 
Added passing functional tests
 2013-05-20 07:41:44 -07:00
Jamon Holmgren
406b316863 Added passing functional tests 2013-05-19 19:44:47 -07:00
Jamon Holmgren
3dd6c1ca08 Merge pull request #83 from sxross/master 
Here's the pull request against version-0.7
 2013-05-19 17:33:22 -07:00
Steve Ross
38248e4b06 Merge branch 'version-0.7' of https://github.com/clearsightstudio/ProMotion into version-0.7 2013-05-18 23:17:02 -07:00
Jamon Holmgren
e319cd3efb Removing rubygems require 2013-05-18 20:58:32 -07:00
Jamon Holmgren
29da6f8114 Updating to version 0.6.2 2013-05-18 20:13:02 -07:00
Jamon Holmgren
27e078d1f4 Merge branch 'master' into version-0.7 2013-05-18 20:11:33 -07:00
Jamon Holmgren
c49102c8f9 Merge pull request #82 from clearsightstudio/version-0.6 
Version 0.6 branch -- merge into master
 2013-05-18 20:09:37 -07:00
Jamon Holmgren
e4c8be1880 Merging version-0.6 2013-05-18 20:08:41 -07:00
Jamon Holmgren
7cfec17a39 Cleaning up set_nav_bar_button code and README 2013-05-18 20:00:55 -07:00
Jamon Holmgren
9bae9d8177 Clarify contributions 2013-05-18 19:39:23 -07:00
Jamon Holmgren
5ebf801a1c Merge pull request #81 from clearsightstudio/version-0.5 
Merging branch w/ random commits ahead of master
 2013-05-18 16:50:59 -07:00
Jamon Holmgren
3c0837706b Adding formotion screen. 2013-05-18 16:39:57 -07:00
Jamon Holmgren
846fb98845 Conflicts, merging 2013-05-18 15:43:36 -07:00
Jamon Holmgren
3935dd4441 Merge pull request #80 from tmilewski/version-0.7-UIBarButtonItem 
Allow user to specify a UIBarButtonItem as the title for a nav bar button item.
 2013-05-18 15:02:51 -07:00
Tom Milewski
a83ec10382 Allow set_nav_bar_*_button to accept UIBarButtonItem 2013-05-18 14:06:58 -04:00
Steve Ross
246b729a31 restated hash example in 1.9.3 hash syntax 2013-05-17 20:46:21 -07:00
Steve Ross
d601dc8b20 fixed typo in README and test in on_create for args[:toolbar] is now unless args[:toolbar].nil? 2013-05-17 16:59:47 -07:00
Steve Ross
69e8d585b4 Added the autoResizingMask code to custom label setter. 2013-05-17 15:39:11 -07:00
Steve Ross
8b14772995 removed a few debug statements 2013-05-17 13:15:55 -07:00
Steve Ross
4d170b6bb3 Added ability to use custom labels in subclassed table cells without pain 2013-05-17 12:43:45 -07:00
Jamon Holmgren
0cc70d6ebb Version 0.6.1 2013-05-17 10:46:54 -07:00
Jamon Holmgren
e0cb97d96a Merge pull request #76 from rheoli/version-0.6-split-tabbar 
TabBar title and icon for SplitScreen
 2013-05-17 10:45:29 -07:00
Jamon Holmgren
df108175bd Merge pull request #78 from silasj/master 
Fix title issue and change the way that screens manage titles.
 2013-05-17 10:43:35 -07:00
Silas J. Matson
d037387b4e Fix Title issue. Changed the way that screens manage titles. 
Fixes possible conflicts in two separate instances of the same Screen.
Fixes #74
 2013-05-17 10:33:25 -07:00
Stephan Toggweiler
201c9b0ef5 from master 2013-05-17 19:05:14 +02:00
Stephan Toggweiler
d47eccb2db add image from master for spec tests 2013-05-17 17:53:55 +02:00
Stephan Toggweiler
272dcb2057 add some specs for split screen tab bar icon/title 2013-05-17 17:53:30 +02:00
Jamon Holmgren
e036935bd6 Cleaning up screen nav specs 
Also consolidated where we're checking for main_controller.
 2013-05-17 08:31:40 -07:00
Jamon Holmgren
d49cda38f7 Merge pull request #77 from macfanatic/title_function_from_module 
Added tests to support #74
 2013-05-17 07:44:22 -07:00
Jamon Holmgren
19d6a4f181 Fixing specs to work in RM 2.0 
https://github.com/clearsightstudio/ProMotion/blob/version-0.6/lib/ProMo
tion/screen_helpers/split_screen.rb#L9
 2013-05-17 07:39:45 -07:00
Matt Brewer
078ba68761 Added tests to support #74 2013-05-17 07:45:37 -04:00
Stephan Toggweiler
7b2f61c7d6 tabbar title and icon for SplitScreen 2013-05-17 11:11:43 +02:00
Steve Ross
92bfb2c3e2 Added support for toolbar hiding/showing in UINavigationController 2013-05-16 15:39:35 -07:00
Jamon Holmgren
6bf9e33a35 Merge pull request #73 from sxross/master 
set_nav_bar_button_item addition (again)

Thanks @sxross!
 2013-05-16 13:05:03 -07:00
Steve Ross
e0b0f7329b Fixed system item in set_bar_bar_button to take UIImage change into account; updated README 2013-05-16 12:50:03 -07:00
Jamon Holmgren
417df0824a Merge pull request #70 from markrickert/version-0.6-imagebuttons 
Fix linebreak in the readme.
 2013-05-16 11:40:42 -07:00
Steve Ross
d1d6c2dd04 Merge branch 'master' of https://github.com/sxross/ProMotion 
Conflicts:
	lib/ProMotion/screens/_screen_module.rb
 2013-05-16 11:34:02 -07:00
Mark Rickert
f7eeeb7d1a Fix linebreak in the readme. 2013-05-16 14:11:15 -04:00
Steve Ross
543ba8060c Changed set_nav_bar_button to accept a system_icon hash key that allows creation of system buttons like add. 2013-05-16 11:09:45 -07:00
Jamon Holmgren
75e1873815 Switched demo app link 2013-05-16 10:57:27 -07:00
Jamon Holmgren
0193d7fdec Merge pull request #67 from markrickert/version-0.6-imagebuttons 
Allow user to specify a UIImage as the title for a nav bar button item.
 2013-05-16 10:51:55 -07:00
Jamon Holmgren
c67563b506 Clarified app_delegate code 2013-05-16 10:00:40 -07:00
Mark Rickert
4117fe9e92 Added tests for the left bar button item. 2013-05-16 12:22:10 -04:00
Jamon Holmgren
0f3fe1031c Merge pull request #68 from markrickert/add-app-to-readme 
Added Winston-Salem Crime Map to the list of apps that use ProMotion.
 2013-05-16 08:25:50 -07:00
Mark Rickert
3f74b18a4c Added Winston-Salem Crime Map to the list of apps that use ProMotion. 2013-05-16 10:39:09 -04:00