raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,241 Commits 18 Branches 453 Tags
db3637fe84d2e4bf5743df1dfd892eff7d626cce
Commit Graph

7241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
b4976a5445 Replace with-tip with ofn-with-tip: enterprise forms 2016-02-24 11:26:37 +11:00
Rohan Mitchell
e2722710de Clean up syntax 2016-02-24 11:26:37 +11:00
Rohan Mitchell
45d4dd6b88 Add ofnWithTip directive to sanitise HTML going into tooltips 2016-02-24 11:26:37 +11:00
Rohan Mitchell
d79a6d7e19 Escape HTML entities in JSON 2016-02-24 11:26:37 +11:00
Rohan Mitchell
6a2e07064b Fix stomped spree JS file 2016-02-24 11:26:37 +11:00
Nicolas Blanc
52d5b8936e new validation4 02/22/2016 2016-02-22 14:54:31 +00:00
Nicolas Blanc
c91eb9f345 new validation3 02/22/2016 2016-02-22 14:31:31 +00:00
Nicolas Blanc
44508f0f1e new validation2 02/22/2016 2016-02-22 13:38:19 +00:00
Nicolas Blanc
1738db9e1f new validation 02/22/2016 2016-02-22 13:00:27 +00:00
Steve Pettitt
f7387048b0 Remove cruft and 2nd active table, to stop constant hover 2016-02-21 12:40:53 +00:00
Steve Pettitt
92cfcb8fc9 remove debug statement 2016-02-20 21:22:10 +00:00
Nicolas Blanc
614f83799e new test 2016/02/20 2016-02-20 19:23:22 +00:00
Steve Pettitt
d39b62aa31 Fallback to a default tractor logo if missing 2016-02-20 19:00:37 +00:00
Steve Pettitt
ec3e158781 Merge current master 2016-02-20 17:24:57 +00:00
Steve Pettitt
d5e51dada6 Don't serialize payment ID (not used) 2016-02-20 17:22:26 +00:00
Steve Pettitt
23e774bede Styling, fewer columns in small/medium screen, logo resize 2016-02-20 17:20:43 +00:00
Maikel Linke
0cb5dfbbe0 delete old sidebar partials 2016-02-19 16:29:19 +11:00
Maikel Linke
6ba534fb58 Show noticeboard in mobile menu 2016-02-19 15:16:24 +11:00
Maikel Linke
38cac3a3c4 Explicitly referencing main_app.discourse_login_path 
Fixes #830.
 2016-02-19 11:23:38 +11:00
Maikel Linke
82182d24e7 Merge remote-tracking branch 'origin/master' into discourse-sso 2016-02-19 11:02:59 +11:00
stveep
83d248469f Running balances 2016-02-16 20:32:09 +00:00
Lynne Davis
2d620071f0 Fxing conflicts 2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a Change "&" to "and" 
There are very few places where ampersands are appropriate.

Minor typo in footer.
 2016-02-09 10:01:51 +00:00
Paul Mackay
fb7fb62f79 Add SCSS lint config 2016-02-09 06:11:13 +00:00
Paul Mackay
98e5df6aac Add Rubocop config file 2016-02-09 06:00:05 +00:00
Paul Mackay
ee168bcbfb Add codeclimate config file 2016-02-08 21:07:42 +00:00
Paul Mackay
8cdf2254d8 Fix to make shell block highlight correctly 2016-02-06 20:07:57 +00:00
Paul Mackay
57a929d718 #268: add notes in README about creating OFN user 2016-02-06 20:05:23 +00:00
Paul Mackay
2b0788ec9c #737: add link to dev wiki 2016-02-06 11:13:17 +00:00
Paul Mackay
c7f6d4e4fe Add Travis badge, link to wiki, UK contributors 2016-02-06 11:09:53 +00:00
Paul Mackay
979baf80dd Rename README to have consistent short file extension 2016-02-06 10:50:01 +00:00
Maikel Linke
3db79aa6b2 Prevent body from scrolling when a modal is open 2016-02-05 15:18:18 +11:00
Rob Harrington
2ebad800b2 Try again: using :site_meta_description for translation of global site meta description 2016-02-05 14:57:18 +11:00
Rob Harrington
dbe7fbc760 Using :meta_description for translation of global site description 2016-02-05 14:17:42 +11:00
Transifex-Openfoodnetwork
ad2e10c33e Updating translations for fr.yml and nb.yml 2016-02-05 14:17:42 +11:00
Maikel Linke
ac413937f3 Merge remote-tracking branch 'origin/master' into groups 2016-02-05 11:05:40 +11:00
Rohan Mitchell
48b02db70d Order cycles are undated unless they have both open and close dates defined 2016-02-05 09:27:25 +11:00
Maikel Linke
eef62d4128 fix hub filter style 2016-02-04 16:34:03 +11:00
Maikel Linke
f5ff5bd5b0 Merge remote-tracking branch 'origin/master' into groups 2016-02-04 16:12:57 +11:00
Maikel Linke
bd19bf5f3c Refactoring filter selectors 
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.

For example a group's page has one set for the group's producers and one
set for the group's shops.
 2016-02-04 16:08:19 +11:00
Steve Pettitt
0ad3d8f351 WIP: styling updates 2016-02-02 23:21:04 +00:00
Nicolas Blanc
2be005d344 i18n from berlin hackathon 2016-01-31 12:16:33 +00:00
Steve Pettitt
79808acd9f Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances 2016-01-31 11:00:18 +00:00
Steve Pettitt
dcb07237d8 Spec worked, links didn't :) 2016-01-31 11:00:07 +00:00
Maikel
381fb6291e Auto-merged master into uk/account-balances on deployment. 2016-01-31 21:35:44 +11:00
Steve Pettitt
e3b9ce4d80 Delegate url helper to pass specs 2016-01-31 10:28:19 +00:00
Nicolas Blanc
fb557dd682 Merge branch 'hackweek/i18n' of https://github.com/elf-pavlik/openfoodnetwork into elf-pavlik-hackweek/i18n 2016-01-31 09:16:33 +00:00
Steve Pettitt
4438cbd5d0 Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances 2016-01-30 19:53:53 +00:00
Steve Pettitt
ec6b0f873e style credit/debit, spec updates 2016-01-30 19:53:37 +00:00
Steve Pettitt
92d830b884 Table styling 2016-01-30 17:56:04 +00:00