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

468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamon Holmgren
fd2f02274d Merge branch 'version-0.6' into version-0.7 2013-05-27 11:17:11 -07:00
Jamon Holmgren
20ff78c800 Remove :title accessor (breaks it, unnecessary) 2013-05-27 11:16:43 -07:00
Jamon Holmgren
5cc4a05c98 Todo line 2013-05-27 11:09:30 -07:00
Jamon Holmgren
b37bce0e04 Merge branch 'version-0.6' into version-0.7 2013-05-27 11:09:15 -07:00
Jamon Holmgren
e1d8c2e01d Fix if RUBYMOTION_ENV not defined 2013-05-27 10:53:42 -07:00
Jamon Holmgren
8feab40051 Better attribute assignment for table cells. 2013-05-23 15:26:27 -07:00
Jamon Holmgren
e1ba9f0e53 Cleaner, nicer attribute assignment for table cells 2013-05-23 15:24:36 -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
Jamon Holmgren
ba3568a8ba Removing on_opened 2013-05-21 23:51:45 -07:00
Jamon Holmgren
5ed819fec3 ToC 2013-05-21 23:49:28 -07:00
Jamon Holmgren
212d9fbdbf Moving reference into the WIKI. 2013-05-21 23:47:19 -07:00
Jamon Holmgren
51c24da9b1 Separating out reference 2013-05-21 23:37:22 -07:00
Jamon Holmgren
76606d3b15 README updates 2013-05-21 18:46:01 -07:00
Jamon Holmgren
5e14877885 Teacup readme tweak 2013-05-21 18:43:45 -07:00
Jamon Holmgren
e4fa28bb30 Add to view before setting attributes to ensure Teacup works 2013-05-21 18:38:52 -07:00
Stephan Toggweiler
db115bb131 a nil test 2013-05-22 02:10:54 +02:00
Jamon Holmgren
4246042c74 Merge pull request #86 from silasj/feature/separate_specs 
Clean up the spec directory. Modify Rakefile to allow running of just unit specs or functional ones.
 2013-05-20 10:35:57 -07:00
Silas J. Matson
c7efb1c7de Merge branch 'version-0.7' of github.com:clearsightstudio/ProMotion into feature/separate_specs 2013-05-20 09:43:22 -07:00
Silas J. Matson
9ad4614777 cc 2013-05-20 09:43:17 -07:00
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
Silas J. Matson
1d594321b6 Clean up the spec directory. Modify Rakefile to allow running of just unit specs or functional. 2013-05-20 09:34:09 -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