mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 23:27:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

4522 Commits

Author SHA1 Message Date
Brenda Wallace
8db6d06283 Restoring colours 2019-05-14 20:36:20 +12:00
Brenda Wallace
e029425785 Lint 2019-05-13 07:58:05 +12:00
codefactor-io
69531f232d [CodeFactor] Apply fixes 2019-05-12 19:56:07 +00:00
Brenda Wallace
f47b22505c Comment out global actions until it is prettier 2019-05-13 07:53:08 +12:00
Brenda Wallace
f5d48d1b56 Removing bootstrap 3 - only bootstrap 4 
because both isn't particularly clever
 2019-05-13 07:52:38 +12:00
Brenda Wallace
75f14aecc0 Crop page tidy 2019-04-30 13:15:19 +12:00
Brenda Wallace
126769bfad Remove jquery roadmap 2019-04-30 13:14:24 +12:00
Brenda Wallace
0c61e72f86 Use full size crop images 2019-04-29 18:36:28 +12:00
Brenda Wallace
6dbf7a7932 Fix typo 2019-04-29 18:26:07 +12:00
Brenda Wallace
0c81f962aa homepage tidy 2019-04-29 18:16:14 +12:00
Brenda Wallace
d400e73ff6 Move global actions 2019-04-29 15:31:47 +12:00
Brenda Wallace
3cb6fb90f7 Fix crop display 2019-04-29 15:31:39 +12:00
Brenda Wallace
d039c68f8a Tidy up crops#index on mobile 2019-04-27 20:49:17 +12:00
Brenda Wallace
9ecf210ffb More form tidy up 2019-04-27 19:19:42 +12:00
Brenda Wallace
945d320a0a Remove the title from every page - because sometimes we don't want it 2019-04-27 19:11:49 +12:00
Brenda Wallace
eabf1fc659 Tidy up (most) forms 2019-04-27 19:11:30 +12:00
Brenda Wallace
83038fc4f3 More rounded photos 2019-04-26 22:03:56 +12:00
Brenda Wallace
9524899f78 tidy up harvests #index 2019-04-26 22:03:49 +12:00
Brenda Wallace
2db8dcf7c1 Pretty rounded images 2019-04-26 22:03:30 +12:00
Brenda Wallace
31bcb35fb4 Don't turn crop images into circles 2019-04-26 22:03:20 +12:00
Brenda Wallace
f96b2ca661 Tidy columns on crops index card 2019-04-26 21:41:30 +12:00
Brenda Wallace
548e15a866 Tidy up Photos#show 2019-04-26 21:38:34 +12:00
Brenda Wallace
7c51d94dc0 More crops#show tidy up 2019-04-26 21:27:46 +12:00
Brenda Wallace
0871620c55 Tidy up finding seeds from crops#show 2019-04-26 21:27:35 +12:00
Brenda Wallace
6d8a9c3579 Move global actions 2019-04-26 17:54:52 +12:00
Brenda Wallace
4196ce9e6b Fix search 2019-04-26 17:35:22 +12:00
Brenda Wallace
b82c3b5b76 Tidy up seeds 2019-04-26 17:34:55 +12:00
Brenda Wallace
71cf334e03 Add back the link to crop seeds 2019-04-26 00:18:04 +12:00
Brenda Wallace
cf3477e333 Use full size image 2019-04-26 00:01:38 +12:00
Brenda Wallace
d5d9c805ad Shadows on the homepage 2019-04-25 23:51:53 +12:00
Brenda Wallace
3316514a7a More material bits 2019-04-25 23:41:34 +12:00
Brenda Wallace
bff809f482 Removed extra graphs on crops#show 2019-04-25 23:33:49 +12:00
Brenda Wallace
4918d0c950 Tidy up homepage 2019-04-25 23:28:41 +12:00
Brenda Wallace
7dd3f169ee Fixed haml error 2019-04-25 12:49:23 +12:00
Brenda Wallace
ab7eb913de removed git conflict marker 2019-04-25 12:47:24 +12:00
Brenda Wallace
5ad741ad7b Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	app/views/members/_avatar.html.haml
 2019-04-25 12:36:01 +12:00
Brenda Wallace
e9cbda13b3 Adding viewing own data 2019-04-23 10:44:36 +12:00
Brenda Wallace
0491820a35 Only show planted_at if it is set 2019-04-21 22:31:54 +12:00
Brenda Wallace
64877fe2ac more tidy up of password reset form 2019-04-21 19:07:33 +12:00
Brenda Wallace
9dfe4d5b2d More form tidy up 2019-04-21 15:24:45 +12:00
Brenda Wallace
ee03b57d89 Tidy up sign up form 2019-04-21 15:04:35 +12:00
Brenda Wallace
e6e50a3a42 Turn the plantings facts into cards with drop shadow 2019-04-21 14:02:04 +12:00
Brenda Wallace
730c2b79f7 Tidy up forgot password page 2019-04-21 14:01:45 +12:00
Brenda Wallace
ba3ee3a9f0 Tidy up login form 2019-04-21 13:55:45 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
7b56c7a6ab Merge branch 'dev' into UTFGardenNames 2019-04-20 20:17:52 +12:00
Brenda Wallace
4312ef0047 FIX typo in view 2019-04-20 20:07:19 +12:00
Brenda Wallace
9ee3f514cd Adding trailing comma 
because codeclimate likes them
 2019-04-20 20:01:34 +12:00
Brenda Wallace
a2f9f2f6df Replace (revert back) to simple image_tag in photos#show 
so i don't need to update specs
 2019-04-20 19:56:23 +12:00
Brenda Wallace
e2f3723777 Remove 2019-04-20 15:14:43 +12:00