mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 05:31:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,115 Commits 62 Branches 76 Tags
release21
Commit Graph

66 Commits

Author SHA1 Message Date
Harry Brodsky
23c0f901c6 Add name to CONTRIBUTORS.md 2017-03-30 19:15:48 +13:00
Shiny
40e4f8df8a Merge branch 'dev' into add-contributor-megan 2017-03-16 14:59:26 +13:00
Arun Kumar
f7ec1826b0 Use presence instead of regex validation 2017-03-16 13:27:13 +13:00
Shiny
d619cd160d Added Megan to contributors 2017-03-16 13:04:31 +13:00
Thomas Countz
fa49234669 remove "add new garden" on other member's page (#1283) 
* update garden#show view logic
* added name to contributors
Closes #1167
 2017-03-15 23:06:32 +13:00
Miles Gould
c9558be2d3 Add deppbot to CONTRIBUTORS.md 
This prevents deppbot-generated pull requests from failing the "are you
in CONTRIBUTORS.md?" check in CI.
 2017-03-04 16:16:28 +13:00
pozorvlak
f8b84f390d Calculate "count_uses_of_property" using DB query (#1183) 
* Refactor 'count_uses_of_property' method in crop model
* Add check for nil column value

* Add @alran to CONTRIBUTORS.md

* Reformat Crop#count_uses_of_property

* Remove unnecessary string interpolation
 2017-02-05 13:23:47 +13:00
Brenda Wallace
6e0e7e4de1 Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs 
Conflicts:
	CONTRIBUTORS.md
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/crops.js.erb
	app/views/crops/show.html.haml
 2016-12-07 11:17:30 +13:00
Jim Stallings
e939be05f8 Add myself to contributors 2016-12-02 15:35:13 +10:30
Brenda Wallace
d091aecaf1 Use https for contributor link 
Hoping this will fix the failing contributor error
 2016-11-13 10:46:46 +13:00
Brenda Wallace
7c1040e7aa Corrected contributor name 2016-09-19 21:51:13 +12:00
Brenda Wallace
370f407ad6 Adding Brenda Wallace to contributors 2016-09-13 19:25:22 +12:00
polveenomials
85ff36198b Added name to the CONTRIBUTORS.md 2016-08-04 14:27:49 +08:00
Charley Lewittes
d8f2c580ee added myself to contributors list 2016-06-21 13:14:26 -04:00
pozorvlak
a66a040207 Revert "Handled Issue #950 (Branded Error Pages)" 2016-06-16 12:58:22 +01:00
Prashanth
483143f2fe Merge branch 'growstuff-dev' into dev 
Conflicts:
	CONTRIBUTORS.md
 2016-06-14 17:09:06 +05:30
Prashanth
b9f40151d8 Handled Issue #950 (Branded Error Pages) 
Moved error related views from public to errors (asset pipeline can be used).
Header and footer were included along with the error message.
 2016-06-10 18:35:48 +05:30
Lucas Nogueira
b8b0d98e07 Update the contributors list 2016-06-08 22:06:26 -03:00
Miles Gould
4fa2e273aa Merge remote-tracking branch 'origin/pr/933' into dev 2016-05-31 15:48:17 +01:00
DV Dasari
e2053e2f8b adding me to CONTRIBUTORS.md 2016-05-31 07:33:40 -05:00
Eric Tillberg
31f0052b9d added to contributors list 2016-05-31 06:49:17 -04:00
twconquest
24df32ba7f Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md 
Conflicts:
	CONTRIBUTORS.md
 2015-08-17 17:48:50 +00:00
Daniel O'Connor
e765387e22 Update CONTRIBUTORS.md 2015-08-11 10:31:43 +09:30
twconquest
e7d2ae2c40 Add myself to CONTRIBUTORS.md 2015-07-28 19:50:35 +00:00
Anthony Atkinson
fa8b10af58 New contributor! 2015-07-22 10:37:54 -04:00
AELOGICA
7748c40ccf Added jacarandang to contributors 2015-07-17 09:16:31 +08:00
Miles Gould
897eac4fae Merge branch 'pr/727' into dev 2015-07-17 00:31:00 +01:00
Miles Gould
41ab646b20 Added @manmeetsingh to CONTRIBUTORS.md 2015-07-16 23:58:57 +01:00
Miles Gould
3259291eea Merge remote-tracking branch 'upstream/pr/698' into dev 2015-07-08 23:20:16 +01:00
Katy Ereira
9304e44c08 Add Maccath tnd CjayBillones to contributors list 2015-07-03 08:45:16 +08:00
AELOGICA
9bd7448ae6 Added the feature test for searching places 2015-06-26 09:17:08 +08:00
Miles Gould
5bb04dc1a4 Merge branch 'pr/745' into dev 2015-06-16 19:54:33 +01:00
Andrey
4cb3444dcd Adding myself to contributors 2015-06-09 17:47:21 +10:00
Mauricio
e3a620a109 [#478] autofocus subject input 2015-06-02 23:21:18 -06:00
Mackenzie Morgan
38dbdc8307 Moving myself (maco) to the committer section, since I was given commit bit a couple months back 2015-05-20 17:08:21 -04:00
Jake Yesbeck
c1ab161b89 Added self to Contributors.md per guidelines 2015-05-05 09:18:32 -07:00
Gabrielle DeWitt
81d2f9829e Updated Contributors 2015-04-04 12:01:51 -07:00
Marlena Compton
39feeb94d0 merge in changes from dev branch 2015-02-10 06:28:47 -08:00
Savant Krishna
e17a3a2ab1 Addition to Contributors list 2015-02-09 17:47:31 +11:00
Robert Landreaux
e4072fb395 write 'crop_wrangling_button_spec.rb', fix previous issue 2015-01-18 23:25:38 -05:00
Miles Gould
c7bcbf6323 Update CONTRIBUTORS.md with the current committers 2015-01-15 14:49:12 +00:00
Rocky Jaiswal
1e331fc19d adding rocky jaiswal in contributors. 2015-01-15 15:25:42 +01:00
Marlena Compton
5f435b1e82 fix conflict in contributors file 2014-12-14 10:15:05 -08:00
Marlena Compton
f608685ac8 add names to contributors 2014-12-12 13:36:11 -08:00
Skud
82b70cf893 Merge branch 'facebook_button' of https://github.com/juzham/growstuff into juzham-facebook_button 
Conflicts:
	CONTRIBUTORS.md
 2014-12-13 08:26:07 +11:00
Justin Hamman
6b0a298fd1 modified order and text for Facebook 2014-12-12 23:33:53 +11:00
Skud
b520f9e78b Update CONTRIBUTORS.md 
Removed duplicate contributor
 2014-12-12 18:43:42 +11:00
Kevin Yang
7f88157696 removed whitespace 2014-12-09 14:11:29 +00:00
Kevin Yang
5e2a3db8c2 Added myself to Contributors.md 2014-12-09 20:44:46 +11:00
Yoong Kang Lim
bd8be01ec7 Merge branch 'dev' into editprofile 
Conflicts:
	CONTRIBUTORS.md
 2014-11-13 21:38:05 +11:00