Brenda Wallace
|
26e5a414cf
|
Line no longer needs wrapping
|
2016-12-04 21:23:33 +00:00 |
|
Brenda Wallace
|
92195d51d2
|
Removed redundant returns
|
2016-12-04 21:21:35 +00:00 |
|
Shiny
|
0fcd8c8e8c
|
Merge pull request #1094 from Br3nda/bw/useless-assignments
Useless assignments fixed, and rails 4 stuff.
|
2016-12-05 10:06:03 +13:00 |
|
Daniel O'Connor
|
c43ec3d256
|
Merge branch 'dev' into bw/useless-assignments
|
2016-12-04 10:30:41 +10:30 |
|
Daniel O'Connor
|
1ae9366076
|
Merge pull request #1109 from maco/seed_photos
add photos to seeds
|
2016-12-04 10:30:07 +10:30 |
|
Daniel O'Connor
|
8bb6df6ca7
|
Merge branch 'dev' into seed_photos
|
2016-12-03 16:47:13 +10:30 |
|
Daniel O'Connor
|
afbdd1194f
|
Merge branch 'dev' into bw/useless-assignments
|
2016-12-03 16:43:11 +10:30 |
|
Mackenzie Morgan
|
c2de65e515
|
Merge branch 'seed_photos' of gitmaco:maco/growstuff into seed_photos
|
2016-12-02 23:18:05 -05:00 |
|
Mackenzie Morgan
|
c201200e9b
|
correct schema and add index for photos_seeds
|
2016-12-02 23:17:01 -05:00 |
|
Mackenzie
|
04ba871949
|
Merge pull request #1108 from maco/fix_photo_requires
WIP: add require_relative to photo_capable concern for constants
|
2016-12-02 23:13:56 -05:00 |
|
Shiny
|
7785a9d797
|
Merge branch 'dev' into seed_photos
|
2016-12-03 09:31:20 +13:00 |
|
Shiny
|
1388aa3b06
|
Merge branch 'dev' into bw/useless-assignments
|
2016-12-03 08:23:19 +13:00 |
|
Mackenzie
|
519cf80200
|
Merge pull request #1111 from CloCkWeRX/658_automation
issue #658 i18n automation (updated)
|
2016-12-02 08:26:15 -05:00 |
|
pozorvlak
|
ce9e20b2f1
|
Merge branch 'dev' into 658_automation
|
2016-12-02 13:06:56 +00:00 |
|
Shiny
|
0c2a60ecc3
|
Reduce max AbcSize to 38 (#1112)
Reduce how complex methods are allowed to be, according to our code checker, so we're forced to write readable code
|
2016-12-02 08:06:53 -05:00 |
|
Mackenzie
|
fa1e46c2e7
|
Merge pull request #1110 from maco/codeclimate_ignores
ignore the minified bootstrap accessibility file for code climate checks
|
2016-12-02 08:02:47 -05:00 |
|
pozorvlak
|
7b0d17af59
|
Merge branch 'dev' into 658_automation
|
2016-12-02 12:05:05 +00:00 |
|
pozorvlak
|
4a8494ad06
|
Merge branch 'dev' into codeclimate_ignores
|
2016-12-02 12:04:07 +00:00 |
|
pozorvlak
|
3acaea2914
|
Merge branch 'dev' into fix_photo_requires
|
2016-12-02 12:03:53 +00:00 |
|
pozorvlak
|
0156795a29
|
Merge pull request #1114 from Br3nda/bw/phantom-403s
Revert "Changed phantomjs url to project official"
|
2016-12-02 11:05:12 +00:00 |
|
Brenda Wallace
|
7aaf6ea2ec
|
Revert "Changed phantomjs url to project official"
This reverts commit 7fcd3cba8d.
|
2016-12-02 20:21:41 +13:00 |
|
Daniel O'Connor
|
fa65be40a4
|
lib/tasks/i18n.rake:8:37: W: Lint/UnusedBlockArgument: Unused block argument - t. If it's necessary, use _ or _t as an argument name to indicate that it won't be used.
|
2016-12-02 15:51:29 +10:30 |
|
Daniel O'Connor
|
aa638b8a68
|
Missed from merge
|
2016-12-02 15:41:35 +10:30 |
|
Daniel O'Connor
|
49639c6244
|
Merge branch '658_automation' of github.com:CloCkWeRX/growstuff into 658_automation
|
2016-12-02 15:37:55 +10:30 |
|
Jim Stallings
|
e939be05f8
|
Add myself to contributors
|
2016-12-02 15:35:13 +10:30 |
|
Jim Stallings
|
160c6efd04
|
Remove example file, add documentation
|
2016-12-02 15:34:38 +10:30 |
|
Jim Stallings
|
fe6e269c64
|
GS-658 - i18n automation POC
|
2016-12-02 15:34:38 +10:30 |
|
Jim Stallings
|
81f2fa5fa4
|
GS-658: sort locale keys, add rake task for it
|
2016-12-02 15:31:07 +10:30 |
|
Shiny
|
bb0eb25dd3
|
Merge branch 'dev' into bw/useless-assignments
|
2016-12-02 14:04:30 +13:00 |
|
Shiny
|
077c807958
|
Merge branch 'dev' into seed_photos
|
2016-12-02 14:04:12 +13:00 |
|
Daniel O'Connor
|
07ba39c117
|
Merge branch 'dev' into codeclimate_ignores
|
2016-12-02 11:33:04 +10:30 |
|
Daniel O'Connor
|
266455eda6
|
Merge pull request #1105 from maco/wikipedia_regex
expand wikipedia regex to include -, (, and )
|
2016-12-02 11:32:26 +10:30 |
|
Brenda Wallace
|
03cb4a8dee
|
use find_or_initialize_by
|
2016-12-02 00:23:46 +00:00 |
|
Brenda Wallace
|
d87de13215
|
Merge remote-tracking branch 'origin/bw/find-by' into bw/useless-assignments
|
2016-12-01 23:46:50 +00:00 |
|
Mackenzie Morgan
|
ceac906a3f
|
ignore the minified bootstrap accessibility file for code climate checks
|
2016-12-01 14:00:18 -05:00 |
|
Mackenzie Morgan
|
2fb34bea18
|
narrow the regex back down
hyphen must be the LAST thing in the character class
|
2016-12-01 13:39:43 -05:00 |
|
Mackenzie Morgan
|
a3c8bc0586
|
include the migration
|
2016-12-01 13:23:52 -05:00 |
|
Mackenzie Morgan
|
637b46ef10
|
add photos to seeds
Fixes #495
|
2016-12-01 12:54:55 -05:00 |
|
Mackenzie Morgan
|
b38945d62f
|
add require_relative to photo_capable concern for constants
starts #1107
|
2016-12-01 12:53:45 -05:00 |
|
Mackenzie Morgan
|
54628e6d8c
|
expand wikipedia regex to include punctuation, because some have - or () in name
(Fixes: #1104)
|
2016-12-01 12:25:48 -05:00 |
|
pozorvlak
|
5cb1e14d7b
|
Merge pull request #1095 from maco/photo_concern
DRY up photo & model interaction
|
2016-12-01 15:16:21 +00:00 |
|
Daniel O'Connor
|
7032436f7b
|
Merge branch 'dev' into bw/useless-assignments
|
2016-12-01 22:15:50 +10:30 |
|
Daniel O'Connor
|
83a3c3e72f
|
Merge pull request #1102 from cesy/railsupdate
Update rails
|
2016-12-01 22:04:32 +10:30 |
|
Cesy Avon
|
3d845f47b9
|
Update rails
|
2016-12-01 09:42:55 +00:00 |
|
Brenda Wallace
|
d2fb96b3d7
|
change where.first -> find_by
|
2016-12-01 22:14:50 +13:00 |
|
Brenda Wallace
|
aba06c1faf
|
Case insensitive crop look up
|
2016-12-01 21:29:28 +13:00 |
|
Brenda Wallace
|
dc504fe363
|
use Member.case_insensitive_login_name
|
2016-12-01 21:29:00 +13:00 |
|
Brenda Wallace
|
cba02ae05c
|
Convert where.first to find_by
|
2016-12-01 20:25:28 +13:00 |
|
Brenda Wallace
|
37adbe5f48
|
Moved case-insensitve login look up to method
|
2016-12-01 20:25:19 +13:00 |
|
Brenda Wallace
|
ae26e3f936
|
Moved login_name_or_email query to own method
|
2016-12-01 20:25:10 +13:00 |
|