Commit Graph
13034 Commits
Author SHA1 Message Date
Brenda Wallace ba1c3a7159 add the notifications helper back 2019-08-07 16:20:10 +12:00
Brenda Wallace 149f92536d conversations view matching the index (avatar photos on the right) 2019-08-07 16:19:43 +12:00
Brenda Wallace 4c045374ff tidy up plantings view 2019-08-07 16:19:37 +12:00
Brenda Wallace 6af95fa722 Help percy find the correct link 2019-08-07 16:19:11 +12:00
Brenda Wallace 0c8e993006 gardens show all as a button 2019-08-07 16:18:59 +12:00
dependabot-preview[bot] d6d5e95050 Bump searchkick from 4.0.2 to 4.1.0
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/ankane/searchkick/releases)
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/searchkick/compare/v4.0.2...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-06 00:24:06 +00:00
dependabot-preview[bot] e34883d32d Bump oj from 3.8.0 to 3.8.1
Bumps [oj](https://github.com/ohler55/oj) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.8.0...v3.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 22:41:29 +00:00
Brenda Wallace 5d8a952441 Merge pull request #2119 from Br3nda/fix-travis
fixing travis build
2019-08-06 07:23:24 +10:00
Brenda Wallace 493a49bb3e Nicer display when there are not gardens 2019-08-05 18:57:54 +12:00
Brenda Wallace 17da3bdd96 conversations view changes 2019-08-04 17:41:43 +12:00
Brenda Wallace 71c4154563 Merge remote-tracking branch 'origin/dev' into mailbox 2019-08-04 16:35:57 +12:00
Brenda Wallace 0dc1720711 Double quote to prevent globbing and word splitting. 2019-08-04 16:24:09 +12:00
Brenda Wallace 080e0dbc78 give the caller clues if they don't set a version 2019-08-04 16:21:31 +12:00
Brenda Wallace 00fbfc77e7 tidy up inbox view 2019-08-04 16:04:23 +12:00
Brenda Wallace 5157793202 wrap long line 2019-08-04 15:37:15 +12:00
Brenda Wallace 8d745ed322 Fix bundler cache 2019-08-04 13:44:52 +12:00
Brenda Wallace 9fbd4e4110 Tell travis to use trusty 2019-08-04 11:30:11 +12:00
Brenda Wallace 19ebb5941e Added comment about postgresql version matchin 2019-08-03 11:49:22 +12:00
Brenda Wallace 086ba0610a Install postgresql from APT 2019-08-03 11:45:38 +12:00
Brenda Wallace 32a9482d12 Remove sprockets cache 2019-08-03 11:39:08 +12:00
Brenda Wallace 953af21e3e prefix namespace into ELASTIC_SEARCH_VERSION for travis-ci 2019-08-03 11:23:45 +12:00
Brenda Wallace 2c69b5a99c Echo the elastic search version 2019-07-29 16:24:50 +12:00
Brenda Wallace 8975e52521 Merge remote-tracking branch 'origin/harvest-show' into harvest-show 2019-07-29 16:20:35 +12:00
Brenda Wallace 4605d6c107 Upgrade to an elastic search version that matches production 2019-07-29 16:19:03 +12:00
Brenda Wallace abdfbdd3b1 Merge branch 'dev' into harvest-show 2019-07-29 10:25:33 +12:00
Brenda Wallace 4859116577 Tidy up display of harvests#show 2019-07-29 10:15:06 +12:00
Brenda Wallace bf77f31777 don't show progress bars on annuals 2019-07-28 14:28:08 +12:00
dependabot-preview[bot] c198b7f446 Bump rubocop-rspec from 1.33.0 to 1.34.0
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.33.0...v1.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-24 09:31:14 +00:00
dependabot-preview[bot] 724cac959b Bump rake from 12.3.2 to 12.3.3
Bumps [rake](https://github.com/ruby/rake) from 12.3.2 to 12.3.3.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v12.3.2...v12.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-23 02:07:54 +00:00
Brenda Wallace 17e3998261 Move from tables to lists 2019-07-23 11:27:53 +12:00
Brenda Wallace 4a8f737bac Revert "Removed chekcing subject in converation"
This reverts commit 6622319466.
2019-07-23 09:50:37 +12:00
Brenda Wallace 6622319466 Removed chekcing subject in converation 2019-07-23 09:47:16 +12:00
Brenda Wallace 55e0a10dc8 Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-07-23 09:45:22 +12:00
Brenda Wallace 8cb21ec79b Removing notifications specs 2019-07-23 09:41:54 +12:00
Brenda Wallace 8ca0eef53c Removing notifications controller specs 2019-07-23 09:41:18 +12:00
Brenda Wallace fab222f581 Removing rubocop.yml 2019-07-23 09:38:59 +12:00
Brenda Wallace 01cb0ca975 Removed todo 2019-07-23 09:38:30 +12:00
Brenda Wallace e24c0ee3e8 Removing commented out code 2019-07-23 09:38:22 +12:00
Brenda Wallace 01b53a0e69 continuing to replace notifications with conversations 2019-07-23 09:37:57 +12:00
Brenda Wallace 57ca80f0eb line up display of posts 2019-07-21 20:26:04 +12:00
Brenda Wallace 50560b01eb line up boxes 2019-07-21 20:24:56 +12:00
Brenda Wallace 783e4ae046 fixed up comments by deleted members 2019-07-21 20:24:39 +12:00
Brenda Wallace e90d719436 fixed unread count on headers 2019-07-21 20:24:30 +12:00
Brenda Wallace 3db63aeabf untrash a message 2019-07-21 20:05:06 +12:00
Brenda Wallace bcbb020fde newline at end of file 2019-07-21 19:27:53 +12:00
Brenda Wallace a9b8003ff3 DRY 2019-07-21 19:23:33 +12:00
Brenda Wallace 6b501f13ee Fixed double negative 2019-07-21 19:22:25 +12:00
Brenda Wallace 0ac243e129 Remove unused methods 2019-07-21 19:21:55 +12:00
Brenda Wallace 6f2e27952c Remove unused methods 2019-07-21 19:21:34 +12:00
Brenda Wallace 2b9538c407 Use a guard clause 2019-07-21 19:21:13 +12:00