mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace 7517abd1f3 Merge remote-tracking branch 'origin/planting-reminders' into planting-reminders 2019-10-21 14:23:03 +13:00
Brenda Wallace 8cdae6647d Merge remote-tracking branch 'upstream/dev' into planting-reminders 2019-10-21 14:20:45 +13:00
Brenda Wallace 4a1e57e42a Merge remote-tracking branch 'upstream/dev' into dev 2019-10-21 14:20:23 +13:00
Brenda Wallace 9efd9d0544 Merge remote-tracking branch 'upstream/dev' into dev 2019-10-21 14:19:57 +13:00
Brenda Wallace 8c694b3dca Only show companions of active plantings 2019-10-21 14:19:47 +13:00
Brenda Wallace edea87ab5d Merge branch 'dev' into planting-reminders 2019-10-21 12:33:58 +13:00
Brenda Wallace fb5b17741d Merge pull request #2222 from Br3nda/puma 
Switch from unicorn to puma
 2019-10-21 12:30:16 +13:00
Brenda Wallace e1faedfc78 Merge branch 'dev' into planting-reminders 2019-10-20 21:36:42 +13:00
Brenda Wallace ca11792286 Only show companions of active plantings 2019-10-20 14:13:30 +13:00
Brenda Wallace 94452ee62e polish up the plantings reminders 2019-10-20 14:12:34 +13:00
Brenda Wallace e0dc38e7a3 add perennials 2019-10-20 09:49:03 +13:00
Brenda Wallace 4af89d2b2c Change reminder email into monthly summary 2019-10-20 09:49:03 +13:00
Brenda Wallace c19d09bb37 Switch from unicorn to puma 2019-10-19 18:47:28 +13:00
Brenda Wallace 7f0113a188 Merge remote-tracking branch 'upstream/master' into dev 2019-10-19 18:46:53 +13:00
Brenda Wallace d81df50dc5 Suggest companions for a garden based on existing crops 2019-10-19 18:45:11 +13:00
Brenda Wallace a75803d456 Merge branch 'dev' 2019-10-19 18:20:20 +13:00
Brenda Wallace bb72d2b974 Fix bug showing plantings with no planted_at 2019-10-19 18:20:01 +13:00
Brenda Wallace 3c50705d5f Merge pull request #2220 from Growstuff/dev 
production release
 2019-10-19 16:43:10 +13:00
Brenda Wallace c26cec4868 Merge pull request #2219 from Br3nda/feature-2207 
Group previous plantings by year
 2019-10-19 16:42:55 +13:00
Brenda Wallace 6bd7e139a6 Move views specs to admin 2019-10-19 16:04:16 +13:00
Brenda Wallace f2dc2aeaa0 Merge branch 'dev' into feature-2207 2019-10-19 16:01:11 +13:00
Brenda Wallace 95ec89f6a0 Merge branch 'dev' into role-admin 2019-10-19 13:23:25 +13:00
Brenda Wallace 1d97250726 Merge pull request #2216 from Br3nda/wider-gardens 
Widen gardens on gardens#index
 2019-10-19 13:23:00 +13:00
Brenda Wallace ecb0c53c80 Merge branch 'dev' into feature-2207 2019-10-19 13:22:19 +13:00
Brenda Wallace 0965168750 Group previous plantings by year 2019-10-19 11:25:19 +13:00
Brenda Wallace dc909132ef Merge branch 'dev' into role-admin 2019-10-19 10:52:18 +13:00
Brenda Wallace 95affc8ca8 Merge branch 'dev' into wider-gardens 2019-10-19 10:50:16 +13:00
Brenda Wallace f50417cc04 Merge pull request #2218 from Br3nda/gem-asset-fix 
Add source for leaflet
 2019-10-19 10:49:50 +13:00
Brenda Wallace 75897bad51 Update routing specs for admin roles 2019-10-19 10:28:24 +13:00
Brenda Wallace fc07571ee1 Rename is_admin? to admin?. 2019-10-19 10:25:17 +13:00
Brenda Wallace 35c9b70bc9 Remove email from display in admin/members 2019-10-19 10:23:39 +13:00
Brenda Wallace 5a6d0f6342 Check admin before roles controller runs 2019-10-19 10:22:27 +13:00
Brenda Wallace 2ddddb1652 Updated specs for admin editing roles 2019-10-19 10:16:02 +13:00
Brenda Wallace c940ba447e Add source for leaflet, fixes #2217 2019-10-19 09:47:29 +13:00
Brenda Wallace dc3bc85777 Remove comments 2019-10-19 09:44:05 +13:00
Brenda Wallace 1a34bfb9a2 Merge remote-tracking branch 'origin/role-admin' into role-admin 2019-10-19 09:43:12 +13:00
Brenda Wallace 21848bf5b4 Merge branch 'dev' into role-admin 2019-10-19 09:42:49 +13:00
Brenda Wallace a6cb81f4d1 Widen gardens on gardens#index 2019-10-19 09:41:43 +13:00
Brenda Wallace 80b82a99fe Fix broken spec on dev 2019-10-19 09:41:09 +13:00
Brenda Wallace 88a771459c Merge branch 'dev' into role-admin 2019-10-18 09:43:44 +13:00
Brenda Wallace fd39d6ef8c More per page 2019-10-08 15:54:53 +13:00
codefactor-io 6d472c5d66 [CodeFactor] Apply fixes 2019-10-07 23:35:39 +00:00
Brenda Wallace f77a0e37b9 Merge branch 'dev' into role-admin 2019-10-08 11:22:13 +13:00
Brenda Wallace ca0915585c Merge pull request #2193 from Growstuff/dev 
Production release
 2019-10-08 11:21:18 +13:00
Brenda Wallace b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13:00
bestest-mensch d72ec5890a address code climate issues 2019-10-07 21:38:19 +00:00
bestest-mensch 1e1b9f5ef5 scope conversations delete multiple to current user 2019-10-07 21:38:19 +00:00
bestest-mensch 9f8e2e65be update/add specs 2019-10-07 21:38:19 +00:00
bestest-mensch 80fb4f5fe6 add ability to delete multiple conversations at once 2019-10-07 21:38:19 +00:00