mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-13 02:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,118 Commits 57 Branches 82 Tags
d07c97b6a67dbedd5b75fd57ee2fa9789bd4df8a
Commit Graph

2979 Commits

Author SHA1 Message Date
Brenda Wallace
d07c97b6a6 Add filters for the members api 2019-03-20 15:01:33 +13:00
Brenda Wallace
0c868d3edb Merge branch 'dev' into photos/seeds 2019-02-16 12:37:53 +13:00
Brenda Wallace
d3a542727c Fixing crop deleting and adding tests 2019-02-15 08:45:18 +13:00
Brenda Wallace
1441850cd6 Merge branch 'dev' into photos/seeds 2019-02-13 13:59:14 +13:00
Brenda Wallace
3722672869 Merge branch 'dev' into photos/seeds 2019-02-13 09:06:42 +13:00
Brenda Wallace
fa00262f80 Merge branch 'dev' into crops-show 2019-02-13 09:04:51 +13:00
Brenda Wallace
bd86f7372e Merge branch 'dev' into garden-overview 2019-02-12 21:50:51 +13:00
Brenda Wallace
f57a423c29 Merge branch 'dev' into crops-show 2019-02-12 21:50:05 +13:00
Brenda Wallace
5930334bd6 Merge branch 'dev' into photos/seeds 2019-02-12 21:49:43 +13:00
ImgBotApp
94403ab5a6 [ImgBot] Optimize images 
*Total -- 299.13kb -> 245.06kb (18.08%)

/app/assets/images/sunniness_shade.png -- 9.28kb -> 4.27kb (53.98%)
/app/assets/images/blog_32.png -- 5.04kb -> 2.45kb (51.35%)
/app/assets/images/sunniness_semi-shade.png -- 14.52kb -> 7.43kb (48.84%)
/app/assets/images/sunniness_not specified.png -- 15.76kb -> 8.17kb (48.16%)
/app/assets/images/sunniness_sun.png -- 5.77kb -> 3.59kb (37.69%)
/app/assets/images/placeholder_150.png -- 2.44kb -> 1.52kb (37.62%)
/app/assets/images/growstuff-brand.png -- 8.05kb -> 6.45kb (19.94%)
/app/assets/images/flickr_32.png -- 2.47kb -> 2.04kb (17.37%)
/app/assets/images/location-not-set.en.png -- 22.23kb -> 19.55kb (12.04%)
/app/assets/images/facebook-login-splash.png -- 176.17kb -> 155.21kb (11.9%)
/app/assets/images/email_32.png -- 1.07kb -> 0.94kb (11.55%)
/app/assets/images/facebook-thumbnail.png -- 19.48kb -> 17.48kb (10.26%)
/app/assets/images/growstuff-apple-touch-icon-precomposed.png -- 10.37kb -> 9.48kb (8.62%)
/app/assets/images/rails.png -- 6.49kb -> 6.47kb (0.33%)
 2019-02-12 21:49:11 +13:00
Brenda Wallace
80f0f41026 removed commented out code 2019-02-12 11:51:16 +13:00
Brenda Wallace
1dfad812a1 Javascript lint 2019-02-12 11:41:40 +13:00
Brenda Wallace
7a4121bf3f Added missing semicolon 2019-02-12 11:41:33 +13:00
Brenda Wallace
fb6a270fa6 Tidy up crop predictions display 2019-02-10 21:51:06 +13:00
Brenda Wallace
572af9d135 Merge branch 'dev' into photos/seeds 2019-02-09 17:00:58 +13:00
Brenda Wallace
93835b3ee6 Javascript lint 2019-02-09 15:21:30 +13:00
Brenda Wallace
63b8554435 Added missing semicolon 2019-02-09 15:16:53 +13:00
Brenda Wallace
18d7ae2953 Further tidy up of the planting quick action buttons 2019-02-09 14:24:51 +13:00
Brenda Wallace
ec4b443d8c Tool tips 2019-02-09 14:13:07 +13:00
Brenda Wallace
50751611fa Tidy up where badges appear 2019-02-09 14:12:45 +13:00
Brenda Wallace
fc95a3c4e1 Moved planting css to own file 2019-02-09 14:12:30 +13:00
Brenda Wallace
dfe67d5308 Move thumbnail title up a bit 2019-02-09 12:13:22 +13:00
Brenda Wallace
aa8ed5bb3a Fix up translation on badges 2019-02-09 11:47:13 +13:00
Brenda Wallace
fcd147412c Tidy up display on gardens#index 2019-02-09 11:47:13 +13:00
Brenda Wallace
9a4f1058e1 Adding more attributes and filters to the api 2019-02-09 08:43:59 +13:00
Brenda Wallace
e446c14bd7 Use the new Photo.by_cropscope on photos controller 2019-02-05 12:44:34 +13:00
Brenda Wallace
6167af700d Rubocop lint tidy 2019-02-05 12:37:09 +13:00
Brenda Wallace
9c4e649c5d Split up photos on crops#show by model type 2019-02-05 12:31:59 +13:00
Brenda Wallace
18ab0c8697 Add photos back into crop resources 2019-02-05 10:22:58 +13:00
Brenda Wallace
b61c2290be Removed unnecesary helper wrapper 2019-02-04 22:15:18 +13:00
Brenda Wallace
1ead9e333b Fixed up planting_status when planting no planted yet 2019-02-04 21:55:23 +13:00
Brenda Wallace
dd38a69be7 Fixed up planting status text to match tests 2019-02-04 21:52:13 +13:00
Brenda Wallace
d2c63db59b Translate planting status 2019-02-04 21:42:54 +13:00
Brenda Wallace
6a1954b1e7 added dependent: destroy 2019-02-04 21:22:19 +13:00
Brenda Wallace
b29c830f65 Merge branch 'dev' into photos/seeds 2019-02-04 21:17:08 +13:00
Brenda Wallace
81c899079e Removed commented out code 2019-02-04 20:57:35 +13:00
Brenda Wallace
f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace
5822764c1d Fetch photos in the controller 2019-02-04 20:52:13 +13:00
Brenda Wallace
42de920352 Removed display of status 2019-02-04 20:44:20 +13:00
Brenda Wallace
ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +13:00
Brenda Wallace
dbf707d80e Crops have seeds 2019-02-04 20:32:23 +13:00
Brenda Wallace
e8ac207fa7 Save the crop on the photo association 2019-02-04 20:32:11 +13:00
Brenda Wallace
a9ca12c1c5 Method to find planting photos only 2019-02-04 19:39:44 +13:00
Brenda Wallace
87d2c8b4c8 Fixed bug - look up photos by crop 2019-02-04 19:39:21 +13:00
Brenda Wallace
e3a0de081e Merge branch 'dev' into photos/seeds 2019-01-30 16:46:42 +13:00
Brenda Wallace
41082b31a9 Merge branch 'dev' into fix/recent-harvests 2019-01-30 16:44:47 +13:00
Brenda Wallace
3d3d1407cd Fixed link in global actions 2019-01-27 18:28:42 +13:00
Brenda Wallace
ea35816654 Fix ordering of recent harvests 2019-01-27 18:12:37 +13:00
Brenda Wallace
32b2cbd921 Merge branch 'button-translate' into routes-tidy-up 
Conflicts:
	app/views/crops/_search_bar.haml
	app/views/layouts/application.html.haml
 2019-01-24 13:49:53 +13:00
Brenda Wallace
986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 
Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb
 2019-01-24 13:48:36 +13:00