kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-06-05 07:00:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
324 Commits 19 Branches 26 Tags
500e7dc4a0f254e1b3f7ca6ae92055b86ab3da4e
Commit Graph

324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamon Holmgren
500e7dc4a0 Debugging load issue 2013-04-25 09:41:29 -07:00
Jamon Holmgren
9b40bc68f5 Updated table-of-contents 2013-04-25 07:34:20 -07:00
Jamon Holmgren
83cb7fc3e1 Tests pass, split screen looking good. 2013-04-25 00:49:19 -07:00
Jamon Holmgren
716abd48ee Revert "Merge branch 'splitscreen-v0.5' of git://github.com/rheoli/ProMotion into version-0.6" 
This reverts commit 382b5c9f99, reversing
changes made to 8f86423c6e.
 2013-04-25 00:03:05 -07:00
Jamon Holmgren
382b5c9f99 Merge branch 'splitscreen-v0.5' of git://github.com/rheoli/ProMotion into version-0.6 2013-04-24 23:54:45 -07:00
Jamon Holmgren
8f86423c6e Preparing for merge 2013-04-24 23:50:10 -07:00
Jamon Holmgren
f567dc4744 Merging app_delegate rename branch 2013-04-24 21:59:38 -07:00
Jamon Holmgren
6c08ca08c1 Renamed spec 2013-04-24 21:48:25 -07:00
Jamon Holmgren
ae435149d6 Added motion-redgreen 2013-04-17 17:07:24 -07:00
Jamon Holmgren
abd2d60c29 Travis bump 2013-04-17 13:47:48 -07:00
Jamon Holmgren
a946fd9575 Travis bump 2013-04-16 14:25:37 -07:00
Jamon Holmgren
20e13ab330 Travis bump 2013-04-16 13:59:54 -07:00
Jamon Holmgren
f95ca327ee Rename AppDelegateParent to Delegate 2013-04-16 13:40:42 -07:00
Jamon Holmgren
b6fe6e9012 Added rake to Gemfile for Travis 2013-04-04 17:25:18 -07:00
Jamon Holmgren
70b5f79b8e Bundler install 2013-04-04 17:16:18 -07:00
Jamon Holmgren
d4c850ce78 Adding Gemfile to travis? 2013-04-04 16:31:59 -07:00
Jamon Holmgren
dca1740c20 Maybe bundle exec will work? 2013-04-04 16:26:13 -07:00
Jamon Holmgren
43f5dcf7be Disabling empty specs for now 2013-04-04 16:21:57 -07:00
Jamon Holmgren
8d17999260 Script set to rake spec 2013-04-04 16:17:03 -07:00
Jamon Holmgren
2cf6b2383b Added Travis.ci integration 2013-04-04 16:04:11 -07:00
Jamon Holmgren
c1c229a04d Merge pull request #42 from clearsightstudio/version-0.5 
Version 0.5.2
 2013-03-28 12:02:10 -07:00
Jamon Holmgren
53b0efdeb8 Updated "What's New" for 0.5.2 v0.5 2013-03-28 10:55:35 -07:00
Jamon Holmgren
10f2f1f71a Pending tests fixed 2013-03-28 10:42:26 -07:00
Jamon Holmgren
bfee2f7cc6 Pending tests fixed 2013-03-28 10:42:01 -07:00
Stephan Toggweiler
d1fbcc8f36 cleanup 2013-03-25 21:21:57 +01:00
Stephan Toggweiler
4251c68ff4 remove some debug code 2013-03-24 13:52:45 +01:00
Stephan Toggweiler
cfd4adbf35 any split code now in ProMotion instead of the App 2013-03-24 13:41:15 +01:00
Stephan Toggweiler
d0bdcb8765 more clear now 2013-03-23 19:54:19 +01:00
Stephan Toggweiler
9e24520e67 testing SplitScreen for iPad 2013-03-23 19:09:44 +01:00
Jamon Holmgren
b3fba51a5a Merge pull request #40 from macfanatic/screen_helpers_test_coverage 
ScreenNavigation::open_screen refactored, more tests
 2013-03-20 12:35:02 -07:00
Matt Brewer
c3a2e9e1c7 ScreenNavigation::open_screen refactored, more tests 2013-03-20 13:53:41 -04:00
Jamon Holmgren
0421e29522 Merge pull request #39 from macfanatic/remove_duplicate_content_height 
Removed duplicate method definition
 2013-03-20 10:00:32 -07:00
Matt Brewer
ef76332521 Removed duplicate method definition 2013-03-20 10:00:13 -04:00
Jamon Holmgren
52478f8824 Version 0.5.2 2013-03-19 15:53:47 -07:00
Jamon Holmgren
e6719e6b67 Merge pull request #38 from macfanatic/screens_test_coverage 
Basic tests for core functionality
 2013-03-19 15:51:12 -07:00
Matt Brewer
3eb331a37a Basic tests for core functionality 
* ScreenModule & ViewController methods
* ViewHelper module
* SystemHelper module
 2013-03-19 18:39:14 -04:00
Jamon Holmgren
4db0b141ba Version 0.5.2 2013-03-19 15:18:16 -07:00
Jamon Holmgren
eb24a49e5e Added contributors block 2013-03-19 15:06:09 -07:00
Jamon Holmgren
3628c4324b Updated modal dismiss, other items 
Fixed :animated default
Updated to iOS 5+ dismissViewController with completion
Factored send_on_return out into its own method
 2013-03-19 15:01:07 -07:00
Jamon Holmgren
3bd3ac8744 Merge branch 'master' into version-0.5 2013-03-19 14:36:40 -07:00
Jamon Holmgren
fce05e5ee2 Converting from .rvmrc to .ruby-version and .ruby-gemset per rvm 1.18.21 2013-03-19 14:33:45 -07:00
Jamon Holmgren
918ff26f8f Merge pull request #36 from macfanatic/tipcounter 
README now includes "TipCounter" ref
 2013-03-18 08:56:53 -07:00
Matt Brewer
90a22f8b77 README now includes "TipCounter" ref 2013-03-18 09:51:17 -04:00
Jamon Holmgren
1bb53ddde2 Merge pull request #35 from macfanatic/add_test_suite 
Basic test suite setup
 2013-03-15 14:57:09 -07:00
Matt Brewer
5c4db681b7 Basic test suite setup 2013-03-15 17:40:39 -04:00
Jamon Holmgren
b546237792 Merge pull request #31 from clearsightstudio/version-0.5 
Fixing some issues related to opening a modal with a new nav_bar
 2013-03-08 14:11:23 -08:00
Jamon Holmgren
0fbefa72a4 Version 0.5.1 2013-03-08 12:34:15 -08:00
Jamon Holmgren
168bef70df Fixing some issues related to opening a modal with a new navigation controller. 2013-03-08 12:31:39 -08:00
Jamon Holmgren
5c6722256d Updated README to show 0.5.0 2013-03-05 19:28:35 -08:00
Jamon Holmgren
ec1ab56c07 Adjusting reference table formatting 2013-03-04 12:26:12 -08:00