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

4522 Commits

Author SHA1 Message Date
Brenda Wallace
99228d8850 Add css class, so can find in test 2019-08-20 15:09:39 +00:00
Brenda Wallace
ed4aaa1c9c Tidy up admin landing page 2019-08-20 15:09:39 +00:00
Brenda Wallace
4241a7c5f5 Tidy up crop wrangling page 2019-08-20 15:09:39 +00:00
Brenda Wallace
b3520a1b3f Search for members in admin/members#index 2019-08-20 15:09:39 +00:00
Brenda Wallace
586bc21e93 Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions 
Conflicts:
	spec/features/members/profile_spec.rb
	spec/features/notifications_spec.rb
	spec/features/percy/percy_spec.rb
 2019-08-17 16:09:32 +12:00
Brenda Wallace
b2d8818ae1 don't notify wranglers if there are none 2019-08-17 14:43:32 +12:00
Brenda Wallace
c173d359d8 Split up giant member model 2019-08-12 10:00:21 +12:00
Brenda Wallace
df87a79ab6 Only send email if user wants them 2019-08-12 09:40:53 +12:00
Brenda Wallace
222400d4e1 links to member from conversations#index 2019-08-11 20:55:20 +12:00
Brenda Wallace
109f9af0b9 Unread counts 2019-08-11 17:04:52 +12:00
Brenda Wallace
c189e4ed3d Bigger envelope icons on conversations#index 2019-08-11 16:55:32 +12:00
Brenda Wallace
e01b53fd9b Remove extra validators on notification 
We are migrating away from here
 2019-08-11 15:52:11 +12:00
Brenda Wallace
3c073a950a Reducing size of member model 2019-08-11 15:50:48 +12:00
Brenda Wallace
031734bb7f shorten method 2019-08-11 14:24:43 +12:00
Brenda Wallace
3976d1a982 Shorten method 2019-08-11 14:24:17 +12:00
Brenda Wallace
4f74b20565 Migrate from notifications to conversations without sending emails 2019-08-11 14:17:30 +12:00
Brenda Wallace
2a3563f9fd Migration from notifications to mailboxer 2019-08-11 13:37:56 +12:00
Brenda Wallace
5d7ef7e861 rubocop lint 2019-08-10 17:30:41 +12:00
Brenda Wallace
083d7c09e6 Migration of notifications to mailboxer, without sending new emails 2019-08-10 17:30:24 +12:00
Brenda Wallace
82a3cc35a4 Fix member discarding to match specs 2019-08-10 15:43:06 +12:00
Brenda Wallace
1872bff346 Restore notifier 
not hooked up to mailboxer yet
 2019-08-10 12:09:23 +12:00
Brenda Wallace
b3807100d1 fixes email sending 2019-08-10 11:47:45 +12:00
Brenda Wallace
d4644ccdf8 Added join to members to fix error caused by discard gem 2019-08-10 11:37:52 +12:00
Brenda Wallace
5226eadfd8 fix crop join to members 2019-08-10 11:07:12 +12:00
Brenda Wallace
86540c3352 Removed feature plantings code and spec 
because it's not used
 2019-08-10 10:52:49 +12:00
Brenda Wallace
c29f0c15ee don't join to owners when fetching gardens 
discard isn't the same
 2019-08-10 10:39:40 +12:00
Brenda Wallace
1dfbecfac0 Don't re-look up planting 2019-08-09 22:32:36 +12:00
Brenda Wallace
b04bdd111a Merge remote-tracking branch 'upstream/dev' into mailbox 
Conflicts:
	app/views/harvests/show.html.haml
 2019-08-08 11:23:41 +12:00
Brenda Wallace
12c1002dc6 Removing unused notifications code 2019-08-08 09:31:53 +12:00
Brenda Wallace
21b63d9b62 lint 2019-08-07 22:36:43 +12:00
Brenda Wallace
909d9b34ef lint 2019-08-07 22:34:53 +12:00
Brenda Wallace
2f5f8985e7 lint 2019-08-07 22:34:41 +12:00
Brenda Wallace
2f0e387646 rubocop lint 2019-08-07 22:33:39 +12:00
Brenda Wallace
83322becb2 Use guard clause 2019-08-07 22:33:01 +12:00
Brenda Wallace
dc59b487ca tests for restoring conversations 2019-08-07 22:28:18 +12:00
Brenda Wallace
cafbfb349f Delete and restore buttons 2019-08-07 22:18:24 +12:00
Brenda Wallace
60671af6ab Conversations spec 2019-08-07 21:49:27 +12:00
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
0c8e993006 gardens show all as a button 2019-08-07 16:18:59 +12: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
00fbfc77e7 tidy up inbox view 2019-08-04 16:04:23 +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
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