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
53c9f89bc1 Fixed up tabulation 2018-01-04 15:11:36 +13:00
Brenda Wallace
79f6f7097a updated npm package.json 2018-01-04 15:01:09 +13:00
Brenda Wallace
090bc02269 belongs_to defaults to required. setting some to optional 2018-01-04 14:55:36 +13:00
Brenda Wallace
2fd13e9b7c Updated new path to jquery autocomplete 2018-01-04 14:44:52 +13:00
Brenda Wallace
2109ee1561 Migrations need to specify a version 2018-01-04 14:42:25 +13:00
Brenda Wallace
79cf7b452c removing some cms stuff 2018-01-04 14:31:24 +13:00
Brenda Wallace
9d2732fffa removing comfortable mexican sofa for now 2018-01-04 14:29:09 +13:00
Brenda Wallace
e3a3c22e69 Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5 2018-01-04 14:05:41 +13:00
Shiny
ba2e4b5dce Merge branch 'dev' into upgrade/rails-5 2018-01-04 14:03:19 +13:00
pozorvlak
965fb28ab3 Merge branch 'dev' into js/cleanup 2018-01-03 11:07:35 +00:00
pozorvlak
196707e6e8 Merge pull request #1508 from Br3nda/fix/1502 
Fix/1502  Missing ordering, crops form
 2018-01-03 11:07:11 +00:00
Brenda Wallace
7bc91e415a Re-instate active_median gem 2018-01-03 19:09:32 +13:00
Brenda Wallace
d456d045cd Changed order of photo association relationship declarations 2018-01-03 17:24:51 +13:00
Brenda Wallace
4917ab9ae8 Fixed order->member relationship, after change to paranoia gem 2018-01-03 17:21:40 +13:00
Brenda Wallace
46d56fde31 Application job for Rails 5 2018-01-03 17:20:08 +13:00
Brenda Wallace
65d5b2d61a Application mailer for rails 5 2018-01-03 17:18:41 +13:00
Brenda Wallace
b6c9b13d4d Models inherit from application record 2018-01-03 17:16:14 +13:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +13:00
Brenda Wallace
f1c8743623 Config for rails 5 2018-01-03 17:10:50 +13:00
Brenda Wallace
26f525e88a Upgrade gems for rails 5 
Note: Unlocks elastic search gem, and removes debuggers
 2018-01-03 17:06:54 +13:00
Brenda Wallace
00130b3c0a Merge remote-tracking branch 'origin/fix/1502' into fix/1502 2018-01-03 15:12:31 +13:00
Brenda Wallace
d86de897c7 Wrap long line 2018-01-03 15:12:09 +13:00
Brenda Wallace
466a9d6d8a Merge remote-tracking branch 'upstream/dev' into dev 2018-01-03 15:10:08 +13:00
Shiny
0db3b3d532 Merge branch 'dev' into fix/1502 2018-01-03 15:10:00 +13:00
Brenda Wallace
a39c304fac Fix ordering of crops' parent on form 2018-01-03 15:06:55 +13:00
Brenda Wallace
ee1617c7c3 Added new line at end of file 2018-01-03 14:43:29 +13:00
Brenda Wallace
0a71bfe99f Tabulation and jsdoc fixes 2018-01-03 14:40:22 +13:00
Brenda Wallace
56b0562785 Removed unused variables in js 2018-01-03 14:24:08 +13:00
Brenda Wallace
2d98a7e793 Wrapped a long line 2018-01-03 14:21:29 +13:00
Brenda Wallace
978317f47a more JSDoc 2018-01-03 14:20:01 +13:00
Brenda Wallace
4570fda384 removed 2 unused variable in js 2018-01-03 13:03:10 +13:00
Brenda Wallace
122a7f17e2 Fix up JSDoc 2018-01-03 13:01:48 +13:00
Brenda Wallace
591c95dca2 added JSDoc 2018-01-03 12:56:52 +13:00
Brenda Wallace
e910bfd50f added JSDoc 2018-01-03 12:54:33 +13:00
Brenda Wallace
7c25161574 contributors/commits update 2018-01-03 12:48:13 +13:00
Brenda Wallace
0db2d6b346 converted variable to camel case 2018-01-03 12:42:20 +13:00
Brenda Wallace
5584da02c3 Some js cleanups 2018-01-03 12:35:30 +13:00
Brenda Wallace
7464668021 Add bootstrap js to codeclimate excludes 2018-01-03 12:02:21 +13:00
Brenda Wallace
29dcc01cde Merge remote-tracking branch 'upstream/dev' into js/cleanup 2018-01-03 11:54:09 +13:00
Brenda Wallace
a836d6432f Updating javascript style 2018-01-03 11:52:47 +13:00
Brenda Wallace
4e0f7e9086 Use the old "var" syntax, and max line 120 2018-01-03 11:49:06 +13:00
Brenda Wallace
93eba14af9 Adding package lock, and eslint 2018-01-03 11:28:12 +13:00
Shiny
7d51ba98ec Merge pull request #1500 from Growstuff/bundle-update-2017-12-24-080947 
Bundle Update on 2017-12-24
 2017-12-24 16:43:34 +13:00
deppbot
4ba210cf81 Bundle Update on 2017-12-24 2017-12-24 08:09:48 +08:00
Cesy
c08beb5291 Merge pull request #1495 from Growstuff/dev 
Release 37
release37 		2017-12-22 09:54:32 +00:00
pozorvlak
269f3164b7 Merge pull request #1497 from Br3nda/feature/admin-nicer 
Nicer admin interface
 2017-12-18 11:33:02 +00:00
Shiny
9d47b2b029 Merge branch 'dev' into feature/admin-nicer 2017-12-18 15:10:36 +13:00
Daniel O'Connor
81e26aaf02 Merge pull request #1496 from Br3nda/feature/ordering 
Feature/ordering
 2017-12-18 09:30:51 +10:30
Shiny
d62322b498 Merge branch 'dev' into feature/admin-nicer 2017-12-18 06:59:33 +13:00
Shiny
ebb2f90294 Merge branch 'dev' into feature/ordering 2017-12-18 06:59:17 +13:00