mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-05 12:42:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,057 Commits 102 Branches 96 Tags
release13
Commit Graph
442 Commits
Author SHA1 Message Date
Daniel O'Connor 6b059cb4f4 Clean up a bit as per #1013 with TODO comments 2016-07-08 17:06:05 +09:30
Daniel O'Connor c803ed4ee6 Merge pull request #976 from pozorvlak/remove_default_shows 
Remove "show" methods that just do the default
 2016-07-08 16:56:25 +09:30
Daniel O'Connor c3d9885525 Merge pull request #987 from CloCkWeRX/upgradazzle_rails 
Upgrade to rails 4.2.0+ (round 2)
 2016-06-29 14:47:05 +09:30
Mackenzie b08a448fdc hotfix commit: letsencrypt try #2 2016-06-20 13:40:49 -04:00
Mackenzie Morgan 039978357b letsencrypt verification for staging 2016-06-20 11:48:19 -04:00
pozorvlak a66a040207 Revert "Handled Issue #950 (Branded Error Pages)" 2016-06-16 12:58:22 +01:00
Prashanth 483143f2fe Merge branch 'growstuff-dev' into dev 
Conflicts:
	CONTRIBUTORS.md
 2016-06-14 17:09:06 +05:30
Prashanth b9f40151d8 Handled Issue #950 (Branded Error Pages) 
Moved error related views from public to errors (asset pipeline can be used).
Header and footer were included along with the error message.
 2016-06-10 18:35:48 +05:30
Daniel O'Connor 7fe75ee52a Fix DEPRECATION WARNING: #deliver is deprecated. 2016-06-10 15:45:01 +09:30
pozorvlak f3dc2ff7e5 Replace deprecated Devise for method with permit 
This should eliminate the screens-ful of deprecation warnings when
running the test suite.
 2016-06-08 15:00:05 +00:00
pozorvlak e6209a5906 Remove "show" methods that just do the default 
We can just fall back to the default implementation for these.
 2016-06-08 15:58:45 +01:00
pozorvlak a8961c3466 Revert "Show concern" 2016-06-08 12:58:32 +01:00
Mackenzie Morgan ed468e79fc Merge branch 'dev' of gitmaco:Growstuff/growstuff into show_concern 2016-06-07 09:57:47 -04:00
Eric Tillberg 3ac42deae5 crop approval flash alert for wranglers upon sign in 2016-05-29 16:13:21 -04:00
Mackenzie Morgan 8c2aa4844f use CW's case statement idea 2016-05-25 15:15:09 -04:00
Mackenzie Morgan 8648db5518 create SimpleShow concern for models where show's json call is simple 2016-05-25 13:37:01 -04:00
Mackenzie Morgan b601fe40b3 refactor photo controller create for readability 2016-05-24 16:59:52 -04:00
Cesy f5b20c2f32 About is empty, policy won't work without the routes 2016-05-22 16:01:40 +00:00
twconquest 397bfd8bca Start removing static page references. 2016-05-22 16:01:40 +00:00
Kevin Rio 5a31619b46 If i reply to a notification directly, it's not marked as read. #507 2016-05-19 15:53:11 -04:00
Daniel O'Connor 4b4e0cf69a $ rubocop --only HashSyntax --auto-correct 
483 files inspected, 2018 offenses detected, 2018 offenses corrected
 2016-05-19 15:53:11 -04:00
Savant Krishna 9e7a80cb86 Fix bug #827 : Error in generating csv file for plantings with owner filter 2015-09-07 04:01:20 -04:00
Anthony Atkinson cbb50df8d0 Resolved #562 - Pagination of notifications. 2015-07-25 13:18:30 -04:00
AELOGICA a581b759a3 Added tests for creating crops with multiple scientific and alternate names 2015-07-17 07:31:53 +08:00
AELOGICA 734b57e395 Fixed feature test errors 2015-07-17 07:31:53 +08:00
AELOGICA 12d151b68c Added multiple forms for scientific and alternate names on crop creation 2015-07-17 07:31:51 +08:00
Jym Paul A. Carandang 9f3d3b2b8f Signout redirects to last page visited 2015-07-10 12:51:36 +08:00
pozorvlak edcbc939e3 Merge pull request #728 from oshiho3/575-one-click-email-unsubscribe 
#575 One click email unsubscribe
 2015-07-08 22:06:29 +01:00
AELOGICA 4ca4d6b030 Fixed error where progress bars do not change upon update 2015-07-07 08:20:43 +08:00
AELOGICA 372a7f080d Added the days before maturity feature #678 2015-07-07 08:20:42 +08:00
pozorvlak 45c0adb044 Merge pull request #757 from CjayBillones/code-refactoring 
[Refactoring] Replace .count and .length with .size for collections
 2015-07-02 11:12:44 +01:00
Cjay Billones bb88041fef [Refactoring] Replace .count and .length with .size for collections 
Improved program efficiency (in querying in particular) by replacing .count and .length with .size for collections.

Fix error in refactoring

Reverted some .size into .count
 2015-06-25 12:09:03 +08:00
AELOGICA 87f1c6c26d Added an alert for empty string search. 2015-06-23 14:33:13 +08:00
Miles Gould 5bb04dc1a4 Merge branch 'pr/745' into dev 2015-06-16 19:54:33 +01:00
Vincent Wong 60df62f3fa added flash message when deleting messages 2015-06-06 14:36:03 +10:00
Andrey e35ebab380 Reply to notification action 2015-05-27 11:56:24 +10:00
Shiho Takagi 3b42806b77 Modified wordings 2015-05-22 13:46:19 +10:00
Jake Yesbeck 0d55b54371 Use a constant for the default robots.txt filename 2015-05-05 09:05:00 -07:00
Jake Yesbeck 81ce6ed8a3 Make sure file exists before attempting to render it 2015-05-05 08:58:33 -07:00
Jake Yesbeck 0f8d1e7db1 Change the render to render the file directly 
Also assert that the response is the actual file contents
instead of mocking the method call
 2015-05-04 23:37:40 -07:00
Jake Yesbeck 507e5a0ebc Robots controller and custom robots.txt files 
New route to /robots.txt and some specific logic to switch
on if the subdomain is staging or not.

Staging will not allow any crawlers at all, production does not
have any current limitations
 2015-05-04 23:11:41 -07:00
Shiho Takagi 9f33f497bc improved coding 2015-03-11 13:06:23 +11:00
Shiho Takagi ad6c1ba2dc tiding up the code 2015-03-08 15:10:30 +11:00
Shiho Takagi 3a1bd78252 Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe 2015-03-08 14:29:28 +11:00
Shiho Takagi 40adc379ae Merge branch 'dev' of https://github.com/Growstuff/growstuff into 575-one-click-email-unsubscribe 2015-03-06 10:51:09 +11:00
Mackenzie Morgan 1b62c5cb97 remove pending/rejected crops from browse and test that, change links on wrangling page to go directly to crop edit and update tests for that 2015-02-25 00:05:56 -05:00
Shiho Takagi 0f52ea5aad one click unsubscription 2015-02-25 10:26:04 +11:00
Skud d0f856d389 Fixed various problems with search matching 2015-02-17 19:20:25 +11:00
Shiho Takagi 70cdab96c4 fixing issue with 1)paginating crop search and 2)crop name autocomplete 2015-02-12 23:00:04 +11:00
Skud 09a78d4661 Merge pull request #701 from Skud/search_tweaks 
Search tweaks
 2015-02-10 20:57:32 +11:00