mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 5dc8bc5ec5 Order plantings and harvests in email 2018-06-04 17:35:06 +12:00
Brenda Wallace 0f8747f03d Turn on the CMS specs again 2018-06-04 17:13:00 +12:00
Brenda Wallace 3399a794b2 Ignore one non-ascii comment 2018-06-04 16:55:29 +12:00
Brenda Wallace cf72bdc57d Reinstate json response config 2018-06-04 16:49:41 +12:00
Brenda Wallace 48589150a7 Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5 2018-06-04 16:49:27 +12:00
Brenda Wallace 1f6d76445e Added back CMS initialiser 2018-06-04 16:49:00 +12:00
Brenda Wallace a816ec2bba Fix up footer 2018-06-04 16:44:51 +12:00
Brenda Wallace f31ff5d508 Removed commented out gems 2018-06-04 16:42:37 +12:00
Brenda Wallace 7737f41b7f Code style fixup 2018-06-04 16:39:51 +12:00
Brenda Wallace fd405ccad0 Added back link to CMS 2018-06-04 16:37:57 +12:00
Brenda Wallace 4be4e96a9f Fixed or => || 2018-06-04 16:30:38 +12:00
Brenda Wallace 4d937a1f91 Restoring Comfy mexican sofa 2018-06-04 16:29:38 +12:00
Brenda Wallace 326e972e9b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-06-04 16:21:51 +12:00
Brenda Wallace f58c6c8f54 Regen rubocop todo 2018-06-04 16:20:39 +12:00
Brenda Wallace 05bfbda5f5 Rubocop style fix ups 2018-06-04 16:18:49 +12:00
Brenda Wallace d7cc219569 Unique login_name in member factory 2018-06-04 16:16:55 +12:00
Brenda Wallace bcaf245e64 photos#new doesn't redirect, needs item 2018-06-04 16:10:24 +12:00
Brenda Wallace 748da6c3e6 Comments from deleted members need to show 2018-06-04 16:02:07 +12:00
Brenda Wallace 517cfa3acd spec fixes 2018-06-04 15:34:50 +12:00
Brenda Wallace a590b89302 Photos in spec needs to have same owner as item they link to 2018-06-04 15:29:59 +12:00
Brenda Wallace 127b72b279 Updated spec to look for 404 page instead of exception 2018-06-04 12:09:31 +12:00
Brenda Wallace a221f10113 Move photos owner validation to models 2018-06-04 12:03:11 +12:00
Brenda Wallace b898d83d21 Fix up notification redirect spec 2018-06-04 11:49:30 +12:00
Brenda Wallace 6913233596 Use factorybot in more tests 2018-06-04 11:39:22 +12:00
Brenda Wallace 02c5571a9a Notifications need sender and reciever in factory 2018-06-04 11:38:15 +12:00
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