mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 22:27:18 -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
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
Jace Monje
7232f4614c refactored tests 
fixed tests
 2015-07-09 07:37:29 +08:00
Jace Monje
b9a29115a2 new navbar 2015-07-09 07:14:49 +08: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
Jace Monje
8c1d88b663 added the admin/wrangler role check on member profile page 2015-07-08 12:07:37 +08: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