alexs
da68dae586
Added unicorn-rails gem for running unicorn in dev.
2013-08-15 16:34:21 +10:00
alexs
c72a4a961f
Added the mechanism to test JSON APIs (Rabl stuff etc.)
2013-08-15 11:38:52 +10:00
alexs
42c912bb0d
Using webmock for test group only.
2013-08-14 17:26:42 +10:00
Rohan Mitchell
eaf71e28bb
Raise an error when tests hit the network
2013-08-14 11:19:16 +10:00
alexs
48cb725da5
Upgraded fundation to fetch from the edge (until the next release when gmaps4rails integration is fixed).
2013-08-14 10:39:42 +10:00
alexs
1a3c09a846
Temporarily downgraded zurb foundation to make it work with gmaps4rails (will be fixed in future release of Foundation).
2013-08-13 15:18:31 +10:00
alexs
e9110ac752
Merge branch 'master' of github.com:eaterprises/openfoodweb
...
Conflicts:
Gemfile.lock
2013-08-11 16:59:02 +10:00
alexs
51a4795763
Added rack-ssl and spinjs.
2013-08-11 16:52:34 +10:00
Rohan Mitchell
b84c476348
Upgrade Rails to 3.2.14, use forked spree with calculators that are compatible with LineItems
2013-08-09 15:30:35 +10:00
alexs
b5cc2ab4cf
Added postcode search that redirect to page with map view.
2013-08-09 13:20:22 +10:00
alexs
00743fada8
Added foundation gem to the right group.
2013-08-07 14:06:40 +10:00
alexs
ef39d0ce31
Geocoded Spree addresses
2013-08-07 14:01:27 +10:00
alexs
38b0a581e0
New landing page - initial layout and functionality
2013-08-05 17:04:56 +10:00
alexs
fadb1e4710
Merge branch 'master' of github.com:eaterprises/openfoodweb
...
Conflicts:
Gemfile
2013-07-23 18:02:28 +10:00
alexs
37a88a1be6
Changed JavaScript driver from selenium to phantomjs.
2013-07-23 17:54:05 +10:00
Andrew Spinks
7cb054f430
Merge branch 'master' into order-cycle-selection
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/spree/orders_controller_decorator.rb
app/models/enterprise.rb
app/models/spree/order_decorator.rb
app/views/spree/checkout/_other_available_distributors.html.erb
app/views/spree/products/_add_to_cart.html.haml
lib/open_food_web/distributor_change_validator.rb
spec/spec_helper.rb
2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6
Merge branch 'local-organics'
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
2013-07-23 11:40:03 +10:00
Rohan Mitchell
86616c4a6c
Add sass gem explicitly
2013-07-23 10:47:35 +10:00
Rob H
de78d09790
New branch for spree_last_address to fix compatibility issue with spree_auth_devise 1.3
2013-07-23 10:43:08 +10:00
Rob H
108dd6e619
Update Rails to 3.2.13 from 3.2.11
2013-07-23 10:42:07 +10:00
Rob H
ba840124d2
Install rabl and oj
2013-07-23 10:40:42 +10:00
Rohan Mitchell
efec0b07d6
Merge branch 'amazon-ec2'
...
Conflicts:
Gemfile
Gemfile.lock
2013-07-22 10:29:11 +10:00
Rohan Mitchell
cbeffaced1
Configure Travis, remove spork, add simplecov, add turbo sprokets.
...
Add travis config
(cherry picked from commit e3fdb12289719ef386bfd60935c8002b192538953a441cd7d9b030793f15cdc3ab09a172aa8fe5e572aa8fe5e5bd5533e2b15089d3bb223e6c56a638ed7bded642fa11ff89821e94f88c5e
2013-06-07 16:23:24 +10:00
Rohan Mitchell
6670c9543b
Remove spork
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-04 14:04:26 +10:00
Andrew Spinks
88508c254b
Install db2fog for S3 database backups
...
Conflicts:
Gemfile.lock
2013-05-05 14:19:56 +10:00
Rohan Mitchell
e20e4950bb
Install db2fog for S3 database backups
2013-04-29 11:31:01 +10:00
Rohan Mitchell
953fe22d4c
Add new feature for rich text distributor info for enterprises
2013-04-26 12:27:15 +10:00
Rohan Mitchell
9f6d1a2f18
Order cycle reports are precise to time of day, not just date
2013-04-25 21:22:26 +10:00
Rohan Mitchell
0da57f1d6c
Remove spree_heroku - S3 support is now built into Spree
2013-04-23 07:32:23 +10:00
Rohan Mitchell
3dd4e074fc
Split spree variable changes into per-feature files, add an eaterprises feature for default layout
2013-04-22 16:12:50 +10:00
Rohan Mitchell
a4bdea4d5c
Add chili feature for local organics
2013-04-22 10:29:05 +10:00
Rohan Mitchell
cbef31f619
Install chili for feature toggles
2013-04-22 10:24:17 +10:00
Rohan Mitchell
3e2d31d432
spree-last-address repo deleted - use mirror
...
Conflicts:
Gemfile
Gemfile.lock
2013-04-19 09:27:40 +10:00
Rohan Mitchell
4ce7525748
Configure newrelic for performance monitoring
2013-04-19 09:20:59 +10:00
Rohan Mitchell
ed7bded642
Remove spork
2013-04-05 15:16:54 +11:00
Rohan Mitchell
3e6c56a638
Add turbo sprockets for faster asset precompile
2013-03-16 13:08:14 +11:00
Rohan Mitchell
5089d3bb22
Add simplecov
2013-03-11 10:57:14 +11:00
Rohan Mitchell
456dfcf6db
Style distribution choice, add compass for border radius mixin
2013-03-08 15:17:22 +11:00
Rohan Mitchell
2b19253895
Attempt 2
2013-02-24 18:17:46 +11:00
Rohan Mitchell
d60935c800
Exclude pry from CI build
2013-02-24 18:05:11 +11:00
Rohan Mitchell
4bcd55959a
spree-last-address repo deleted - use mirror
2013-02-24 17:51:46 +11:00
Rob H
1ead1dadaf
Upgrade database to Spree 1.3
2013-02-07 15:58:15 +11:00
Rob H
109d5cfe67
Upgrade database to Spree 1.2
2013-02-07 15:34:00 +11:00
Rob H
612017f143
WIP Upgrade to Spree 1.3
2013-02-05 15:01:45 +11:00
Rohan Mitchell
05c9a189c8
Merge branch 'email-changes'
2013-01-17 16:09:25 +11:00
Rohan Mitchell
c7d3b9ee1a
Upgrade to Rails 3.2.11
2013-01-10 09:34:52 +11:00
Rob H
9c9431ca7f
Install Letter Opener for development environment
2012-12-07 14:31:23 +11:00
Rohan Mitchell
63ba5d13a3
Add representative, output enterprise fees as JSON
2012-11-21 14:58:29 +11:00
Rohan Mitchell
32db258db0
Use spree_heroku with support for staging env
2012-10-24 13:11:40 +11:00
Rohan Mitchell
8c7a02ec10
Fix image uploads with CMS
2012-10-18 11:13:40 +11:00
