kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-06-01 19:49:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
441 Commits 19 Branches 26 Tags
7dede877612d4c27ccea66a124b4599e5b080fe6
Commit Graph

441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ainame
7dede87761 update .gitignore for basically rubyist enviroment. 
Most contributors don't need clojure's environment and don't have it.
 2013-06-03 00:47:25 +09:00
Jamon Holmgren
a8d4fed4a9 readme 2013-05-27 12:07:57 -07:00
Jamon Holmgren
a406cbfcb1 Version 0.6.4 2013-05-27 11:28:19 -07:00
Jamon Holmgren
83e2104e31 bump 2013-05-27 11:28:19 -07:00
Jamon Holmgren
ebb5ce792d Remove :title accessor (breaks it, unnecessary) 2013-05-27 11:28:19 -07:00
Jamon Holmgren
23c6886607 Merge pull request #96 from andyw8/patch-1 
Correct add_right_nav_button to be set_nav_bar_right_button
 2013-05-26 12:50:47 -07:00
Andy Waite
64ff57f78c Correct add_right_nav_button to be set_nav_bar_right_button 
The example given seemed to be wrong or out of date.
 2013-05-26 15:40:48 +02:00
Jamon Holmgren
d2bd2503b7 Version 0.6.3 2013-05-23 14:58:09 -07:00
Jamon Holmgren
6d16ac976b Merge branch 'version-0.6' 2013-05-23 14:57:10 -07:00
Jamon Holmgren
816f8af99f Merge pull request #89 from rheoli/version-0.6-nil-check 
A nil check for table_cell.detailTextLabel
 2013-05-23 14:50:15 -07:00
Stephan Toggweiler
db115bb131 a nil test 2013-05-22 02:10:54 +02: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
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
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
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
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
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
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
Mark Rickert
dc3e32449f One more test to make sure it's the RIGHT image ;) 2013-05-16 09:37:51 -04:00
Mark Rickert
8acdeaf7cd Add tests for creating a UIBarButton with a UIImage. 2013-05-16 09:35:08 -04:00
Mark Rickert
2e8697e9b5 Update test app rakefile for RM2.0 syntax 2013-05-16 09:34:45 -04:00
Mark Rickert
5abd3481be Update readme to note that UIImages can be sent to create UIBarButtons 2013-05-16 09:19:56 -04:00
Mark Rickert
fd5620eae3 Allow user to specify a UIImage as the title for a nav bar button item. 2013-05-15 21:21:09 -04:00
Jamon Holmgren
e8c8f52193 Merge pull request #65 from clearsightstudio/version-0.6 
Version 0.6
v0.6 		2013-05-15 10:30:43 -07:00