Brenda Wallace
7b01fcbd4b
Align all the hashes
2018-12-30 15:22:29 +13:00
Brenda Wallace
550860178e
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-11 16:07:30 +12:00
Awesome Code
90f4db4853
Auto corrected by following Ruby rspec layout
2018-09-10 22:20:12 +00:00
brenda
2b8aac19dd
Revert "Auto corrected by following Ruby Capybara/FeatureMethods"
...
This reverts commit b52763b7c2
2018-09-07 10:40:09 +12:00
Awesome Code
b52763b7c2
Auto corrected by following Ruby Capybara/FeatureMethods
2018-09-05 12:06:58 +00:00
Brenda Wallace
fa32537c3b
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
.rubocop_todo.yml
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/members.js.erb
app/assets/stylesheets/predictions.sass
app/controllers/crops_controller.rb
app/controllers/orders_controller.rb
app/controllers/plantings_controller.rb
app/models/account.rb
app/models/account_type.rb
app/models/member.rb
app/models/order.rb
app/models/order_item.rb
app/models/product.rb
app/views/gardens/show.html.haml
app/views/layouts/application.html.haml
config/initializers/assets.rb
config/routes.rb
db/schema.rb
package-lock.json
spec/controllers/account_types_controller_spec.rb
spec/controllers/admin/orders_controller_spec.rb
spec/controllers/comments_controller_spec.rb
spec/controllers/gardens_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/member_controller_spec.rb
spec/controllers/order_items_controller_spec.rb
spec/controllers/orders_controller_spec.rb
spec/controllers/photo_associations_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/controllers/seeds_controller_spec.rb
spec/controllers/shop_controller_spec.rb
spec/features/crops/crop_detail_page_spec.rb
spec/models/member_spec.rb
spec/models/post_spec.rb
spec/views/crops/_planting_advice.html.haml_spec.rb
spec/views/home/_crops.html.haml_spec.rb
spec/views/orders/show.html.haml_spec.rb
spec/views/posts/show.html.haml_spec.rb
spec/views/shop/index_spec.rb
2018-04-02 10:59:13 +12:00
Brenda Wallace
65b4c7dbc1
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3
2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3
Auto corrected by following Style/StringLiterals
2018-02-07 10:20:26 +13:00
Awesome Code
767477df66
Auto corrected by following RSpec/LeadingSubject
2018-01-28 23:47:27 +00:00
Brenda Wallace
c95630e249
Fixed api request specs after rails 5 upgrade
2018-01-06 12:19:42 +13:00
Brenda Wallace
c747d46ab5
Request spec for seeds api
2017-11-17 23:22:10 +13:00
Brenda Wallace
3009ed2d83
Merge branch 'api' of github.com:Br3nda/growstuff into api
2017-11-17 23:16:16 +13:00
Brenda Wallace
c4a1806a87
Request spec for photos api
2017-11-17 22:01:37 +13:00
Brenda Wallace
fa5e151af0
Request spec for photos api
2017-11-17 22:00:32 +13:00
Brenda Wallace
1b4d77e017
Requests spec for member api
2017-11-13 20:03:39 +13:00
Brenda Wallace
08e7c7dd29
Request specs for harvests api
2017-11-13 19:19:18 +13:00
Brenda Wallace
5fec826c41
Add more attributes to crops
2017-11-13 19:19:18 +13:00
Brenda Wallace
c29234c40c
Request specs for crops api
2017-11-13 19:19:18 +13:00
Brenda Wallace
2f0cb5c815
DRY the api specs
2017-11-13 19:19:18 +13:00
Brenda Wallace
b6cbfe25d2
Factory girl becomes factory bot
2017-11-13 19:19:18 +13:00
Brenda Wallace
d8f5876518
Added predictions to planting api, and added specs
2017-11-13 19:19:18 +13:00
Brenda Wallace
ae2cbf0bec
requests spec for modifying immutable gardens on api
2017-11-13 19:19:18 +13:00
Brenda Wallace
d86e0af5ad
Request for for getting api gardens#index
2017-11-13 19:19:18 +13:00
Taylor Griffin
7fc886f43c
implement custom Sweeper class as stop gap against errors when running specs
2014-11-16 12:01:27 +11:00
Miles Gould
e9a3c0f4ee
rails g scaffold PlantPart...
...
Also migration to remove the string plant_part.
2013-10-30 23:32:20 +00:00
Skud
37383ba451
rails g scaffold Harvest...
2013-09-17 15:39:25 +10:00
Skud
a3b7822268
Review and cleanup of JSON API
...
Removed JSON from classes that shouldn't have it.
(PT: https://www.pivotaltracker.com/story/show/54570954 )
Also found a couple of controllers with broken authorization (i.e. not
checking CanCan). Incidentally, this also fixes the comment form bug at
https://www.pivotaltracker.com/story/show/54328716 .
2013-08-05 13:29:07 +10:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud
5ae5e0f959
rails g scaffold Photo...
2013-05-08 20:52:35 +10:00
Miles Gould
5ea91bf56a
Added an Authentications table.
...
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1
In addition, we store "token" and "secret" fields.
2013-04-09 16:39:09 +01:00
Miles Gould
16605b82b6
Merge branch "notifications".
2013-02-22 13:40:58 +00:00
Skud
f12941576c
hooked roles up to cancan
...
Now only admins can create/edit forums, or mess with roles.
To add an admin user:
rails c
m = Member.find('skud')
r = Role.create(:name => 'admin')
r.members << m
We'll have to do this on the server to bootstrap the admin stuff.
Though actually, we should really write a rake task to generalise this.
2013-02-20 14:53:11 +11:00
Skud
0bc2ff25fe
Added roles, but haven't yet hooked them up to CanCan
2013-02-19 12:29:22 +11:00
Skud
e41f70db71
a bit of test cleanup
2013-02-15 23:48:30 +11:00
gnattery
e10ea7f180
rails g scaffold Forum
2013-02-13 12:55:17 +11:00
Miles Gould
42d9034fc6
rails g scaffold notifications.
2013-02-12 13:17:14 +00:00
gnattery
3cff543184
rails g scaffold Comment
2013-02-06 14:49:49 +11:00
Skud
cc7519cd59
s/update/post in routing. I think this is it!
2013-01-13 16:44:03 +11:00
Skud
0af986021e
Generated scaffold for plantings
2012-12-19 13:30:40 +11:00
Skud
760cf03b2c
Fixed tests by getting rid of valid_session
2012-11-26 19:04:43 +11:00
Norman Ancajas
f89815b6b3
added gardens table
2012-11-05 11:45:56 +08:00
