 Daniel O'Connor
|
36c0de4504
|
Upgrade to selenium-webdriver 3.0.0
|
2017-01-21 16:04:15 +10:30 |
|
|
Daniel O'Connor
|
3208bf9fb6
|
Regenerate rubocop configuration
|
2017-01-21 15:58:52 +10:30 |
|
|
Daniel O'Connor
|
4eebf5c867
|
Error: The Style/MethodCallParentheses cop has been renamed to Style/MethodCallWithoutArgsParentheses.
|
2017-01-21 15:57:01 +10:30 |
|
|
Daniel O'Connor
|
61f7bdfdd2
|
Update rubocop
|
2017-01-21 15:56:02 +10:30 |
|
|
Daniel O'Connor
|
06838d7ad1
|
Update ruby_dep, unicode-display_width
|
2017-01-21 15:55:22 +10:30 |
|
|
Daniel O'Connor
|
676f246e85
|
Merge pull request #1154 from Br3nda/bw/translations
More translations
|
2017-01-21 15:51:41 +10:30 |
|
|
Shiny
|
6121a9bc6e
|
Merge branch 'dev' into bw/translations
|
2017-01-20 21:05:31 +11:00 |
|
|
Brenda Wallace
|
c2804f1725
|
Merge branch 'bw/controller-translations' into bw/translations
Conflicts:
config/locales/en.yml
|
2017-01-20 23:04:00 +13:00 |
|
|
Brenda Wallace
|
b198305d36
|
Translations for account controller
|
2017-01-20 22:48:04 +13:00 |
|
|
Brenda Wallace
|
7d7f5bfda3
|
Translations for account types
|
2017-01-20 22:46:12 +13:00 |
|
|
Brenda Wallace
|
d97af8e76e
|
Adding missing translation for harvests
|
2017-01-20 22:40:14 +13:00 |
|
|
Brenda Wallace
|
91adc5f59e
|
Normalise english translations file
|
2017-01-20 22:23:38 +13:00 |
|
|
Shiny
|
714b2580a3
|
Merge branch 'dev' into bw/bar_graphs
|
2017-01-18 11:15:09 +13:00 |
|
|
pozorvlak
|
a8d5b14d46
|
Merge pull request #1150 from Br3nda/bw/rubocop
Rubocop fix up for the models
|
2017-01-17 17:43:24 +00:00 |
|
|
pozorvlak
|
cc59c4f49b
|
Merge branch 'dev' into bw/rubocop
|
2017-01-17 16:47:07 +00:00 |
|
|
pozorvlak
|
8a7b7e75ef
|
Merge pull request #1141 from Br3nda/bw/active-plantings
Show only active plantings by default
|
2017-01-17 16:41:22 +00:00 |
|
|
Shiny
|
f8dda12de6
|
Merge branch 'dev' into bw/active-plantings
|
2017-01-15 17:36:32 +13:00 |
|
|
Shiny
|
ab332976da
|
Merge branch 'dev' into bw/rubocop
|
2017-01-15 17:36:17 +13:00 |
|
|
pozorvlak
|
331c778350
|
Merge pull request #1152 from CloCkWeRX/upgrade-comfortable-mexican-sofa
Upgrade to current comfortable_mexican_sofa
|
2017-01-14 22:20:54 +00:00 |
|
|
Cesy
|
48b6a2297b
|
Merge branch 'master' into dev
|
2017-01-14 20:21:46 +00:00 |
|
|
pozorvlak
|
27ea2e0432
|
Merge branch 'dev' into upgrade-comfortable-mexican-sofa
|
2017-01-14 19:53:06 +00:00 |
|
|
pozorvlak
|
4c0000b964
|
Merge pull request #1145 from Br3nda/bw/description-photo-links
Descriptive links from photo page
|
2017-01-14 19:51:20 +00:00 |
|
|
Daniel O'Connor
|
a3ee17bd4d
|
#1054 Upgrade to current comfortable_mexican_sofa
|
2017-01-15 02:19:15 +10:30 |
|
|
Brenda Wallace
|
958e7eb955
|
Removed rubocop excludes that we have fixed
|
2017-01-14 21:13:59 +13:00 |
|
|
Brenda Wallace
|
39888d44e2
|
Rubocop compliance for the account model
|
2017-01-14 21:11:02 +13:00 |
|
|
Brenda Wallace
|
b603bae1a7
|
Rubocop compliance for the notification model
|
2017-01-14 21:09:47 +13:00 |
|
|
Brenda Wallace
|
05db5f3109
|
Rubocop compliance for the order_item model
|
2017-01-14 21:08:47 +13:00 |
|
|
Brenda Wallace
|
ad72ab0ba8
|
Rubocop compliance for the role model
|
2017-01-14 21:04:19 +13:00 |
|
|
Brenda Wallace
|
3beb3974fc
|
Rubocop compliance for the product model
|
2017-01-14 21:03:01 +13:00 |
|
|
Brenda Wallace
|
fa15fd2912
|
Rubocop compliance for the photo model
|
2017-01-14 21:01:46 +13:00 |
|
|
Brenda Wallace
|
78ed7869c5
|
Rubocop compliance for the member model
|
2017-01-14 20:57:18 +13:00 |
|
|
Brenda Wallace
|
0fa9f54c9c
|
Rename member.has_role? to role?
|
2017-01-14 20:54:43 +13:00 |
|
|
Brenda Wallace
|
f214f608ff
|
Rename member.is_paid? to paid?
|
2017-01-14 20:51:22 +13:00 |
|
|
Brenda Wallace
|
eb70f6dc57
|
Rubocop compliance for the seed model
|
2017-01-14 20:48:19 +13:00 |
|
|
Brenda Wallace
|
43c4b154f9
|
Rubocop compliance for the follow model
|
2017-01-14 20:45:54 +13:00 |
|
|
Brenda Wallace
|
21a536bf86
|
Merge remote-tracking branch 'upstream/dev' into bw/rubocop
|
2017-01-14 20:43:02 +13:00 |
|
|
Brenda Wallace
|
832a20eac9
|
Rubocop compliance for order model
|
2017-01-14 20:42:32 +13:00 |
|
|
Brenda Wallace
|
f6cc0f3e13
|
rubocop compliance in post model
|
2017-01-14 20:34:08 +13:00 |
|
|
Brenda Wallace
|
5be5585084
|
Rubocop disable Rails/HasAndBelongsToMany
|
2017-01-14 20:31:34 +13:00 |
|
|
Brenda Wallace
|
989f176fb7
|
Crop model adhering to rubocop
|
2017-01-14 20:09:54 +13:00 |
|
|
Brenda Wallace
|
be07b5fd0e
|
Only check values.zero? if they are present
|
2017-01-14 20:09:09 +13:00 |
|
|
Shiny
|
180505a1ca
|
Merge branch 'dev' into bw/active-plantings
|
2017-01-14 18:27:18 +13:00 |
|
|
Shiny
|
22343385f6
|
Merge branch 'dev' into bw/bar_graphs
|
2017-01-14 18:26:48 +13:00 |
|
|
Shiny
|
e11603cb3e
|
Merge branch 'dev' into bw/description-photo-links
|
2017-01-14 18:25:52 +13:00 |
|
|
Daniel O'Connor
|
97c5eb1c42
|
Merge pull request #1149 from Br3nda/bw/quotes-in-name
Removed unwanted quotes in member name in menu
|
2017-01-14 15:09:04 +10:30 |
|
|
Brenda Wallace
|
d07509f9e4
|
Rubocop compliance for comment model
|
2017-01-14 17:23:39 +13:00 |
|
|
Brenda Wallace
|
0c1220d11f
|
Rubocop compliance for harvest model
|
2017-01-14 17:22:33 +13:00 |
|
|
Brenda Wallace
|
f889b112fe
|
Rubocop compliance for garden model
|
2017-01-14 17:20:21 +13:00 |
|
|
Brenda Wallace
|
a1cfa826d9
|
Removed unwanted quotes in member name in menu
Fix for Issue #1144
|
2017-01-14 17:11:58 +13:00 |
|
|
Brenda Wallace
|
477f9669bd
|
Added nav for plantings
|
2017-01-14 16:54:37 +13:00 |
|