mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-05 04:32:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 100 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shiny 46a0956f5f Merge pull request #1124 from Br3nda/bw/load-resource 
Cancan already loads the resource
 2016-12-09 07:29:28 +13:00
Brenda Wallace 4f465d808c We don't need to load the resource again 2016-12-07 23:54:03 +00:00
Shiny 8161e90fbd Merge branch 'dev' into bw/bar_graphs 2016-12-08 12:35:59 +13:00
Shiny aea935be4b Merge pull request #1122 from Br3nda/bw/duplicate-query 
Gardens query was running twice in contoller
 2016-12-08 12:32:20 +13:00
Brenda Wallace e695d5646a FIX Gardens query was running twice in contoller 2016-12-07 22:27:17 +00:00
Daniel O'Connor a074e72b9b Merge branch 'dev' into bw/bar_graphs 2016-12-07 13:36:21 +10:30
Daniel O'Connor e799233fb7 Merge pull request #1119 from Br3nda/bw/ParenthesesAsGroupedExpression 
Fixed parentheses that are interp-ed as grouped expression
 2016-12-07 12:30:38 +10:30
Brenda Wallace d4a496eb1c Removed duplicate variable assignment 2016-12-07 12:26:12 +13:00
Brenda Wallace a23e241480 Eslint clean ups 2016-12-07 12:22:33 +13:00
Brenda Wallace af424103f4 Code style fix up (comments only) 2016-12-07 11:34:17 +13:00
Brenda Wallace d68cfe0486 Move the invocation into the parens that contain the function 2016-12-07 11:33:30 +13:00
Brenda Wallace 0f15095129 Fix up css style 2016-12-07 11:30:17 +13:00
Brenda Wallace 6e0e7e4de1 Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs 
Conflicts:
	CONTRIBUTORS.md
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/crops.js.erb
	app/views/crops/show.html.haml
 2016-12-07 11:17:30 +13:00
Shiny 00e240c038 Merge branch 'dev' into bw/ParenthesesAsGroupedExpression 2016-12-07 10:06:50 +13:00
Brenda Wallace 05e7a27782 Call to verify options stays as a hash 2016-12-07 10:04:17 +13:00
Mackenzie 53477485ef Merge pull request #1117 from Br3nda/bw/AmbiguousOperator 
Fixed AmbiguousOperator
 2016-12-06 12:40:21 -05:00
Mackenzie c760112e1b Merge pull request #1118 from Br3nda/bw/assignment-in-condition 
Don't use assignments in conditions
 2016-12-06 12:40:00 -05:00
Mackenzie 0e8146b7ee Merge pull request #1120 from Br3nda/bw/more-enwikipedia-chars 
Yet another wikipedia url char added to regex
 2016-12-06 12:39:33 -05:00
Brenda Wallace a7bafafa06 Yet another wikipedia url char added to regex 2016-12-06 21:58:17 +13:00
Brenda Wallace 464c570d99 Fixed parentheses that are interp-ed as grouped expression 2016-12-06 21:23:55 +13:00
Brenda Wallace abc5ac5f29 Don't use assignments in conditions 2016-12-06 21:18:13 +13:00
Brenda Wallace 4c6f0fc929 Fixed AmbiguousOperator 2016-12-06 21:09:39 +13:00
Daniel O'Connor 41e408b04a Merge pull request #1116 from Br3nda/bw/returns 
Removed redundant returns
 2016-12-06 11:20:45 +10:30
Brenda Wallace 8981a222ea Simplified display_weight 2016-12-06 00:32:20 +00:00
Brenda Wallace 91b0c1898e Simplifying display_harvest_description 2016-12-05 20:40:34 +00:00
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