mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 23:57:07 -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
cc838e19b5 Show a 404 page on record not found 2018-06-04 10:59:34 +12:00
jenkr55
9e182b07aa Dont allow any kind of newline 2018-05-28 12:46:08 -05:00
jenkr55
f67e8ceb95 Dont allow newlines 2018-05-28 12:29:44 -05:00
jenkr55
a973485c4b Allow ascii 2018-05-28 12:04:44 -05:00
jenkr55
f1a4bd19aa New slug regex 2018-05-27 13:06:32 -05:00
jenkr55
8c5817f511 Still works with newline characters 2018-05-20 16:03:06 -05:00
jenkr55
1b1870095f Allow garden name macrons test description accurate 2018-05-20 15:15:58 -05:00
jenkr55
cc1aaeb5ce Updating test to allow numbers (description previously inaccurate) 2018-05-20 15:15:18 -05:00
jenkr55
2f5fa635c8 Validate for non-blank garden name 2018-05-20 14:57:57 -05:00
jenkr55
303e259fd4 Dont allow nil or blank names 2018-05-20 14:56:11 -05:00
jenkr55
3b5c953c57 Remove regex not letting utf-8 garden names save 2018-05-20 13:34:38 -05:00
Brenda Wallace
78d9e3c970 Merge pull request #1622 from Growstuff/awesomecode-factorybot/createlist-12138 
Auto corrected by following FactoryBot/CreateList
 2018-05-13 07:30:24 +12:00
Daniel O'Connor
a772bdaa8d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-10 21:35:39 +09:30
Brenda Wallace
0402fee04d Merge pull request #1637 from Br3nda/fix/remote-currency-methods 
Remove some old currency methods from application helper
 2018-05-08 07:52:36 +12:00
Brenda Wallace
9290e6d27a Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-05-02 20:08:42 +12:00
Brenda Wallace
7a1499d854 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-01 13:47:44 +12:00
Brenda Wallace
152cdace75 Removed spec for currency helpers 2018-05-01 13:47:25 +12:00
Brenda Wallace
ed3ae8bbd6 Remove some old currency methods from application helper 2018-05-01 13:47:25 +12:00
Brenda Wallace
81adae77f8 Merge pull request #1639 from Growstuff/bundle-update-2018-04-29-130926 
Bundle Update on 2018-04-29
 2018-04-29 18:30:55 +12:00
deppbot
681b5bbd8c Bundle Update on 2018-04-29 2018-04-29 13:09:27 +08:00
Brenda Wallace
4e6ffc1a63 Removed spec for currency helpers 2018-04-28 22:21:35 +12:00
Brenda Wallace
1bbf0a3c18 Simplifying show_inactive_tickbox_path method 2018-04-28 22:11:02 +12:00
Brenda Wallace
cd910e74bc Don't need to throw exception on planting save error 2018-04-28 22:05:50 +12:00
Brenda Wallace
9cfdb93aa3 Remove some old currency methods from application helper 
Conflicts:
	app/helpers/application_helper.rb
 2018-04-28 21:50:15 +12:00
Brenda Wallace
90f8b9e042 Fixed last crop spec for rails5 ugprade 2018-04-28 21:30:08 +12:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
832cfde28d Merge pull request #1635 from Growstuff/bundle-update-2018-04-26-092357 
Bundle Update on 2018-04-26
 2018-04-28 21:15:22 +12:00
Brenda Wallace
aa9841dc7d Pinned elastic search to 5.0.0. or later 2018-04-28 18:34:26 +12:00
pozorvlak
caa59df3bd Merge pull request #1625 from Growstuff/dev 
Release 46
 2018-04-27 17:04:31 +01:00
Brenda Wallace
102eaf3d6b Merge branch 'dev' into bundle-update-2018-04-26-092357 2018-04-26 17:39:03 +12:00
Brenda Wallace
61ebd5fe99 Merge pull request #1632 from Br3nda/feature/i18n 
i18n for plantings#index
release46 		2018-04-26 17:38:32 +12:00
Brenda Wallace
7e0e936509 Merge branch 'dev' into bundle-update-2018-04-26-092357 2018-04-26 17:27:13 +12:00
Brenda Wallace
d3faa75d1d Merge branch 'dev' into feature/i18n 2018-04-26 17:26:55 +12:00
Brenda Wallace
1575ee1ddd Merge pull request #1620 from Br3nda/feature/status 
Badges for ready to harvest, days to finished
 2018-04-26 17:26:36 +12:00
deppbot
5b5eacb738 Bundle Update on 2018-04-26 2018-04-26 09:23:58 +08:00
Brenda Wallace
85eea89792 i18n for plantings#index 2018-04-23 15:40:56 +12:00
Brenda Wallace
fc46685ab9 Renamed should_be_finshed? to late? 2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d Rename zombie to super_late 2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +12:00
Brenda Wallace
9112d4e2bb Merge pull request #1630 from jenkr55/ProfileGardenDisplayImprovements 
Profile garden display improvements
 2018-04-22 15:33:42 +12:00
jenkr55
eed0b257fa Fixing test because I removed this line 2018-04-21 22:03:31 -05:00
jenkr55
25bba9c126 format fixes 2018-04-21 21:55:29 -05:00
jenkr55
028c2a28a5 unneeded class 2018-04-21 21:52:55 -05:00
jenkr55
fa28fe25b6 Fixing responsive design issues 2018-04-21 21:43:19 -05:00
jenkr55
77978a76f2 Fixing notes display bug on harvest card 2018-04-21 21:27:40 -05:00
jenkr55
7be10957ec WIP different profile page 2018-04-21 21:05:58 -05:00
jenkr55
c94d08c816 Moving bio to be by other profile information 2018-04-21 20:09:23 -05:00
Brenda Wallace
9fdc9e76df Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-22 12:14:23 +12:00
Brenda Wallace
eba03d0662 Merge pull request #1627 from jenkr55/InActiveFixes 
Fixing broken "in-active" checkbox
 2018-04-22 12:11:34 +12:00
Brenda Wallace
53d7cddea1 Merge branch 'dev' into InActiveFixes 2018-04-22 08:54:27 +12:00