mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-01 21:21:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,677 Commits 62 Branches 76 Tags
9eff48160661d4430c7bed56cf13c4490894f7f3
Commit Graph

2124 Commits

Author SHA1 Message Date
Brenda Wallace
d90a58218a Remove roles#show 2019-10-21 15:38:46 +13:00
Brenda Wallace
13c024fac9 Fixed typo in spec 2019-10-21 15:13:47 +13:00
Brenda Wallace
498a754eea update specs for admin roles 2019-10-21 14:32:23 +13:00
Brenda Wallace
6280115055 Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin 2019-10-21 14:27:02 +13:00
Brenda Wallace
47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace
8c694b3dca Only show companions of active plantings 2019-10-21 14:19:47 +13:00
Brenda Wallace
6bd7e139a6 Move views specs to admin 2019-10-19 16:04:16 +13:00
Brenda Wallace
75897bad51 Update routing specs for admin roles 2019-10-19 10:28:24 +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
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
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
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177) 
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
 2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04 👭 Crop companions (#2176) 
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
 2019-09-28 10:38:01 +12:00
Brenda Wallace
367377088b Fix specs for photo sources 2019-09-21 09:37:55 +12:00
Brenda Wallace
b7321ed46f Add source to photos 2019-09-20 22:26:39 +12:00
Brenda Wallace
a50b0485ac find button by class 2019-09-01 20:46:46 +12:00
Brenda Wallace
017a942a41 Rename classes to name codeclimate happy 2019-09-01 19:58:47 +12:00
Brenda Wallace
e3f32d8bb4 Updated specs 2019-08-20 15:09:39 +00:00
Brenda Wallace
c6d4563edc Updated spec 2019-08-20 15:09:39 +00:00
Brenda Wallace
6782765581 Merge branch 'fix/feature-spec-sessions' of github.com:br3nda/growstuff into fix/feature-spec-sessions 2019-08-19 09:21:34 +12:00
Brenda Wallace
fa5b2eea32 DRY spec 2019-08-19 09:21:28 +12:00
Brenda Wallace
e48dae006b Delete notifications_spec.rb 2019-08-18 20:15:55 +12:00
Brenda Wallace
38477c9bfd Wrap admin in context 2019-08-18 16:15:47 +12:00
Brenda Wallace
34b399cd8e Use more signed in contexts in browse crops spec 
More member role contexts on alt name spec

More member role contexts in crop feature specs

Don't wrap the shared_context
 2019-08-18 16:10:03 +12:00
Brenda Wallace
756cf1fe3a Removing unused code in specs 2019-08-18 14:51:24 +12:00
Brenda Wallace
a334ea03bf fix spec 2019-08-17 19:20:43 +12: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
a74891f97f Fix spec 2019-08-17 15:30:45 +12:00
Brenda Wallace
7a21ec31d9 wrap context in spec 2019-08-17 15:12:29 +12:00
Brenda Wallace
27d4ebda51 make sure there's a member to find in specs 2019-08-17 15:01:34 +12:00
Brenda Wallace
a993eadea9 fix spec 2019-08-17 14:43:39 +12:00
Brenda Wallace
1cb0096788 fixed specs 2019-08-17 14:38:43 +12:00
Brenda Wallace
a36d149125 sign in as member with location 2019-08-17 14:35:39 +12:00
Brenda Wallace
c1deed70ad Keep username consistent in specs 2019-08-17 14:32:18 +12:00
Brenda Wallace
aa17f8e332 Removed unused let() 2019-08-17 14:17:05 +12:00
Brenda Wallace
b49b7b563c Added logout after like spec 2019-08-17 14:14:58 +12:00
Brenda Wallace
8936933251 Shared context for signing in (and then out) in feature specs 2019-08-17 14:10:56 +12:00
Brenda Wallace
e27cf02d96 Shared context for signing in/out on feature specs 2019-08-16 13:49:31 +12:00
Awesome Code
924e96eda1 Auto corrected by following Lint Ruby Space 2019-08-11 21:39:46 +00:00
Brenda Wallace
11ef0fb694 Removed test for unused method 2019-08-11 16:31:51 +12:00
Brenda Wallace
4f74b20565 Migrate from notifications to conversations without sending emails 2019-08-11 14:17:30 +12:00
Brenda Wallace
0d370603b7 Rename spec from Notifications to Conversations 2019-08-11 13:39:00 +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
f676054cd6 switch to member.discard 2019-08-10 16:09:57 +12:00
Brenda Wallace
82a3cc35a4 Fix member discarding to match specs 2019-08-10 15:43:06 +12:00
Brenda Wallace
b3807100d1 fixes email sending 2019-08-10 11:47:45 +12:00