Rob Harrington
2ccdf3c97a
Use upstream and origin as remote names
...
Also fixed a couple of typos
2018-01-11 14:30:08 +11:00
Rob Harrington
89bd9c8038
Update CONTRIBUTIONS.md to reflect current processes
2018-01-11 14:30:08 +11:00
Enrico Stano
88627dc837
Merge pull request #2038 from boveus/master
...
Update README.md
2018-01-10 12:17:21 +01:00
Brandon Stewart
8ca57b0705
Update README.md
2018-01-09 14:02:27 -07:00
Brandon Stewart
c7db283e8c
Update README.md
2018-01-09 14:00:07 -07:00
erose357
83ca3b7b8b
Adds a css rule to target the logo in .footer-local and padding between the logo and open source info at the bottom
2018-01-09 12:54:41 -07:00
Brandon Stewart
830699d2b8
Update README.md
2018-01-09 10:29:02 -07:00
Brandon Stewart
f822e658c4
Update README.md
2018-01-09 10:23:51 -07:00
Brandon Stewart
8817a1afb7
Update README.md
2018-01-09 10:23:30 -07:00
Brandon Stewart
693adf181e
Update README.md
2018-01-09 10:21:24 -07:00
Brandon Stewart
f269f13b09
Update README.md
2018-01-08 11:50:44 -07:00
Matt-Yorkley
9845258a25
Merge pull request #2035 from Matt-Yorkley/uk/rubocop_fix
...
Update rubocop.yml
2018-01-05 20:16:44 +00:00
Enrico Stano
edbed2c8d3
Merge pull request #1984 from coopdevs/fix/api-key-taxons
...
Disable api auth as there is no Spree api key set
2018-01-05 10:31:36 +01:00
Matt-Yorkley
8e0f2d2500
Merge pull request #2037 from Matt-Yorkley/uk/codeclimate_checks
...
Codeclimate yml update
2018-01-05 01:37:06 +00:00
Matt-Yorkley
e022504c26
Codeclimate yml update
2018-01-04 17:10:55 +00:00
Matt-Yorkley
62e4cbd052
Update rubocop.yml
2018-01-04 16:01:06 +00:00
Enrico Stano
70ae59550d
Merge pull request #2032 from Matt-Yorkley/uk/codeclimate_migrations
...
Adjust codeclimate engine for migrations folder
2018-01-03 13:48:47 +01:00
Lynne
f74af8fa2d
Merge pull request #2034 from lin-d-hop/translations-uk
...
Manual uk translation update
2018-01-03 06:00:07 +01:00
lin-d-hop
82d1b57005
Not updated from transifex so manually commiting
2018-01-03 03:40:04 +00:00
Lynne
c32aacc1b3
Delete en-GB.yml
...
Superseded by en_GB.yml
2018-01-03 03:29:52 +00:00
Matt-Yorkley
523b4045bf
Adjust codeclimate engine for migrations folder
2018-01-02 13:54:41 +00:00
Enrico Stano
8e4e273b7c
Merge pull request #1994 from openfoodfoundation/transifex
...
Transifex
2017-12-22 16:36:44 +11:00
Enrico Stano
816297e22f
Merge pull request #2022 from ltrls/add-order-print-ticket-feature-test
...
Add feature test for the Spree::Admin::OrdersController print_ticket action
2017-12-22 15:07:17 +11:00
Pau Perez
72889b5c36
Stub current_user instead of api key's user
2017-12-21 10:24:29 +11:00
Pau Perez
0f0216fe79
Upgrade spree to get our latest patch
2017-12-21 10:24:29 +11:00
Pierre de Lacroix
42433d1ad4
Add feature test for the Spree::Admin::OrdersController print_ticket action
2017-12-20 23:01:18 +01:00
Pau Perez
52533fc04c
Rely on Spree's default value for requires_auth
2017-12-20 17:25:23 +11:00
Pau Perez
bb0223877c
Remove unused arguments and reduce object creation
2017-12-20 17:25:23 +11:00
Pau Perez
5eb1fcddbb
Remove dependency on TestingSupport by inlining
2017-12-20 17:25:23 +11:00
Pau Perez
c646eb3939
Disable api auth as there is no Spree api key set
...
Although Spree::Api::Config[:requires_authentication] is set to false by
default for some unknown reason if not done explicitly Spree still
returns it as false.
This amends the change done in a87c89c83d
2017-12-20 17:25:23 +11:00
Enrico Stano
a313c99370
Merge pull request #2005 from coopdevs/upgrade-spree-fork-version
...
Upgrade spree's fork to latest commit
2017-12-20 17:23:48 +11:00
Enrico Stano
0f84d9f02e
Merge pull request #2004 from coopdevs/is-this-needed
...
Remove unused Enterprise scopes
2017-12-20 16:59:15 +11:00
Enrico Stano
900a9c6145
Merge pull request #2000 from coopdevs/issue-template-improvement
...
Mention screenshot in the issue template
2017-12-20 16:48:54 +11:00
Pau Perez
5b33cbe9aa
Upgrade spree's fork to latest commit
...
Needed to get
3289b5e31c
2017-12-20 16:37:14 +11:00
Enrico Stano
114ce3b764
Merge pull request #1940 from coopdevs/improve-readability-shop
...
Improve readability of shop's code
2017-12-20 16:28:53 +11:00
Enrico Stano
660d3f326f
Remove unused Enterprise scopes
2017-12-20 16:00:35 +11:00
Pau Perez
b8d51ae0de
Mention screenshot in the issue template
...
For things like translations it's enough sharing a screenshot when
reporting a bug. See
https://github.com/openfoodfoundation/openfoodnetwork/issues/1999
2017-12-20 10:16:53 +11:00
Enrico Stano
0bdda6387a
Merge pull request #1996 from coopdevs/add-issue-template
...
Create issue template
2017-12-19 18:00:04 +11:00
Pau Perez
4fbdbb1aa2
Link to placeholder feature template
...
We'll write the template later on
2017-12-19 15:26:21 +11:00
Pau Perez
72ddcb4fff
Create issue template
...
It assumes most of the times issues will be reported to keep track of
bugs.
2017-12-19 11:07:29 +11:00
Transifex-Openfoodnetwork
50ef2de5f9
Updating translations for config/locales/fr.yml
2017-12-15 20:06:43 +11:00
Transifex-Openfoodnetwork
55d3ee1af0
Updating translations for config/locales/pt.yml
2017-12-13 21:19:42 +11:00
Transifex-Openfoodnetwork
422166441e
Updating translations for config/locales/en_US.yml
2017-12-09 02:29:48 +11:00
Transifex-Openfoodnetwork
9d3f85628c
Updating translations for config/locales/nb.yml
2017-12-08 18:44:22 +11:00
Pierre de Lacroix
669d9c3c66
Fix translations on account page
2017-12-06 15:21:19 +11:00
Enrico Stano
dcb406d246
Merge pull request #1986 from andypalmer/github_protocol_warning
...
Change github definition to remove insecure protocol warning.
2017-12-04 21:49:05 +11:00
Andy Palmer
cadad28b0c
Change github definition to remove insecure protocol warning. Consistently use 1.9.3 hash syntax
2017-12-04 16:50:36 +11:00
Enrico Stano
01b0a033fd
Merge pull request #1904 from oeoeaio/spree-test-config
...
Use Spree's approach for preventing config caching when testing
2017-12-04 15:57:11 +11:00
Pierre de Lacroix
0fb66ab258
Fix CodeClimate issues
2017-12-01 13:37:30 +11:00
Pierre de Lacroix
a49c21cfd1
Add instance switch to enable number localization
2017-12-01 13:37:24 +11:00
