mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-30 20:20:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,011 Commits 62 Branches 76 Tags
2f5de1f98e3791870561663dfb4daff2e46a48fc
Commit Graph

2937 Commits

Author SHA1 Message Date
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
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
Brenda Wallace
fc6183eb52 DRY actions more 2019-01-24 13:46:35 +13:00
Brenda Wallace
f6deaffb94 Fixed nested row on layout, that was breaking photo add page 2019-01-24 12:17:40 +13:00
Brenda Wallace
d73f8716c0 Include font awesome (so specs pass) 2019-01-24 12:17:40 +13:00
Brenda Wallace
e202c73584 Update buttons_helper.rb 2019-01-24 12:17:40 +13:00
Brenda Wallace
8bfe3278cc Include icon helper from button helper 2019-01-24 12:17:40 +13:00
Brenda Wallace
a54db7d5ff Tidied up the planting actions on gardens#index 2019-01-24 12:17:40 +13:00
Brenda Wallace
80e0d964e1 indentation clean up 2019-01-24 12:17:40 +13:00
Brenda Wallace
5218685bd9 Tidy up member edit buttons 2019-01-24 12:17:40 +13:00
Brenda Wallace
94a5411a79 Wider action bar 2019-01-24 12:17:40 +13:00
Brenda Wallace
88a277c6ed Move consistent icons 2019-01-24 12:17:40 +13:00
Brenda Wallace
e912211cee DRY the icons 2019-01-24 12:17:40 +13:00
Brenda Wallace
2380d62258 Use new finish button on planting badges 2019-01-24 12:17:40 +13:00
Brenda Wallace
81ee8ec56e Add crop name to actions 2019-01-24 12:17:40 +13:00
Brenda Wallace
2a98cefedb Copy finish planting from view to helper 2019-01-24 12:17:40 +13:00
Brenda Wallace
33ad133665 Revert modifications to menu 2019-01-24 12:17:40 +13:00
Brenda Wallace
ca75b1c852 Use button helper for crop wrangling 2019-01-24 12:17:40 +13:00
Brenda Wallace
97675868bd Fixed button link, using translation that exists 2019-01-24 12:17:40 +13:00
Brenda Wallace
424866b733 Add "something" to global action labels 2019-01-24 12:17:40 +13:00
Brenda Wallace
761a0b4142 Always use the helper for add_photo buttons 2019-01-24 12:17:40 +13:00
Brenda Wallace
9130b44fb9 Rubocop fixup 2019-01-24 12:17:40 +13:00
Brenda Wallace
a95c3a988c DRY the add photo buttons 2019-01-24 12:17:40 +13:00
Brenda Wallace
22e50aa618 DRY the edit buttons 2019-01-24 12:17:40 +13:00
Brenda Wallace
ad001767e2 Move seed buttongs to buttons helper 2019-01-24 12:17:40 +13:00
Brenda Wallace
b58e0cf3ce Moved garden actions code to top of view 2019-01-24 12:17:40 +13:00
Brenda Wallace
8ae062fe9b Added missing harvest actions 2019-01-24 12:17:40 +13:00
Brenda Wallace
c811ab1f51 Moved harvest buttons to match other #show pages 2019-01-24 12:17:40 +13:00
Brenda Wallace
8270611f0c Removed un-used viewss 2019-01-24 12:17:40 +13:00
Brenda Wallace
02d4d12582 suffix _button to button helpers 2019-01-24 12:17:40 +13:00
Brenda Wallace
dfd7765c47 Rubocop fix ups 2019-01-24 12:17:40 +13:00
Brenda Wallace
e2a0278e40 Use same t() for the button for writing blog posts 2019-01-24 12:17:40 +13:00
Brenda Wallace
313a18db08 Titles of pages consistent with buttons to pages 2019-01-24 12:17:40 +13:00
Brenda Wallace
67e58fe901 Moving buttons to the right of page (with translations) 2019-01-24 12:17:40 +13:00
Brenda Wallace
b86e6e6dab More translations in garden actions 2019-01-24 12:17:40 +13:00
Brenda Wallace
de3c7fb1c5 Move homepage title to the :title content 2019-01-24 12:17:40 +13:00
Brenda Wallace
ba38637392 Wrapping crop actions in btn-group 2019-01-24 12:17:40 +13:00