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

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c94b026c58 solving rubocop dependencies errors 2019-06-27 21:33:25 +12:00
Brenda Wallace
8b3adcf7a7 Rubocop fix up 2019-06-27 21:26:35 +12:00
Brenda Wallace
b9e38719ce Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap 
Conflicts:
	Gemfile.lock
 2019-06-27 21:25:00 +12:00
Brenda Wallace
677b82a3d0 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-27 21:23:52 +12:00
dependabot-preview[bot]
1ae0558e4c Bump puma from 3.12.1 to 4.0.0 
Bumps [puma](https://github.com/puma/puma) from 3.12.1 to 4.0.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 02:48:00 +00: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
ea2e0697a7 Update Gemfile 2019-06-27 14:44:30 +12:00
Brenda Wallace
99f97f51dc Update app/assets/stylesheets/_variables.scss 2019-06-27 14:43:38 +12:00
Brenda Wallace
9dada23e42 Marking the tests that fail as pending 
Until we fix in chrome head less
 2019-06-27 14:31:22 +12:00
dependabot-preview[bot]
f2c6f27c10 Bump scout_apm from 2.5.0 to 2.5.1 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 19:25:47 +00:00
dependabot-preview[bot]
53636dc47a Bump rubocop from 0.71.0 to 0.72.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.71.0 to 0.72.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.71.0...v0.72.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 19:07:41 +00:00
Brenda Wallace
3bcfc88856 Add title to page 2019-06-26 16:30:55 +12:00
Brenda Wallace
1d98668ac4 scss lint 2019-06-26 16:21:59 +12:00
Brenda Wallace
88025b8a21 scss lint 2019-06-26 11:32:02 +12:00
Brenda Wallace
c60162e415 scss lint 2019-06-26 11:31:37 +12:00
Brenda Wallace
c702623c4f Prefer single quoted strings 2019-06-26 11:31:10 +12:00
Brenda Wallace
0324e515e0 scss lint 2019-06-26 11:30:47 +12:00
Brenda Wallace
3dac09968d Remove empty rule 2019-06-26 11:30:30 +12:00
Brenda Wallace
aa3297f4da scss lint 2019-06-26 11:29:41 +12:00
Brenda Wallace
a361e804ee scss lint 2019-06-26 11:27:19 +12:00
Brenda Wallace
db57432fee scss lint 2019-06-26 11:26:52 +12:00
Brenda Wallace
d955dea240 scss lint 2019-06-26 11:26:36 +12:00
Brenda Wallace
d5e22d3285 scss lint 2019-06-26 11:26:14 +12:00
Brenda Wallace
6634465c1f new line at end 2019-06-26 11:25:27 +12:00
Brenda Wallace
7a613b5dcc Merge scss 2019-06-26 11:25:10 +12:00
Brenda Wallace
b176ba59dc removed byline method 
avoiding use of htmlseafe
 2019-06-26 11:21:40 +12:00
Brenda Wallace
264506ef38 Move crop wrangling view test to feature spec 2019-06-26 11:16:41 +12:00
Brenda Wallace
382169b19c MAtch button label in spec 2019-06-26 11:13:21 +12:00
Brenda Wallace
ef43399ffd Match spec to page. h3 -> h5 2019-06-26 11:12:09 +12:00
Brenda Wallace
c540bd88fc add back a div the specs look for 2019-06-26 10:51:10 +12:00
Brenda Wallace
6383bd73d6 Tidy up display of member avatar on seeds 2019-06-26 10:22:32 +12:00
Brenda Wallace
38a0b76eaa add id to header search for input, so specs pass 2019-06-26 10:08:34 +12:00
Brenda Wallace
a3f25a4526 use another variable in scss 2019-06-26 10:08:19 +12:00
Brenda Wallace
c12f39d5d1 set ID on crop search form 2019-06-26 10:03:19 +12:00
Brenda Wallace
faefc0b293 the --rails flag isn't needed for rubocop anymore 2019-06-26 09:46:31 +12:00
Brenda Wallace
389b48d918 Use variables for scss colours 2019-06-26 09:45:01 +12:00
Brenda Wallace
6accfee811 Removed unnecsary colouring 2019-06-26 09:44:26 +12:00
Brenda Wallace
3488b29142 Removed empty rule 2019-06-26 09:43:57 +12:00
Brenda Wallace
db55432d31 SCSS lint fixes 2019-06-26 09:39:50 +12:00
Brenda Wallace
cc219a8aa2 remove commented out code 2019-06-26 09:39:01 +12:00
Brenda Wallace
a729a61f40 remove comments out styles 2019-06-26 09:37:54 +12:00
Brenda Wallace
3f59fe6bc7 style login buttons as buttons 2019-06-26 09:35:50 +12:00