Commit Graph

1511 Commits

Author SHA1 Message Date
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
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
3259291eea Merge remote-tracking branch 'upstream/pr/698' into dev 2015-07-08 23:20:16 +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
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
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
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
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
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
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
Maccath
3a9077050e Add placeholder to harvest screen's plant part select box. 2015-07-03 08:30:04 +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
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
Cjay Billones
bb88041fef [Refactoring] Replace .count and .length with .size for collections
Improved program efficiency (in querying in particular) by replacing .count and .length with .size for collections.

Fix error in refactoring

Reverted some .size into .count
2015-06-25 12:09:03 +08:00
AELOGICA
87f1c6c26d Added an alert for empty string search. 2015-06-23 14:33:13 +08:00
gabrielsandoval
0e2a5fd205 Added search form on the places index page. 2015-06-21 15:24:07 +08:00
Miles Gould
5bb04dc1a4 Merge branch 'pr/745' into dev 2015-06-16 19:54:33 +01:00
Mackenzie
7cedd98b71 Merge pull request #746 from achalc/fix-fb-thumbnail
added growstuff-apple-touch-icon-precomposed.png to meta partial
2015-06-13 00:22:45 -04:00
Mackenzie
2209d65aa6 Merge pull request #748 from wingyu/dev
Issue #713:  Added flash message when photos deleted
2015-06-12 23:50:11 -04:00
Vincent Wong
60df62f3fa added flash message when deleting messages 2015-06-06 14:36:03 +10:00
Mauricio
e3a620a109 [#478] autofocus subject input 2015-06-02 23:21:18 -06:00
Achal Channarasappa
3476d58642 added growstuff-apple-touch-icon-precomposed.png to meta partial 2015-06-02 20:52:03 -05:00
Andrey
e35ebab380 Reply to notification action 2015-05-27 11:56:24 +10:00
Shiho Takagi
3b42806b77 Modified wordings 2015-05-22 13:46:19 +10:00
Skud
8410b6db1e Merge pull request #700 from sksavant/photo_linkback
Linkbacks in photo view page to harvest and gardens
2015-05-20 10:08:33 +10:00
Skud
aef4800ad3 Merge pull request #737 from soborok/issue-610-solved
resolved issue-610 to display only active planting
2015-05-20 10:08:11 +10:00
Skud
9a2818baa9 Merge pull request #729 from oshiho3/621-crop-varieties-sidebar
#621 Crop varieties sidebar
2015-05-20 10:05:04 +10:00
Jake Yesbeck
0d55b54371 Use a constant for the default robots.txt filename 2015-05-05 09:05:00 -07:00
Jake Yesbeck
81ce6ed8a3 Make sure file exists before attempting to render it 2015-05-05 08:58:33 -07:00
Jake Yesbeck
0f8d1e7db1 Change the render to render the file directly
Also assert that the response is the actual file contents
instead of mocking the method call
2015-05-04 23:37:40 -07:00
Jake Yesbeck
507e5a0ebc Robots controller and custom robots.txt files
New route to /robots.txt and some specific logic to switch
on if the subdomain is staging or not.

Staging will not allow any crawlers at all, production does not
have any current limitations
2015-05-04 23:11:41 -07:00
soborok
76608a981c resolved issue-610 to display only active planting 2015-04-07 13:10:33 -05:00
Gabrielle DeWitt
88e8e3a59e Added Helper for See Who's Planted Link Text
Quantity and planted_from are not required
to add a planting. This change handles
the cases where one or both attributes are
missing.

Fixes #633
2015-04-04 11:51:59 -07:00
Korab Hoxha
bfb4053bb4 Change to "img-rounded" 2015-03-25 16:05:30 +01:00
Korab Hoxha
2aad8a0ed0 Change to "img-rounded" 2015-03-25 16:05:07 +01:00
Korab Hoxha
7c1cce40b2 Update leaflet_overrides.css.less 2015-03-25 15:50:43 +01:00
Mackenzie Morgan
bd0da36d63 reverse the rejection_explanation logic to not use != 2015-03-17 21:23:54 -04:00