1489 Commits

Author SHA1 Message Date
Kyle Fang
66be55d277 tableView might not exist in a custom UIViewController 2015-04-19 19:30:45 +08:00
Jamon Holmgren
bed0b8e797 Index, perhaps? 2015-04-18 14:32:38 -07:00
Jamon Holmgren
32b8cae3cf Move README to index to get readthedocs to work 2015-04-18 14:30:55 -07:00
Jamon Holmgren
57e3341009 Merge branch 'master' of github.com:clearsightstudio/ProMotion
rspec (~> 2.14.1)
  sqlite3
2015-04-18 14:28:09 -07:00
Jamon Holmgren
94358e546a Updated indexes 2015-04-18 14:28:03 -07:00
Jamon Holmgren
72926ef22b Merge pull request #671 from clearsightstudio/docs/lifecycle
Updated documentation for ProMotion::Screen
2015-04-18 14:16:55 -07:00
Jamon Holmgren
b722b97f41 Updated documentation for ProMotion::Screen 2015-04-18 13:47:25 -07:00
Jamon Holmgren
2f289e9b1d Fix ReadTheDocs 2015-04-03 13:33:09 -07:00
Jamon Holmgren
173b412e48 Merge pull request #622 from clearsightstudio/version-2.3
Version 2.3 Megalopullus request
2015-04-03 10:05:53 -07:00
Jamon Holmgren
a6ab41b516 Version 2.3 2015-04-03 10:05:17 -07:00
Jamon Holmgren
e10d576996 re-fix rebroken link 2015-04-02 18:53:16 -07:00
Jamon Holmgren
0bfe2519c7 Fix broken link 2015-04-02 18:52:50 -07:00
Jamon Holmgren
3d7ef76e14 Moved some docs around, updated 2015-04-02 18:52:15 -07:00
Jamon Holmgren
a4bd61bf14 Rename index.md to README.md 2015-04-02 18:21:37 -07:00
Jamon Holmgren
d70ee4f2ab Merge branch 'master' into version-2.3 2015-04-02 16:56:37 -07:00
Jamon Holmgren
076cd741e2 Fix badge placement v2.2.2 2015-04-02 16:56:33 -07:00
Jamon Holmgren
758893d4eb Fix badge placement 2015-04-02 16:56:20 -07:00
Jamon Holmgren
741bde6697 Merge branch 'version-2.3' of github.com:clearsightstudio/ProMotion into version-2.3 2015-04-02 16:55:32 -07:00
Jamon Holmgren
d15053506c Merge branch 'master' into version-2.3 2015-04-02 16:55:19 -07:00
Jamon Holmgren
d967b7e2ab Version 2.2.2 2015-04-02 16:55:04 -07:00
Jamon Holmgren
111a85d3bb Merge pull request #664 from clearsightstudio/bugfix/issue-651
Fix issue #651
2015-04-02 16:53:55 -07:00
Jamon Holmgren
82483ef313 Merge pull request #663 from clearsightstudio/bugfix/redpotion-table-cell
Add back in on_load for table cells
2015-04-02 16:53:40 -07:00
Jamon Holmgren
f7a2584109 Merge pull request #641 from clearsightstudio/search_with
Custom Search For TableScreen (take 2)
2015-04-02 16:53:05 -07:00
Jamon Holmgren
176b4460e7 Merge pull request #662 from waffle-iron/master
waffle.io Badge
2015-04-02 16:52:05 -07:00
Jamon Holmgren
4d8cd4cb39 Merge pull request #638 from clearsightstudio/bugfix/issue-621
Fixes #621
2015-04-02 16:51:55 -07:00
Jamon Holmgren
bd62ff6340 Merge pull request #636 from clearsightstudio/bugfix/issue-635
added a regression test to check for #635, no issues found - CC @silasjmatson
2015-04-02 16:50:38 -07:00
Jamon Holmgren
8797ec31f7 Fix issue #651 2015-04-02 16:46:44 -07:00
Jamon Holmgren
cde4b5e549 Add back in on_load for table cells 2015-04-02 16:34:29 -07:00
Jamon Holmgren
756bf0fe21 Merge pull request #658 from clearsightstudio/bugfix/issue_655
Fix cell height issue
2015-04-02 10:59:31 -07:00
Jamon Holmgren
0115dee9d1 Removed mp call, thanks @markrickert 2015-04-02 09:20:30 -07:00
Making GitHub Delicious.
42eab1425b add waffle.io badge 2015-04-02 10:08:58 -06:00
Jamon Holmgren
7393d8bf54 Merge pull request #659 from austinseraphin/docs
Added a note to specify self as the receiver for PM::Screen#title=
2015-03-31 16:56:30 -07:00
Austin Seraphin
a3418c5438 Added a note to specify self as the receiver for PM::Screen#title= 2015-03-31 19:51:03 -04:00
Jamon Holmgren
1115457c2c Merge branch 'version-2.3' into bugfix/issue_655 2015-03-31 16:48:23 -07:00
Jamon Holmgren
a686cb73f0 Merge branch 'master' into bugfix/issue_655 2015-03-31 16:45:59 -07:00
Jamon Holmgren
207be9faeb Merge branch 'master' into version-2.3 2015-03-31 16:45:45 -07:00
Jamon Holmgren
633a5df8b2 Merge branch 'master' into bugfix/issue_655 2015-03-31 16:45:34 -07:00
Jamon Holmgren
a62af0f73b Fixes issue #655 - cell height on search tables 2015-03-31 16:43:12 -07:00
Jamon Holmgren
410dc3fcd7 Merge pull request #648 from clearsightstudio/bugfix/on-init-load-order
fixed issue where on_init wasn't called until after screen_setup which
2015-03-17 20:20:37 -07:00
Jamon Holmgren
54da4f29d1 Merge pull request #645 from clearsightstudio/bugfix/table-accessory-hang
Fix for #586: Remove accessory view from original cell when searching
2015-03-17 19:06:11 -07:00
Kevin VanGelder
a1f6d665ff fixed issue where on_init wasn't called until after screen_setup which caused on_load to fire early in certain cases 2015-03-17 19:04:06 -07:00
Jamon Holmgren
6064c6cebc Remove accessory view from original cell when searching -- fixes issue #586 2015-03-10 08:14:04 -07:00
Jamon Holmgren
951c20192e Merge branch 'master' into search_with 2015-03-05 19:22:44 -08:00
Steve Ross
f374ff1d9b Updated doc -- tidied up search method code 2015-03-03 19:40:38 -08:00
Steve Ross
9be0526524 Updated doc -- added custom search method 2015-03-03 19:38:45 -08:00
Steve Ross
5e11714aa6 Merge branch 'version-2.3' of https://github.com/clearsightstudio/ProMotion into search_with
Conflicts:
	.travis.yml
	Rakefile
2015-03-03 19:28:01 -08:00
Jamon Holmgren
9aaa2d7aff Don't set a title if not provided per @twerth 2015-03-02 16:37:14 -08:00
Steve Ross
66b4bee667 Added specs for actual data returned from search 2015-02-28 12:03:42 -08:00
Jamon Holmgren
e2b828b90c Fixes #621 2015-02-26 22:49:50 -08:00
Jamon Holmgren
3c8482b651 Removed travis 2015-02-26 22:23:44 -08:00