Commit Graph

15608 Commits

Author SHA1 Message Date
Matt-Yorkley
e2f3feccf0 Add comments to authentication_service.js 2018-03-14 12:13:45 +11:00
Matt-Yorkley
e6bdbccffa Ensure email links return to proper path on private shops, refactor modal logic 2018-03-14 12:13:45 +11:00
Matt-Yorkley
ea9b0eca48 Adjust wording on validation modal message 2018-03-14 12:13:45 +11:00
Matt-Yorkley
e8bc87e62b Ensure email validation link returns to /register paths properly 2018-03-14 12:13:45 +11:00
Matt-Yorkley
d7a3c50bd5 Remove underscore from resource 2018-03-14 12:13:45 +11:00
Matt-Yorkley
f5a0862655 Email confirmation modal specs 2018-03-14 12:13:45 +11:00
Matt-Yorkley
595bc5d1a5 Show confirmation message in modal 2018-03-14 12:13:45 +11:00
Matt-Yorkley
bc621a3c43 Return user to same URL from confirmation link 2018-03-14 12:13:45 +11:00
Hugs
7ebf5db1f2 Added img tag when producer.description.length==0 to display logo even when no About Us 2018-03-14 11:44:04 +11:00
Maxime Lalisse
e806f38142 Fix translation keys 2018-03-14 10:13:40 +11:00
Pau Perez
d980809a19 Upgrade shoulda-matchers from 1.1.0 to 2.8.0 2018-03-13 17:46:59 +01:00
Pau Perez
e6f6232607 Upgrade letter_opener from 1.4.1 to 1.6.0 2018-03-13 14:21:54 +01:00
Pau Perez
cce30d5762 Upgrade Knapsack from 1.5.1 to 1.16.0 2018-03-13 14:11:00 +01:00
Pau Perez
47a6ffbf66 Upgrade Capybara from 2.15.4 to 2.18.0 2018-03-13 13:58:06 +01:00
HugsDaniel
7e5eae1b8d Added testing on statusMessage display for pending changes 2018-03-13 21:03:54 +11:00
HugsDaniel
8c4d0f11d7 Changed status message with i18n t() filter to displau unsaved changes status for customers edition in admin dashboard 2018-03-13 21:03:54 +11:00
Pau Perez
d96c1fc165 Upgrade factory_girl_rails from 3.3.0 to 4.9.0
This is the last version before moving to factory_bot_rails.
2018-03-13 10:01:14 +01:00
Pau Perez
6f879cd5d9 Remove unused gem Turn
It provides runners for MiniTest and we use RSpec.
2018-03-13 09:54:26 +01:00
Pau Perez
1d75e5a671 Upgrade rspec-retry from 0.4.2 to 0.5.6 2018-03-13 09:53:20 +01:00
Pau Perez
bdd58dccf0 Upgrade Timecop from 0.8.1 to 0.9.1 2018-03-13 09:34:09 +01:00
Pau Perez
aaf5bcbb12 Upgrade rspec-rails from 3.7.1 to 3.7.2 2018-03-13 09:32:12 +01:00
Pau Pérez Fabregat
976bbd8725 Merge pull request #2124 from coopdevs/replace-mail-method-in-base-mailer-decorator
Remove deprecated reference to Spree::MailMethod
2018-03-13 08:51:11 +01:00
Enrico Stano
341604be8a Merge pull request #2094 from openfoodfoundation/transifex
Transifex
2018-03-13 08:39:11 +01:00
Maikel Linke
01dc51c84b Consistent reference of the source locale 2018-03-13 10:25:31 +11:00
Maikel Linke
64063f305b Describe methods of I18nConfig 2018-03-13 10:24:42 +11:00
Enrico Stano
5ce320f8a2 Merge pull request #2133 from coopdevs/fix-sample-data
Fix shipping method creation in sample data
2018-03-12 18:39:34 +01:00
Pau Perez
6598c80f6e Fix shipping method creation in sample data 2018-03-12 16:52:56 +01:00
Keir Osborn
d4b84e55c2 order order cycle list from most lates close date to earliest on /orders page #1884 2018-03-12 11:04:50 +00:00
Pau Pérez Fabregat
6f5080923f Merge pull request #2123 from coopdevs/bring-seeds-from-ofn-install
Bring seeds from ofn install
2018-03-12 11:43:14 +01:00
Pau Pérez Fabregat
afda5cc04e Merge pull request #2115 from coopdevs/localize-sample-data
Localize sample data
2018-03-09 16:18:18 +01:00
Pau Perez
12e225e7c0 Add sample addresses in the instance's country
This ensures the address country and state are valid, meaning the state
belongs to the provided country. We use the instance's to do that.
2018-03-09 13:33:05 +01:00
Pau Perez
c19c22cb17 Apply couple simple tweaks to seeds.rb 2018-03-09 13:20:35 +01:00
Maikel Linke
db61a2bb17 Parse available language string more relaxed
Splitting the string with any whitespace makes it more likely the code
knows what the human meant. It also makes `strip` obsolete, since there
can't be any whitespace within the splitted strings.
2018-03-09 19:41:49 +11:00
Maikel Linke
8017921e89 Use I18nConfig in views 2018-03-09 17:45:04 +11:00
Maikel Linke
3743cf1bc3 Use I18nConfig for application defaults 2018-03-09 17:45:03 +11:00
Maikel Linke
7a34c6e3f0 Introduce I18nConfig as single point of truth
It will be used in application.rb and views.
See https://github.com/openfoodfoundation/openfoodnetwork/issues/2113
2018-03-09 17:45:03 +11:00
Pau Pérez Fabregat
b5a8df00dd Merge pull request #2117 from coopdevs/confirm-example-user
Automatically confirm the spree@example.com user
2018-03-09 07:24:40 +01:00
Enrico Stano
0aacb91f50 Merge pull request #2116 from coopdevs/clean-sample-data
Clean sample data
2018-03-07 20:58:30 +01:00
Pau Perez
1b39d57800 Remove deprecated reference to Spree::MailMethod
Said class is removed in https://github.com/spree/spree/pull/2643 in
Spree.
2018-03-07 16:24:39 +01:00
Pau Perez
5eb3dc4beb Bring states.yml from l10n_au
The states.yml present in this repo had a different format which doesn't
work with the current seeds.rb that we brought from ofn-install.
2018-03-07 10:30:12 +01:00
Pau Perez
9849f76c1c Bring seeds.rb from ofn-install 2018-03-07 10:28:34 +01:00
Pau Perez
ae2eba89ca Automatically confirm the spree@example.com user
This allows you to log in with it after you run `bundle exec
openfoodnetwork:dev:load_sample_data` rake task right away.
2018-03-07 10:10:38 +01:00
Rob H
dadbb7445b Merge pull request #2110 from oeoeaio/subs-summary-hash
Subs: Fix summary emails for shop owners
2018-03-07 16:41:38 +11:00
Rob H
4fd307832e Merge pull request #2120 from oeoeaio/subs-unpause-messaging
Subs: messaging around unpausing a subscription
2018-03-07 16:41:00 +11:00
Rob Harrington
09ca9ac2dd Alter scope to return both completed and resumed orders 2018-03-07 14:24:59 +11:00
Rob Harrington
b98afc00ba Show message about resumable orders when unpausing a subscription 2018-03-07 14:24:59 +11:00
Rob Harrington
7332e21013 Make InfoDialog more flexible (can show information as well as errors) 2018-03-07 14:24:58 +11:00
Rob Harrington
5cb0a1c371 Fix position of jQuery dialogs in admin section 2018-03-07 14:24:58 +11:00
Pau Perez
10d6a29503 Move service class to its own file 2018-03-06 15:30:25 +01:00
Pau Perez
e06af77420 Move from hash rocket to symbol syntax 2018-03-06 13:46:32 +01:00