mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 15:47:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
1f8413bf3e Remove highcharts.js, we're not using it 2018-01-23 09:00:34 +13:00
Brenda Wallace
59c3edcf82 Add timeline to gardens 2018-01-23 09:00:34 +13:00
Brenda Wallace
1bf05f81ab Convert to use chartkick gem 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/assets.rb
 2018-01-23 09:00:34 +13:00
Brenda Wallace
e6e88fa0c7 Fixed up tabulation 2018-01-23 09:00:34 +13:00
Brenda Wallace
308e834713 Wrap long line 2018-01-23 09:00:34 +13:00
Brenda Wallace
121deb4f48 Fix ordering of crops' parent on form 2018-01-23 09:00:34 +13:00
Brenda Wallace
4b65f28461 Added new line at end of file 2018-01-23 09:00:34 +13:00
Brenda Wallace
87708f1765 Tabulation and jsdoc fixes 2018-01-23 09:00:34 +13:00
Brenda Wallace
2cf335a064 Removed unused variables in js 2018-01-23 09:00:34 +13:00
Brenda Wallace
b205f35399 Wrapped a long line 2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c06207e3 more JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace
580fac6aa1 removed 2 unused variable in js 2018-01-23 09:00:34 +13:00
Brenda Wallace
4a696af9ba Fix up JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace
d2a060ad49 added JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace
d898f926d5 added JSDoc 2018-01-23 09:00:34 +13:00
Brenda Wallace
49444edc61 contributors/commits update 2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c7de381e converted variable to camel case 2018-01-23 09:00:34 +13:00
Brenda Wallace
61408d7e4e Some js cleanups 2018-01-23 09:00:34 +13:00
Brenda Wallace
9906036faf Add bootstrap js to codeclimate excludes 2018-01-23 09:00:34 +13:00
Brenda Wallace
e009d9532a Updating javascript style 2018-01-23 09:00:34 +13:00
Brenda Wallace
9f1c064900 Use the old "var" syntax, and max line 120 2018-01-23 09:00:34 +13:00
Brenda Wallace
8d3d8f3c91 Adding package lock, and eslint 2018-01-23 09:00:34 +13:00
deppbot
0feed2d359 Bundle Update on 2017-12-24 2018-01-23 09:00:34 +13:00
Brenda Wallace
d9bdc46099 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	app/assets/javascripts/members.js.erb
 2018-01-21 21:20:43 +13:00
Daniel O'Connor
ed18932a5d Merge pull request #1544 from Br3nda/fix/scope-js 
Scope js variables so they are not global
 2018-01-21 16:35:54 +10:30
Brenda Wallace
8cdefb6fcc Scope js variables so they are not global 2018-01-21 18:39:00 +13:00
Shiny
0938e2839a Merge pull request #1531 from Growstuff/awesomecode-rspec/multiplesubjects-7391 
Auto corrected by following RSpec/MultipleSubjects
 2018-01-21 17:33:13 +13:00
Daniel O'Connor
4e080c7fcd Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-20 16:23:02 +10:30
Daniel O'Connor
0cdaa12000 Merge pull request #1535 from Growstuff/awesomecode-style/mutableconstant-7391 
Auto corrected by following Style/MutableConstant
 2018-01-20 16:22:32 +10:30
Shiny
505c084f47 Merge branch 'dev' into awesomecode-style/mutableconstant-7391 2018-01-20 17:28:49 +13:00
Daniel O'Connor
a53fa7781c Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-18 14:07:34 +10:30
Daniel O'Connor
75d4740a91 Merge pull request #1532 from Growstuff/awesomecode-rspec/nottonot-7391 
Auto corrected by following RSpec/NotToNot
 2018-01-17 20:21:25 +10:30
Shiny
16c54d1c61 Merge branch 'dev' into awesomecode-style/mutableconstant-7391 2018-01-15 14:25:05 +13:00
Shiny
09045fabfc Merge branch 'dev' into awesomecode-rspec/nottonot-7391 2018-01-15 14:24:44 +13:00
Shiny
a2bea8aaf4 Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-15 14:24:38 +13:00
pozorvlak
0491ec1e4c Merge pull request #1527 from Br3nda/charts-with-specs 
Charts specs
 2018-01-14 22:54:10 +00:00
Shiny
4f0c004e50 Update crop_detail_page_spec.rb 2018-01-14 12:04:32 +13:00
Awesome Code
7fb2690306 Auto corrected by following Style/MutableConstant 2018-01-13 22:51:04 +00:00
Awesome Code
273e4c07d8 Auto corrected by following RSpec/NotToNot 2018-01-13 22:49:49 +00:00
Awesome Code
b6aef19be6 Auto corrected by following RSpec/MultipleSubjects 2018-01-13 22:49:36 +00:00
Shiny
d18b7df611 Merge branch 'dev' into charts-with-specs 2018-01-14 10:06:06 +13:00
Shiny
5f28e3e02d Merge pull request #1526 from pozorvlak/deploy_only_once 
Only deploy from the Elasticsearch build job
 2018-01-13 23:30:50 +13:00
Shiny
6efdcb74d3 Merge branch 'dev' into charts-with-specs 2018-01-13 22:58:57 +13:00
Shiny
d32d068527 Merge branch 'dev' into deploy_only_once 2018-01-13 22:58:15 +13:00
Shiny
09771d323a Merge pull request #1521 from Growstuff/awesomecode-style/orassignment-7269 
Auto corrected by following Style/OrAssignment
 2018-01-13 22:57:58 +13:00
Shiny
c618f7a690 Merge branch 'dev' into awesomecode-style/orassignment-7269 2018-01-13 22:19:45 +13:00
Brenda Wallace
3a4443a4fe Permissions (and specs) for charts json 2018-01-13 22:15:27 +13:00
Shiny
238f87f616 Merge branch 'dev' into deploy_only_once 2018-01-13 22:11:34 +13:00
pozorvlak
2a2bef71da Merge pull request #1518 from Growstuff/awesomecode-factorybot/dynamicattributedefinedstatically-7220 
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
 2018-01-12 11:51:54 +00:00
pozorvlak
b576b4b83e Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220 2018-01-12 11:38:49 +00:00