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
Skud
66fcad69fa
Paginate search results, make sexy subtitles
2015-02-10 20:48:36 +11:00
Skud
78c4fc36b1
Paginate search results
...
... and include total number in subtitle
2015-02-10 19:26:07 +11:00
Skud
0fc4c3cb4d
Made search result page show a suitable title
2015-02-10 19:07:50 +11:00
Taylor Griffin
cbb4f9d7ac
add rejection notes
2015-02-09 22:17:32 +11:00
Taylor Griffin
2db7bf638b
improve copy for new request email
2015-02-09 20:41:28 +11:00
Savant Krishna
49a5a26f17
Functionality to sort members by recently joined : Issue #550
2015-02-09 17:47:25 +11:00
Skud
f7a2ec2054
Merge pull request #676 from pozorvlak/seed_properties
...
New seed properties: days until maturity, organic, GMO, heirloom
2015-02-09 14:07:20 +11:00
Taylor Griffin
076a6cc1df
catch up with upstream dev
2015-02-04 21:41:42 +11:00
Taylor Griffin
80a28085f1
make pending crops unviewable to regular members
2015-02-04 14:44:12 +11:00
Taylor Griffin
abece6473b
make rejected and pending crops viewable on wrangle crops page
2015-02-04 14:18:10 +11:00
Taylor Griffin
ff1b941690
validate that a crop hasn't already been rejected or approved
2015-02-04 06:56:51 +11:00
Miles Gould
c1870d46a2
Merge branch 'dev' into seed_properties
...
Conflicts:
db/schema.rb
2015-02-02 17:45:49 +00:00
Mackenzie Morgan
7ca89908cd
merge from upstream
2015-02-01 22:00:52 -05:00
Taylor Griffin
40d13fadb3
write feature spec for requesting a crop
2015-02-01 23:29:31 +11:00
Taylor Griffin
4211ebec76
add request notes to crop request
2015-02-01 17:56:51 +11:00
Taylor Griffin
e86200b942
requester receives a message when crop request is rejected
2015-02-01 17:32:49 +11:00
Taylor Griffin
776b5450f9
requester receives email when crop request is approved
2015-02-01 17:20:48 +11:00
Taylor Griffin
c80b42d9bc
change from approved boolean to approval_status string
2015-02-01 16:52:31 +11:00
Miles Gould
089a3d5c24
Merge branch 'dev' into seed_properties
...
Conflicts:
db/schema.rb
2015-02-01 00:03:10 +00:00
Taylor Griffin
a8c203aea0
send emails to all crop wranglers when a new crop is requested
2015-02-01 09:32:50 +11:00
Shiho Takagi
2aa30475e9
merge
2015-02-01 00:14:52 +11:00
