mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 06:12:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yoong Kang Lim
5de6759917 Moved number of follows/followers under activity and added pagination. 2014-11-21 00:29:45 +11:00
Yoong Kang Lim
aeb7192f48 Break up tests into different scenarios. Defined cancan ability for follows and updated member profile view 2014-11-20 23:46:15 +11:00
Yoong Kang Lim
0ba6562d79 Added more model tests for following behaviour 2014-11-20 01:46:04 +11:00
Yoong Kang Lim
996043d8fb Renamed get_follow_id to get_follow as it does not return id. Also added unit tests for the new methods in the member model. 2014-11-20 01:10:28 +11:00
Yoong Kang Lim
0eb5ae58aa Renamed member_id column in Follow table to follower_id. Made necessary modifications to models and tests. 2014-11-20 00:42:46 +11:00
Skud
6aea16028e Merge pull request #452 from wsmoak/negative-area 
Prevent the creation of a garden with a negative number for the area.
 2014-11-19 17:18:09 +11:00
Skud
5f2ca6bc9d Merge pull request #450 from Skud/login_timeout 
Login timeout
 2014-11-19 17:18:02 +11:00
Skud
9861f8cf51 Merge pull request #447 from krio/add-edit-button-seeds-index 
Add edit button to seeds index page
 2014-11-19 17:17:52 +11:00
Skud
284c28ce9a Merge pull request #441 from yoongkang/editprofile 
Removed "Edit Profile" button from home page
 2014-11-19 17:17:27 +11:00
Skud
c674f30eb8 Merge pull request #453 from Growstuff/dev 
Production push: planting reminders, crop details, harvest photos, finished plantings, etc
 2014-11-19 16:53:55 +11:00
Wendy Smoak
02994bd5cc Added a test for the validator to show it doesn't accept negative numbers for garden area. 2014-11-18 20:58:00 -05:00
Wendy Smoak
53d782bc83 Prevent the creation of a garden with a negative number for the area. If entered, the area must be greater than or equal to zero. 2014-11-18 20:33:44 -05:00
Taylor Griffin
c83b01bbb7 catch up with dev 2014-11-18 22:59:43 +11:00
Taylor Griffin
fb595de457 edited configuration and dependencies 2014-11-18 22:24:58 +11:00
Taylor Griffin
acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin
98c1680138 handle misc deprications 2014-11-17 07:16:02 +11:00
Taylor Griffin
0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Taylor Griffin
56b4f8a221 mimick old FriendlyId behavior when calling find on a model - therefore, Model.find not Model.friendly.find (this probably needs review) 2014-11-16 20:21:34 +11:00
Taylor Griffin
f1945151c7 update RSpec true / false matchers 2014-11-16 14:40:50 +11:00
Taylor Griffin
cc31e864d5 update webrat and webrat matchers 2014-11-16 14:31:33 +11:00
Taylor Griffin
868e5c2079 upgrade jquery-ui-rails gem and config 2014-11-16 12:41:57 +11:00
Taylor Griffin
70185156aa use lambda instead of just relation in names scope 2014-11-16 12:11:56 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Skud
93e468876d Remove old capistrano stuff, as we don't use it anymore 2014-11-16 10:17:22 +11:00
Skud
52cfa9f676 Changed staging environment hostname to staging.growstuff.org 2014-11-16 10:16:34 +11:00
Taylor Griffin
8e79199766 wip: upgrading rspec 2014-11-15 22:55:37 +11:00
Taylor Griffin
40a88b5b09 tests run but fail like whoa 2014-11-15 21:44:55 +11:00
Kevin Rio
65706f560b Add test to new edit seed link 2014-11-14 16:37:55 -05:00
Taylor Griffin
7d27251be3 Merge pull request #449 from Skud/login_timeout 
Increase devise timeout to 30 days
 2014-11-13 22:14:29 +11:00
Yoong Kang Lim
bd8be01ec7 Merge branch 'dev' into editprofile 
Conflicts:
	CONTRIBUTORS.md
 2014-11-13 21:38:05 +11:00
Yoong Kang Lim
3dbb585467 Removed edit profile button from home page 
Added yoongkang to the contributors list

Feature test for edit profile button on homepage
 2014-11-13 21:28:15 +11:00
Skud
bfce66a8f7 Increase devise timeout to 30 days 2014-11-13 11:28:14 +11:00
Skud
f56c184033 Merge branch 'tygriffin-finish-plantings-javascript' into dev 2014-11-13 10:58:06 +11:00
Skud
68dfdbeba1 Merge branch 'finish-plantings-javascript' of github.com:tygriffin/growstuff into tygriffin-finish-plantings-javascript 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-11-13 10:57:55 +11:00
Skud
0ffa3a6d0f Merge pull request #438 from tygriffin/byebug 
replace debugger with byebug
 2014-11-13 10:51:53 +11:00
Taylor Griffin
c6f56a23d6 Adds binstubs for rails and rake 2014-11-13 07:26:10 +11:00
Kevin Rio
8d74fd52db Rearrange titles on RSS feeds 
https://www.pivotaltracker.com/n/projects/646869/stories/50492161
 2014-11-12 13:54:01 -05:00
Yoong Kang Lim
77f40a3dc2 Fixed comment + code style 2014-11-13 02:10:54 +11:00
Kevin Rio
43fa356670 Add edit button to seeds index page 
https://www.pivotaltracker.com/n/projects/646869/stories/53958137
 2014-11-12 09:56:05 -05:00
Yoong Kang Lim
03fea2a785 Remove dependent detroy as this wipes out both users. Woops. 2014-11-13 01:52:43 +11:00
Yoong Kang Lim
e687bd43dc Added model tests for follows 2014-11-13 01:22:28 +11:00
Yoong Kang Lim
b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +11:00
Skud
1749bc52f8 Merge pull request #446 from krio/switch-activity-contact 
Switch "activity" and "contact" on member profile page
 2014-11-12 17:59:37 +11:00
Kevin Rio
b6d2a078b1 Adding to contributors list 2014-11-11 23:28:22 -05:00
Kevin Rio
7023b4969b Update position of activity on member details page 
Switched activity and contact.
 2014-11-11 22:42:01 -05:00
pozorvlak
f233d502f7 Merge pull request #445 from yoongkang/plantingsfix 
Plantings index should display finished at date instead of planted at under the finished column
 2014-11-11 20:55:23 +00:00
Yoong Kang Lim
3c3eb1fd78 Fixed/improved method in member model 2014-11-12 01:53:47 +11:00
Yoong Kang Lim
cacc002a01 Added follow/unfollow buttons 2014-11-12 01:47:26 +11:00
Yoong Kang Lim
a9fdab5d7c Basic follower relationship 2014-11-12 00:23:01 +11:00
Yoong Kang Lim
caad748d08 Plantings index should display finished at date instead of planted at under the finished column. 
Added feature test for plantings index page.
 2014-11-11 22:41:29 +11:00