Skud
26d16b9d86
only admins can mess with products/orders for now
2013-05-07 21:24:26 +10:00
Skud
245115fd7f
rails g scaffold Order...
2013-05-07 21:14:08 +10:00
Skud
af38f8574e
rails g scaffold Product...
2013-05-07 21:13:23 +10:00
Skud
3eef44cce7
added products to seeds.rb in dev/test environments
2013-05-07 21:00:10 +10:00
Skud
cad5f453fa
rails g scaffold Product...
2013-05-07 20:56:10 +10:00
Skud
a29debff22
Merge pull request #196 from Growstuff/dev
...
Production push: search nearby by distance, connect to twitter and flickr, etc
2013-05-07 03:16:16 -07:00
pozorvlak
5ee8f216a4
Merge pull request #192 from Skud/roleseeds
...
create admin and wrangler users in dev environment
2013-05-07 03:08:33 -07:00
pozorvlak
e01cd33b3b
Merge pull request #195 from Skud/plantingcounts
...
added planting counts to crop pages
2013-05-07 03:04:59 -07:00
Skud
c95e722f99
added planting counts to crop pages
2013-05-03 15:09:29 +10:00
Skud
ad8a0110c5
One-off rake task to clean up empty notification subjects
...
Also fixed admin_user task to use login_name (case sensitive) rather
than the id-like stub generated by friendlyid (always lowercase).
2013-05-03 12:35:02 +10:00
Skud
e5526a3292
added validation for en_wikipedia_url
2013-05-02 13:27:12 +10:00
Lilly
4d372ab8f8
Added crop wrangling hints to crops form.
2013-05-02 12:13:28 +10:00
Skud
949821a947
create admin and wrangler users in dev environment
2013-05-02 11:18:46 +10:00
Miles Gould
6ab098c015
Move reply_link into a helper.
...
- keep @reply_link as an instance var, for testability
- always use fully-qualified URLs, to reduce code duplication
2013-05-01 23:45:07 +01:00
Miles Gould
c46ba2f16b
Delete unused helpers.
2013-05-01 16:27:29 +01:00
Cesy
7869e29682
Merge pull request #191 from Skud/flickr-connect
...
Flickr connect
2013-04-30 08:20:09 -07:00
Skud
e4dd0cba5b
added flickr link to profile page
2013-04-30 23:07:21 +10:00
Skud
45935c6e38
connect to flickr
2013-04-30 23:01:18 +10:00
Skud
d006854a6c
added omniauth-flickr gem
2013-04-30 22:55:40 +10:00
Skud
df1cded83c
added flickr key/secret
2013-04-30 22:10:05 +10:00
Skud
e0782c2346
fixed failing notifications tests
...
(our non-DRY code, which we just pasted into the mailer, was breaking
this in a roundabout way. this is a quick and not very nice fix. The
whole problem is resolved by @pozorvlak's recent "no subject" fix for
notifications, anyway.)
2013-04-30 21:56:42 +10:00
Miles Gould
aab0a438fd
Replace blank/nil notification subjects with (no subject)
2013-04-30 12:39:03 +01:00
gnattery
9d4caaa2b5
Do validation for empty and spaces-only strings
2013-04-30 12:23:17 +01:00
gnattery
939a10d2f4
Post subjects cannot be nil
2013-04-30 12:20:26 +01:00
Skud
c2dbebb046
Merge pull request #189 from pozorvlak/nearby
...
Find users within a given distance; allow specification of units.
2013-04-30 03:04:29 -07:00
Miles Gould
a41c60b7de
Be even more paranoid about params[:units]
...
And save a to_s call while we're at it.
2013-04-30 10:54:52 +01:00
Miles Gould
40b9104094
Make units dropdown wide enough to contain "miles".
...
It's now "miles" wide. Hehehe.
2013-04-30 10:43:40 +01:00
Miles Gould
8bc4d8f4ce
Use km by default.
2013-04-30 10:39:57 +01:00
Skud
9ba92e580d
Merge pull request #187 from pozorvlak/show_comments
...
Show existing comments when creating or editing a comment on a post
2013-04-30 02:19:38 -07:00
Cesy
56181144b3
Merge pull request #178 from Skud/faq-tweak
...
removed Courtney from about section
2013-04-30 00:27:50 -07:00
Cesy
9a484c8aa3
Merge pull request #188 from Skud/credentials-example
...
added credentials.example
2013-04-30 00:27:08 -07:00
Cesy
fc8edb3efa
Merge pull request #177 from Skud/contact
...
added contact link to footer
2013-04-30 00:25:57 -07:00
Cesy
d59b944338
Merge pull request #175 from Skud/contributing
...
added CONTRIBUTING.md
2013-04-30 00:24:13 -07:00
Skud
c56666e68f
added credentials.example
2013-04-30 10:11:22 +10:00
Miles Gould
c53dd6797f
Show other comments on post when editing a comment.
2013-04-29 21:44:30 +01:00
Miles Gould
2b84fa8bad
Show previous comments when creating a comment.
...
- Move "show previous comments" into a partial
- invoke said partial from the new comment form
- add tests.
2013-04-29 21:30:26 +01:00
Skud
11f979313a
Added reply link to notification email.
...
Note: this breaks DRY but we couldn't figure out how to put it in a
helper and make it useable by both the controller and the mailer.
Suggestions/help much appreciated!
2013-04-29 18:55:13 +10:00
Skud
844f2c845e
removed unused random crop code
2013-04-29 18:26:22 +10:00
Skud
36290c82ed
Added a reply link to the notifications/show page
...
- sets subject "Re: whatever" for PMs
- also removed "sender=N" from PM link (wtf! -- it wasn't doing anything
but it looked bad.)
2013-04-29 18:09:55 +10:00
Skud
c6f34d387a
Merge pull request #185 from attlebish/fix-email-formatting
...
Fix email formatting
2013-04-28 23:30:25 -07:00
Lilly
c0c7b5f93c
Added full stop to end of link to gravatar.com
2013-04-29 16:16:20 +10:00
Skud
015ffb9dfd
Merge pull request #174 from blimey85/dev
...
Removed duplicate stylesheet_link_tag
2013-04-28 22:54:51 -07:00
Skud
5bd98d2621
Merge pull request #184 from Skud/travis-deploy
...
commented out auto-deployment stuff for now
2013-04-28 19:24:10 -07:00
Skud
f336b88111
commented out auto-deployment stuff for now
2013-04-29 12:18:58 +10:00
Skud
ec98540575
Merge pull request #183 from Skud/travis-deploy
...
another try at getting keys working
2013-04-28 18:56:07 -07:00
Skud
a6ab80fd8b
another try at getting keys working
2013-04-29 11:55:15 +10:00
Skud
91a21e82ad
Merge pull request #182 from Skud/travis-deploy
...
trying to get keys working
2013-04-28 18:31:14 -07:00
Skud
eac1448fcd
trying to get keys working
2013-04-29 11:30:01 +10:00
Skud
fe3cbf339e
Merge pull request #181 from Skud/travis-deploy
...
fixed linebreaks in "secure" line
2013-04-28 18:12:39 -07:00
Skud
da5e79365d
fixed linebreaks in "secure" line
...
(what's generated by travis-encrypt --add seems to be wrong.)
2013-04-29 11:10:58 +10:00
Skud