Korab Hoxha
|
4e7b0cf698
|
Remove img-rounded
|
2015-07-09 02:26:48 +02:00 |
|
Korab Hoxha
|
bfb4053bb4
|
Change to "img-rounded"
|
2015-03-25 16:05:30 +01:00 |
|
Korab Hoxha
|
2aad8a0ed0
|
Change to "img-rounded"
|
2015-03-25 16:05:07 +01:00 |
|
Korab Hoxha
|
7c1cce40b2
|
Update leaflet_overrides.css.less
|
2015-03-25 15:50:43 +01:00 |
|
Korab Hoxha
|
c8903ba25f
|
"img-circle" for users
|
2015-03-15 02:43:43 +01:00 |
|
Korab Hoxha
|
3a5cf37dc0
|
"img-circle" class for members gravatar
|
2015-03-13 12:58:06 +01:00 |
|
Korab Hoxha
|
8631b1fc99
|
Add background to thumbnail
|
2015-03-13 11:33:20 +01:00 |
|
Mackenzie
|
6505254e6c
|
Merge pull request #724 from tygriffin/pending-rejected-sci-alt-names
Pending rejected sci alt names
|
2015-03-04 20:17:33 -05:00 |
|
Taylor Griffin
|
ead9a250af
|
test that status message appears when rejected / pending
|
2015-02-27 07:56:30 +11:00 |
|
Taylor Griffin
|
3a9ec8cf6d
|
include crop approval status in sci and alt names
|
2015-02-27 07:39:07 +11:00 |
|
pozorvlak
|
c76e9ccbf6
|
Merge pull request #722 from maco/approved_crops
remove pending/rejected crops from browse and test that, change links on...
|
2015-02-25 20:18:26 +00: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 |
|
Mackenzie
|
7bca5c8845
|
Merge pull request #715 from Skud/requestcrops
Improvements to crop requests
|
2015-02-20 22:11:28 -05:00 |
|
Mackenzie
|
017df0484c
|
Merge pull request #716 from oshiho3/PT80956846_crop_search
exclude unapproved crops from search
|
2015-02-20 22:04:53 -05:00 |
|
Shiho Takagi
|
d338bab82b
|
travis to test both with and without elasticsearch
|
2015-02-18 16:18:24 +11:00 |
|
Shiho Takagi
|
35f8c126b6
|
using scope for searching only approved records
|
2015-02-18 15:38:28 +11:00 |
|
Shiho Takagi
|
eafe90e295
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
|
2015-02-18 11:37:30 +11:00 |
|
Shiho Takagi
|
7b911034b8
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
|
2015-02-18 11:37:11 +11:00 |
|
Shiho Takagi
|
798b89db11
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
|
2015-02-18 11:36:21 +11:00 |
|
Shiho Takagi
|
506e3e550c
|
update sql search to excludes unapproved crops
|
2015-02-18 11:26:14 +11:00 |
|
Shiho Takagi
|
8ab3167a28
|
update sql search to excludes unapproved crops
|
2015-02-18 11:15:15 +11:00 |
|
Shiho Takagi
|
436e7e3c59
|
Merge branch 'dev' of https://github.com/Growstuff/growstuff into PT80956846_crop_search
|
2015-02-18 10:33:48 +11:00 |
|
Skud
|
9f1091a1c8
|
Merge pull request #717 from maco/cms
change footer section names to generic footer1, footer2, footer3
|
2015-02-18 08:20:58 +11:00 |
|
Mackenzie Morgan
|
3b1e855da3
|
change footer section names to generic footer1, footer2, footer3 because we're going to CMS mode
|
2015-02-17 13:51:06 -05:00 |
|
Mackenzie
|
d7f8bff17a
|
Merge pull request #714 from Skud/search_tweaks
Fixed various problems with searches
|
2015-02-17 09:15:25 -05:00 |
|
Shiho Takagi
|
a7caa2fbaa
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
Conflicts:
spec/models/crop_spec.rb
|
2015-02-18 00:49:21 +11:00 |
|
Shiho Takagi
|
b215ef03c7
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
Conflicts:
spec/models/crop_spec.rb
|
2015-02-18 00:47:46 +11:00 |
|
Shiho Takagi
|
3cbbbc79fb
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
Conflicts:
spec/models/crop_spec.rb
|
2015-02-18 00:39:56 +11:00 |
|
Shiho Takagi
|
eb5e9e926b
|
fixing Travis CI error
|
2015-02-18 00:37:58 +11:00 |
|
Shiho Takagi
|
ef2d1eb683
|
fixing Travis CI error
|
2015-02-18 00:17:53 +11:00 |
|
Shiho Takagi
|
965f87393d
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
Conflicts:
spec/models/crop_spec.rb
|
2015-02-17 23:56:26 +11:00 |
|
Shiho Takagi
|
023333b15f
|
exclude unapproved crops from search
|
2015-02-17 23:52:02 +11:00 |
|
Shiho Takagi
|
2241a760c2
|
exclude unapproved crops from search
|
2015-02-17 23:33:39 +11:00 |
|
Skud
|
e4dabd1725
|
Fix action links in sidebar - can't do stuff if not approved
|
2015-02-17 20:54:16 +11:00 |
|
Skud
|
1dfac3fb2f
|
Improving crop request form
|
2015-02-17 20:44:24 +11:00 |
|
Skud
|
d0f856d389
|
Fixed various problems with search matching
|
2015-02-17 19:20:25 +11:00 |
|
Mackenzie
|
ac6aa730c1
|
Merge pull request #711 from maco/cms
move cms admin to /admin/cms at skud's request
|
2015-02-17 00:30:38 -05:00 |
|
Mackenzie Morgan
|
cd12412b46
|
move cms admin to /admin/cms at skud's request
|
2015-02-16 23:19:25 -05:00 |
|
Taylor Griffin
|
28288c51fe
|
Merge pull request #707 from oshiho3/PT80956846_crop_search
fixing issue with 1)paginating crop search and 2)crop name autocomplete
|
2015-02-13 06:11:29 +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 |
|
Taylor Griffin
|
e906d293a2
|
Merge pull request #702 from tygriffin/request-crop-links
Request crop links
|
2015-02-12 22:25:54 +11:00 |
|
Taylor Griffin
|
abdc43ef40
|
Merge pull request #705 from oshiho3/PT80956846_crop_search
Fixes and improvement
|
2015-02-12 22:25:08 +11:00 |
|
Shiho Takagi
|
3ed7edbfbf
|
merge
|
2015-02-12 21:09:42 +11:00 |
|
Shiho Takagi
|
7e9f18e89e
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
|
2015-02-12 16:42:55 +11:00 |
|
Shiho Takagi
|
e09f050088
|
updated the crop search query for more accurate search
|
2015-02-12 16:42:36 +11:00 |
|
Shiho Takagi
|
5bfab90b5b
|
updated the crop search query for more accurate search
|
2015-02-12 16:31:57 +11:00 |
|
Taylor Griffin
|
3289e7b950
|
Merge branch 'dev' of https://github.com/Growstuff/growstuff into fix-request-new-crop
|
2015-02-10 22:12:40 +11:00 |
|
Taylor Griffin
|
102763f2ab
|
link to new crop request form
|
2015-02-10 22:12:22 +11:00 |
|
Skud
|
09a78d4661
|
Merge pull request #701 from Skud/search_tweaks
Search tweaks
|
2015-02-10 20:57:32 +11:00 |
|
Skud
|
e0d8126514
|
Merge pull request #694 from maco/cms
Add comfortable mexican sofa CMS to growstuff & make footer use it
|
2015-02-10 20:53:50 +11:00 |
|