2556 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pozorvlak	82bc07ccd0	Merge pull request #762 from CjayBillones/refactor-spec-models ... Refactor spec/models	2015-07-10 00:24:00 +01:00
Cesy	212651a279	Merge pull request #730 from korabh/dev ... Add background to thumbnails	2015-07-09 14:24:41 +01:00
Korab Hoxha	1568f4b7d8	Update _avatar.html.haml	2015-07-09 12:14:37 +02:00
Cesy	b7706d0064	Merge pull request #771 from pozorvlak/remove_release_8_tasks ... Remove one-off tasks that were run for Release 8.	2015-07-09 10:23:25 +01:00
Cesy	3a232e1d08	Merge pull request #708 from oshiho3/629-thumbnails-of-crops-on-post ... #629 Thumbnails of crops on post	2015-07-09 10:20:58 +01:00
Korab Hoxha	a27d273978	Remove 'img-rounded'	2015-07-09 02:27:07 +02:00
Korab Hoxha	4e7b0cf698	Remove img-rounded	2015-07-09 02:26:48 +02:00
Miles Gould	28ac7ff886	Remove one-off tasks that were run for Release 8. ... The ElasticSearch index task was run, but failed because we didn't have an ElasticSearch instance to run it against.	2015-07-09 01:06:39 +01:00
pozorvlak	42ffc49d74	Merge pull request #770 from pozorvlak/secret_token_for_staging ... Set staging secret key from environment	2015-07-09 00:54:56 +01:00
Miles Gould	d4d210447a	Set staging secret key from environment	2015-07-09 00:47:11 +01:00
Cjay	23dbfea05a	Fix spec/models/ability_spec.rb ... - Changed notification into a variable scope - Removed let(:cw_ability) and let(:admin_ability) and just used ability	2015-07-09 07:06:21 +08:00
Miles Gould	3259291eea	Merge remote-tracking branch 'upstream/pr/698' into dev	2015-07-08 23:20:16 +01:00
pozorvlak	0d0042dba8	Merge pull request #761 from CjayBillones/refactor-spec-support ... Refactor spec/support	2015-07-08 22:07:25 +01:00
pozorvlak	edcbc939e3	Merge pull request #728 from oshiho3/575-one-click-email-unsubscribe ... #575 One click email unsubscribe	2015-07-08 22:06:29 +01:00
Cjay	c568498941	Refactor spec/models ... - Changed before(:each) into let - Changed :admin_ability and :cw_ability into :ability	2015-07-09 02:21:10 +08:00
Cjay	c6c8492528	Fix changes in spec/support	2015-07-09 01:59:34 +08:00
Cesy	3420f18fb9	Merge pull request #703 from soborok/issue-610 ... resolved issue #610 to show only current plantings	2015-07-08 17:54:30 +01:00
Mackenzie	377a54e692	Merge pull request #765 from GabrielSandoval/gab/seeds ... Added feature and test for request displaying available seed count on crop page. Fixes #549	2015-07-08 11:23:01 -04:00
AELOGICA	c746c6d6d7	Added feature and test for request #549	2015-07-08 08:35:45 +08:00
AELOGICA	7607daa83a	Added feature and test for request #549	2015-07-08 08:16:32 +08:00
Miles Gould	f11c1b3d54	Merge branch 'pr/759' into dev	2015-07-08 00:32:02 +01:00
pozorvlak	fc44e87fb9	Merge pull request #763 from CjayBillones/refactor-spec-helpers ... Refactor spec/helpers	2015-07-07 11:56:52 +01:00
pozorvlak	ccc63381a6	Merge pull request #753 from CjayBillones/dev ... Show edited date/time on posts/comments and Show last login date on member profile	2015-07-07 11:30:08 +01:00
Mackenzie	9b64f5fec1	Merge pull request #758 from GabrielSandoval/gab/days_before_maturity ... Gab/days before maturity (#678) Thank you! That haml looks much better.	2015-07-06 22:31:45 -04:00
AELOGICA	e138b3e8ab	Converted html tables to CSS classes	2015-07-07 10:08:50 +08:00
AELOGICA	92db75b3d8	Converted the ul's in the plantings thumbnail partial to definition lists	2015-07-07 08:34:03 +08:00
AELOGICA	755a60447f	Made the plantings/_thumbnail partial to contain only a single object.	2015-07-07 08:20:43 +08:00
Gabriel	b599818512	Delete _thumbnail.html.haml_spec.rb	2015-07-07 08:20:43 +08:00
AELOGICA	0a2d0d499c	Removed unneeded methods on the plantings helper	2015-07-07 08:20:43 +08:00
AELOGICA	e638acd2de	Refactored further on plantings/show page	2015-07-07 08:20:43 +08:00
AELOGICA	8d5367be9a	Refactored code and replaced the plantings/tumbnail view.	2015-07-07 08:20:43 +08:00
AELOGICA	516274b2b7	Added feature more feature tests on plantings creation for progress bars' status	2015-07-07 08:20:43 +08:00
AELOGICA	f13a66391c	Fixed errors where progress bars does not show 100% when a planting is marked as finished.	2015-07-07 08:20:43 +08:00
AELOGICA	b01385a1e4	Added some tests on the days before maturity feature	2015-07-07 08:20:43 +08:00
AELOGICA	4ca4d6b030	Fixed error where progress bars do not change upon update	2015-07-07 08:20:43 +08:00
AELOGICA	3181c97a2a	Added the mark as finished button on the index page.	2015-07-07 08:20:42 +08:00
AELOGICA	372a7f080d	Added the days before maturity feature #678	2015-07-07 08:20:42 +08:00
Cjay Billones	29a8628c42	Refactor spec/helpers ... Change before(:each) into let in spec/helpers	2015-07-07 07:38:06 +08:00
pozorvlak	6d81ef198c	Merge pull request #760 from CjayBillones/refactor-rspec ... Refactor spec tests	2015-07-06 22:22:17 +01:00
Cjay Billones	e94cbcef02	Refactor spec ... Refactor spec by changing before(:each) into let	2015-07-06 10:56:31 +08:00
Katy Ereira	9304e44c08	Add Maccath tnd CjayBillones to contributors list	2015-07-03 08:45:16 +08:00
Maccath	3a9077050e	Add placeholder to harvest screen's plant part select box.	2015-07-03 08:30:04 +08:00
Cjay	64cf71ab4f	Fix test for comments	2015-07-02 19:01:32 +08:00
Cjay	3fb9283ca7	Add tests for posts	2015-07-02 18:54:17 +08:00
Cjay	a73d492062	Add tests for comment	2015-07-02 18:53:54 +08:00
Cjay	2528d8af8a	Show edited date/time on posts/comments	2015-07-02 18:53:18 +08:00
Cjay	10cb6c18aa	Show last login date on member profile	2015-07-02 18:52:11 +08:00
Cjay	34e61082b9	Add config/application.yml in gitignore ... Included config/application.yml in gitignore since it contains personal configuration of developer.	2015-07-02 18:51:05 +08:00
Cjay	b868364e96	Fix merge conflict in contributors	2015-07-02 18:50:30 +08:00
pozorvlak	45c0adb044	Merge pull request #757 from CjayBillones/code-refactoring ... [Refactoring] Replace .count and .length with .size for collections	2015-07-02 11:12:44 +01:00