13034 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anthony Atkinson	9c469fb217	.gitignore additions for users of Rubymine.	2015-07-22 10:05:04 -04:00
pozorvlak	6b944e145e	Merge pull request #778 from GabrielSandoval/gab/names ... Added multiple forms for scientific and alternate names on crop creation (Fixes #615)	2015-07-17 20:25:04 +01:00
AELOGICA	7748c40ccf	Added jacarandang to contributors	2015-07-17 09:16:31 +08:00
Jace Monje	745281545a	added test for role checking on view	2015-07-17 09:06:18 +08:00
AELOGICA	7b3aefacd3	Hidden the +/- buttons by dby default, making them visible via JavaScript code.	2015-07-17 07:55:03 +08:00
AELOGICA	134465d023	Fixed feature errors and removed failing deprecated tests	2015-07-17 07:31:53 +08:00
AELOGICA	a581b759a3	Added tests for creating crops with multiple scientific and alternate names	2015-07-17 07:31:53 +08:00
AELOGICA	734b57e395	Fixed feature test errors	2015-07-17 07:31:53 +08:00
AELOGICA	12d151b68c	Added multiple forms for scientific and alternate names on crop creation	2015-07-17 07:31:51 +08:00
AELOGICA	472acd0e81	Polished UI of added forms for alternate names	2015-07-17 07:31:51 +08:00
AELOGICA	7f88b167b4	Added dynamic adding and removing additional scientific names	2015-07-17 07:31:51 +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
pozorvlak	8c017b24e0	Merge pull request #774 from jacarandang/signout ... [#568] Signout redirects to last page visited	2015-07-16 23:22:03 +01:00
pozorvlak	12e3351c77	Merge pull request #777 from GabrielSandoval/gab/member_links ... Added link to owner's profile from seeds', plantings', and harvests' index page (Fixes #569)	2015-07-16 23:14:44 +01:00
AELOGICA	85e4708b71	Changed plantings_by_owner_path to seeds_by_owner_path on misc_seeds_spec.rb	2015-07-16 08:06:01 +08:00
AELOGICA	0816b6b114	Added link to owner's profile from seeds', plantings', and harvests' index	2015-07-13 10:42:06 +08:00
Jym Paul A. Carandang	91b5c3e798	Added test for signount redirection	2015-07-13 09:52:05 +08:00
Miles Gould	fc1dc0e4c3	Remove unused Planting#interesting? method.	2015-07-11 14:32:27 +01:00
Miles Gould	9e7957709d	Remove BUNDLED BY line from Gemfile.lock ... This keeps getting removed by some automatic process, and it's cluttering up my `git diff` output.	2015-07-11 14:32:27 +01:00
Miles Gould	492bdd915f	Move the rest of Planting.interesting into the DB ... We could maybe make it a scope at this point...	2015-07-11 14:32:27 +01:00
Miles Gould	07c976b1fc	Filter plantings-with-photos in the DB, not Ruby.	2015-07-11 14:32:27 +01:00
Miles Gould	2faada7f14	Find interesting crops using DB queries	2015-07-11 14:32:27 +01:00
pozorvlak	133a67a8f2	Merge pull request #764 from GabrielSandoval/gab/places ... Fixes #720 - Places show nearby seeds, members, and plantings.	2015-07-10 16:26:25 +01:00
pozorvlak	16dd1e5183	Merge pull request #772 from GabrielSandoval/gab/planting_icons ... Added sunniness icons on plantings/_thumbnail and show page	2015-07-10 13:04:23 +01:00
AELOGICA	4193e38034	Fixed feature test errors on garden/show page.	2015-07-10 15:43:08 +08:00
AELOGICA	9eaaa8856f	Added row divs for members/_gardens, gardens/show, planting/index page.	2015-07-10 15:27:34 +08:00
AELOGICA	3ea9f2b5f2	Applied the responsive planting thumbnail to plantings/index page.	2015-07-10 15:18:39 +08:00
AELOGICA	723329ac49	Made the plantings/_thumbnail partial flexible for small and large screen sizes.	2015-07-10 15:11:15 +08:00
AELOGICA	89424b931b	Replaced 'sunniness_not specified.png' icon with a darker one.	2015-07-10 13:17:43 +08:00
Jym Paul A. Carandang	9f3d3b2b8f	Signout redirects to last page visited	2015-07-10 12:51:36 +08:00
AELOGICA	80c1e1bf23	Removed the column headers of planting thumbnails.	2015-07-10 11:25:05 +08:00
AELOGICA	01e676678c	Removed the '#' column on plantings/_thumbnail partial.	2015-07-10 11:25:05 +08:00
AELOGICA	43d7c36fc5	Created feature tests for showing nearby plantings, seeds, and members on search	2015-07-10 11:25:05 +08:00
AELOGICA	6a6f83c6a4	Added feature request #720	2015-07-10 11:25:05 +08:00
gabrielsandoval	f73bb81eb6	Made sunniness icons transparent	2015-07-10 11:17:11 +08:00
AELOGICA	0407df880b	Added feature tests for sunniness icons for plantings page.	2015-07-10 11:17:11 +08:00
AELOGICA	20219e23dc	Added sunniness icons on plantings/_thumbnail and show page	2015-07-10 11:17:11 +08:00
pozorvlak	49bbbeb431	Merge pull request #769 from jacemonje/new-navbar ... Redesigned the navbar	2015-07-10 00:24:57 +01:00
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
Jace Monje	fa0cb55789	fixed errors in tests	2015-07-09 08:01:58 +08: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