Commit Graph

11959 Commits

Author SHA1 Message Date
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
Brenda Wallace
733a8642dd rubocop lint 2019-07-21 19:19:14 +12:00
Brenda Wallace
965c9af15a Sort scss lines 2019-07-21 19:18:13 +12:00
Brenda Wallace
3f84f5abe1 harvest owner info 2019-07-21 19:16:22 +12:00
Brenda Wallace
e309548d20 mark required fields on a message 2019-07-21 19:16:07 +12:00
Brenda Wallace
6485bde8e7 show harvest owner 2019-07-21 19:15:45 +12:00
Brenda Wallace
36c4c1e971 use message path instead of notifications 2019-07-21 19:14:22 +12:00
Brenda Wallace
bcd95aab4a removed unused partial 2019-07-21 19:14:02 +12:00
Brenda Wallace
754da0777a preserve which box we're looking at while deleting messages 2019-07-21 19:13:51 +12:00
Brenda Wallace
d382f84f9b Remove notifications code 2019-07-21 17:28:04 +12:00
Brenda Wallace
6144a7c065 tidy display of discard member on admin page 2019-07-21 17:26:45 +12:00
Brenda Wallace
eda3639708 Discard members on ban 2019-07-21 17:23:28 +12:00
Brenda Wallace
c4806fddf3 re-coloured the memberships to green 2019-07-21 17:21:36 +12:00
Brenda Wallace
39dc878ea7 Tidy up styling of conversations#index 2019-07-21 17:15:21 +12:00
Brenda Wallace
f9f1846bce Using chip on plantings cards
(made room by shrinking the date)
2019-07-21 16:59:59 +12:00
Brenda Wallace
e77e806efc turn members/tiny into a "chip" 2019-07-21 16:59:26 +12:00
Brenda Wallace
67ce5265b4 Migrate from paranoia to discard
closes #1995
2019-07-21 16:59:06 +12:00
Brenda Wallace
7f16fdfe53 working on display of messages in conversations 2019-07-21 15:29:54 +12:00
Brenda Wallace
1df84beb6d introduce pretty chips for members 2019-07-21 15:29:39 +12:00
Brenda Wallace
dab9a96486 better handling of deleted members 2019-07-21 14:47:32 +12:00
Brenda Wallace
ecb8ad9dfd removing unused code 2019-07-21 14:24:02 +12:00
Brenda Wallace
1e7eb7326f rubocop linter 2019-07-21 14:23:02 +12:00
Brenda Wallace
48117eab43 Merge branch 'mailbox' of github.com:br3nda/growstuff into mailbox 2019-07-21 11:25:46 +12:00
Brenda Wallace
a4e0ed0d8d Fixed deleted imports 2019-07-21 11:25:37 +12:00
Brenda Wallace
53358e9769 Merge branch 'dev' into mailbox 2019-07-21 10:14:36 +12:00
Brenda Wallace
7d9cbe9bf7 Merge branch 'dev' into UTFGardenNames 2019-07-21 10:14:03 +12:00