Commit Graph

3490 Commits

Author SHA1 Message Date
Brenda Wallace
4845211429 Merge branch 'dev' into post-photos 2019-07-08 17:07:45 +12:00
Brenda Wallace
680111add7 Merge branch 'dev' into post-photos 2019-07-08 17:06:04 +12:00
ImgBotApp
770c6f45fd [ImgBot] Optimize images
/app/assets/images/placeholder_600.png -- 31.66kb -> 29.12kb (8.03%)
2019-07-08 04:43:51 +00:00
Brenda Wallace
6d7b990797 Remove unused rails.png 2019-07-08 04:43:03 +00:00
Brenda Wallace
f7af2bf816 Higher res photo placeholder 2019-07-08 04:43:03 +00:00
Daniel O'Connor
cf0d648b31 Merge branch 'dev' into post-photos 2019-07-08 13:45:26 +09:30
Daniel O'Connor
76c18014e2 Merge pull request #2042 from Br3nda/active-gardens
only show active gardens on planting form
2019-07-08 13:40:08 +09:30
Brenda Wallace
0a030c56bb files should end with a new line 2019-07-08 04:08:58 +00:00
Brenda Wallace
bbd43f57bc Prevent post images going off screen 2019-07-08 04:08:58 +00:00
Brenda Wallace
9c25fd043f only show active gardens on planting form 2019-07-08 13:24:27 +12:00
Brenda Wallace
5cef4d728c Adding photos directly to a post 2019-07-08 13:20:57 +12:00
Brenda Wallace
cc271b2cc3 Back out the max homepage items change 2019-07-06 11:16:21 +00:00
Brenda Wallace
eda77365a5 truncate long locations 2019-07-06 11:16:21 +00:00
Brenda Wallace
8528f80678 Layout fix up on hompage for large screens 2019-07-06 11:16:21 +00:00
Miles Gould
ba1512a85a Delete duplicate percentage_grown attribute
Fixes #2031
2019-07-05 10:49:29 +00:00
Brenda Wallace
cdc3be0414 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-05 10:05:44 +12:00
Brenda Wallace
136aff87ac Removign empty class in scss 2019-07-04 10:36:25 +00:00
Brenda Wallace
826c8845a2 Removing commented out cruft 2019-07-04 10:36:25 +00:00
Brenda Wallace
904e30c9dd Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 22:47:20 +12:00
Brenda Wallace
d53393b0ca Fix downcase 2019-07-03 09:39:32 +00:00
Brenda Wallace
ea18c722ef lower caseon pluralizing 2019-07-03 09:39:32 +00:00
Brenda Wallace
ac91450827 Fixes count on members'cards 2019-07-03 09:39:32 +00:00
Brenda Wallace
8b22004066 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 09:58:04 +12:00
Miles Gould
a18ff03599 Fix remaining uses of devise_error_messages! 2019-07-02 21:57:43 +00:00
Brenda Wallace
9e1415dedd fixes flex/wrap on home page members 2019-07-03 08:54:08 +12:00
Brenda Wallace
cc7ebf086f Merge remote-tracking branch 'origin/upgrade/bootstrap-43' into upgrade/bootstrap-43 2019-07-03 08:41:34 +12:00
Brenda Wallace
50945c6f75 Files should end with a trailing newline 2019-07-03 08:41:23 +12:00
Brenda Wallace
c791b21c47 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 08:41:01 +12:00
Brenda Wallace
8c02ea943a Tidy up photo display (line up) 2019-07-03 08:25:23 +12:00
Brenda Wallace
b90f6d5ff6 Tidy up facts on plantings#show 2019-07-03 08:20:58 +12:00
Brenda Wallace
036fea1c03 Fix scss compile error, by using our own variable 2019-07-03 08:16:46 +12:00
Brenda Wallace
13450f64ed Squish a devise deprecation warning 2019-07-02 09:41:40 +00:00
Brenda Wallace
5ad298e43a TYPO! 2019-07-02 04:52:39 +00:00
Brenda Wallace
fda4d88e5a Fix up locale spec 2019-07-02 04:52:39 +00:00
Brenda Wallace
d37c4139a6 Fixes error displaying plantings with no planted_at date 2019-07-02 04:52:39 +00:00
Brenda Wallace
8faa712e07 be_success -> be_successfull
fixes a deprecation warning
2019-06-27 22:26:15 +12:00
Brenda Wallace
fe7cb43c11 prettier links 2019-06-27 22:13:23 +12:00
Brenda Wallace
f1097e0f7c update photos spec 2019-06-27 22:13:09 +12:00
Brenda Wallace
66a0d8f2d0 only show info+pagination if there are results to show 2019-06-27 22:06:54 +12:00
Brenda Wallace
952c1b9a2a styled and moved the signin/signup prompts 2019-06-27 22:04:54 +12:00
Brenda Wallace
9e69f0aae3 photos as cards 2019-06-27 22:00:46 +12:00
Brenda Wallace
d4a4d61f6b tidy up photo display 2019-06-27 21:59:15 +12:00
Brenda Wallace
19085ed237 fixed link to harvest or plantings photos 2019-06-27 21:54:29 +12:00
Brenda Wallace
d1e7ba701b fixing mobile display 2019-06-27 21:48:48 +12:00
Brenda Wallace
677b82a3d0 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-27 21:23:52 +12:00
Brenda Wallace
70a69e7220 Update app/assets/stylesheets/_predictions.scss 2019-06-27 14:45:42 +12:00
Brenda Wallace
7f2afa718d Update app/assets/stylesheets/_predictions.scss 2019-06-27 14:45:22 +12:00
Brenda Wallace
dc6034c01b Update app/assets/stylesheets/_variables.scss 2019-06-27 14:45:06 +12:00
Brenda Wallace
99f97f51dc Update app/assets/stylesheets/_variables.scss 2019-06-27 14:43:38 +12:00
Brenda Wallace
3bcfc88856 Add title to page 2019-06-26 16:30:55 +12:00