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
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
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
7d9cbe9bf7 Merge branch 'dev' into UTFGardenNames 2019-07-21 10:14:03 +12:00
Brenda Wallace
1199df6d9d Merge branch 'dev' into mailbox 2019-07-20 19:44:12 +12:00
Brenda Wallace
d91a5bf55f Rewriting messages functionality to use mail boxer 2019-07-20 19:43:29 +12:00
Brenda Wallace
e25e03a2e9 Merge pull request #2097 from Br3nda/fix/notifications 
Fix display of messages from deleted members
 2019-07-20 13:22:54 +12:00
Brenda Wallace
339b3fd57e Moving to conversations and messages instead of notifications 2019-07-20 13:21:05 +12:00
Brenda Wallace
097555ec06 View for messages 2019-07-20 13:20:24 +12:00
Brenda Wallace
629352ef4f Merge remote-tracking branch 'upstream/dev' into mailbox 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.scss
	db/schema.rb
 2019-07-20 13:20:10 +12:00
Brenda Wallace
7f45b194e9 Update app/views/notifications/show.html.haml 2019-07-17 11:47:24 +12:00
Brenda Wallace
608cad2615 Fix variable name 2019-07-17 10:22:35 +12:00
Brenda Wallace
ac6ef384e0 Merge branch 'master' into fix/notifications 
Conflicts:
	app/views/notifications/index.html.haml
 2019-07-17 09:24:04 +12:00
Brenda Wallace
c8a721c304 Fixes error displaying messages from deleted members 2019-07-17 09:22:25 +12:00
Brenda Wallace
e0dcd0226e Handle messages from deleted members 2019-07-17 09:09:16 +12:00
Brenda Wallace
42269e3261 Comment out member avatar until we work out why it's breaking 2019-07-17 08:56:29 +12:00