Brenda Wallace
9cdf2e899f
Merge pull request #1569 from Br3nda/remove/paid-accounts
...
Removing shop, products, accounts, orders
2018-02-09 11:09:36 +13:00
Brenda Wallace
2eacf346a8
Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts
2018-02-09 10:53:47 +13:00
Brenda Wallace
aab91e2fa9
Removed active merchant
2018-02-09 10:53:05 +13:00
Brenda Wallace
2217d87b5a
Added back the member's last login
2018-02-09 10:53:05 +13:00
Brenda Wallace
44b2251896
Re-instated the member-since text on profiles
2018-02-09 10:53:05 +13:00
Brenda Wallace
f5e20cd2d2
Re-gen rubocop todo
2018-02-09 10:53:05 +13:00
Brenda Wallace
42de726405
Removing shop, products, accounts, orders
2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3
2018-02-09 07:58:47 +13:00
Brenda Wallace
6b6ed7e31c
Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts
2018-02-09 07:47:53 +13:00
Brenda Wallace
564901f93f
Merge branch 'dev' into remove/paid-accounts
2018-02-09 07:46:51 +13:00
Brenda Wallace
f8127eeec3
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3
2018-02-09 07:44:48 +13:00
Awesome Code
ab56a3c6b3
Auto corrected by following Style/StringLiterals
2018-02-07 10:20:26 +13:00
Brenda Wallace
44ba29137d
Merge branch 'dev' into remove/paid-accounts
2018-02-07 08:41:17 +13:00
deppbot
ed2fcc2ada
Bundle Update on 2018-02-07
2018-02-07 08:40:54 +13:00
Brenda Wallace
54c880a66c
Removed active merchant
2018-02-05 15:40:37 +13:00
Brenda Wallace
0699677d05
Added back the member's last login
2018-02-05 14:42:41 +13:00
Brenda Wallace
3c411f15b8
Re-instated the member-since text on profiles
2018-02-05 14:42:05 +13:00
Brenda Wallace
dcf5286275
Re-gen rubocop todo
2018-02-05 14:38:08 +13:00
Brenda Wallace
7e1e2bef91
Removing shop, products, accounts, orders
2018-02-05 14:32:59 +13:00
Brenda Wallace
5cda14f87a
Don't update flickr meta data on db rollback
2018-02-05 12:52:59 +13:00
Brenda Wallace
88da0da616
Re-fetches from flickr
2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7
Add date_taken to photos
2018-02-05 12:52:59 +13:00
deppbot
24931381af
Bundle Update on 2018-02-03
2018-02-04 08:25:59 +13:00
deppbot
742c7e30a9
Bundle Update on 2018-01-31
2018-01-31 13:12:08 +13:00
Daniel O'Connor
502a20cf10
Merge pull request #1564 from Growstuff/awesomecode-rspec/leadingsubject-8234
...
Auto corrected by following RSpec/LeadingSubject
2018-01-29 11:45:07 +10:30
Brenda Wallace
b2cf022522
Removed extra blank lines
2018-01-29 13:01:49 +13:00
Awesome Code
767477df66
Auto corrected by following RSpec/LeadingSubject
2018-01-28 23:47:27 +00:00
Brenda Wallace
7f87ee1018
Fixed default_photo for seeds - uses own photos, not the crop
2018-01-29 09:55:06 +13:00
deppbot
093a948922
Bundle Update on 2018-01-28
2018-01-29 09:54:30 +13:00
deppbot
be1553410f
Bundle Update on 2018-01-24
2018-01-29 09:54:20 +13:00
Shiny
caf41e80c9
Patching paperclip gem
2018-01-24 15:07:06 +13:00
deppbot
2eff7d6716
Bundle Update on 2018-01-21
2018-01-23 09:00:34 +13:00
Shiny
df5006c61c
Disable jshint
...
this is on by default
2018-01-23 09:00:34 +13:00
Brenda Wallace
1e0565dd9b
Tell hound to ignore the bootstrap plugin file
2018-01-23 09:00:34 +13:00
Brenda Wallace
3453a648fa
Latest versions of bootstrap accessibility plugin
2018-01-23 09:00:34 +13:00
Awesome Code
e8d9314cff
Auto corrected by following Style/Lambda
2018-01-23 09:00:34 +13:00
Brenda Wallace
92e56cfc1e
Fixed up a spec, use sign_in member instead of stubing
2018-01-23 09:00:34 +13:00
Brenda Wallace
3dc356eb29
order gardens by name on plantings form
2018-01-23 09:00:34 +13:00
Brenda Wallace
56ed61b2b3
Lock pg < 1.0.0 for now
2018-01-23 09:00:34 +13:00
Brenda Wallace
16ad5384d1
Moved gardens chart to dedicated controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
cf93489af7
Fixed crops chart permissions by moving to another controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
86b9a3650b
Move application.js loading last again
2018-01-23 09:00:34 +13:00
Brenda Wallace
625a035f44
Scope js variables so they are not global
2018-01-23 09:00:34 +13:00
Brenda Wallace
196d37dee9
Re-instated the extra fields on crop.json
2018-01-23 09:00:34 +13:00
Shiny
6f613635d2
Update crop_detail_page_spec.rb
2018-01-23 09:00:34 +13:00
Awesome Code
46267b2a1d
Auto corrected by following Style/MutableConstant
2018-01-23 09:00:34 +13:00
Awesome Code
8c8d549cb1
Auto corrected by following RSpec/NotToNot
2018-01-23 09:00:34 +13:00
Awesome Code
d9cc1dcae8
Auto corrected by following RSpec/MultipleSubjects
2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229
Permissions (and specs) for charts json
2018-01-23 09:00:34 +13:00
pozorvlak
04a7c41f63
Only deploy from the Elasticsearch build job
...
Fixes #1099 , or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.
The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-23 09:00:34 +13:00
Brenda Wallace