Commit Graph

352 Commits

Author SHA1 Message Date
Skud
abcba35a71 Converted prices to integers/cents to avoid floating point trouble 2013-05-15 23:09:35 +10:00
Skud
c96876feeb prettify order display 2013-05-15 21:26:01 +10:00
Skud
3e1202cd62 prettify display of orders 2013-05-15 15:52:10 +10:00
Skud
8a35f3401b removed unwanted methods from orders 2013-05-15 14:33:40 +10:00
Skud
7d74203735 rails g scaffold OrderItem... 2013-05-15 13:47:16 +10:00
Skud
1d54a63f5d Merge branch 'dev' into payments-new 2013-05-15 11:37:16 +10:00
Skud
c7efe512aa Merge pull request #193 from pozorvlak/replylink
Replylink
2013-05-13 17:45:39 -07:00
pozorvlak
42b5f387d2 Merge pull request #199 from Skud/cropwrangling
Make life easier for crop wranglers
2013-05-09 07:04:10 -07:00
Skud
536cf21e3e make it easier to wrangle scientific names 2013-05-09 11:39:22 +10:00
Skud
85a121c739 only let signed in members buy stuff 2013-05-08 15:05:55 +10:00
Skud
5c96bf1541 added basic index page for shop 2013-05-08 15:05:38 +10:00
Skud
42ea14a8e5 added shop page at /shop 2013-05-08 14:02:33 +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
c95e722f99 added planting counts to crop pages 2013-05-03 15:09:29 +10:00
Lilly
4d372ab8f8 Added crop wrangling hints to crops form. 2013-05-02 12:13:28 +10: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
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
40b9104094 Make units dropdown wide enough to contain "miles".
It's now "miles" wide. Hehehe.
2013-04-30 10:43:40 +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
fc8edb3efa Merge pull request #177 from Skud/contact
added contact link to footer
2013-04-30 00:25:57 -07: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
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
b471ce7576 removed Courtney from about section 2013-04-29 09:43:50 +10:00
Skud
58482bfbc9 added contact link to footer 2013-04-29 09:39:30 +10:00
Miles Gould
38246bd00b Add a dropdown to select units on members/nearby. 2013-04-25 23:48:25 +01:00
Gary
00573d5d8a Removed duplicate stylesheet_link_tag 2013-04-24 20:11:21 -04:00
Cesy Avon
cebd49271a Finding nearby members by distance
Distance is now configurable
Units framework is there but it's not working yet
2013-04-23 10:13:21 -07:00
Skud
f05a8f9ce6 added twitter link to profile page 2013-04-19 00:00:56 +10:00
Skud
2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10:00
Samuel Cochran
41135f3869 Fix some email formatting issues 2013-04-15 11:32:26 +10:00
Miles Gould
707bae2475 Make the authentication into a link to your Twitter page.
When we support other authentication providers, we'll need to make this
into a callback or something.
2013-04-09 17:38:30 +01:00
Miles Gould
36c509cc90 Add "link to another account" link to authentications/index 2013-04-09 17:32:03 +01:00
Miles Gould
0db5826898 Remove unused methods on authentications. 2013-04-09 17:26:47 +01:00
Miles Gould
a3ac6343c7 Only show current member's authentications on index. 2013-04-09 17:20:40 +01:00
Miles Gould
dcbe944683 Removed unneeded generated files. 2013-04-09 16:39:45 +01:00
Miles Gould
5ea91bf56a Added an Authentications table.
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1

In addition, we store "token" and "secret" fields.
2013-04-09 16:39:09 +01:00
Lilly
9ed7a66c1c Fixed link to sender profile in notifications 2013-04-04 14:52:59 +11:00
Lilly
5ae524baad Put avatar on settings page with link to gravatar.com 2013-04-04 13:59:05 +11:00
Lilly
6a07b12da1 Swapped "sign up" and "sign in" links on navbar 2013-04-04 12:28:53 +11:00
Skud
6ddc0a5e15 Minor tweaks, mostly to formatting
... because I'm picky ;)  I particularly wasn't keen on the search link
on the logged in homepage, which didn't really fit in there.  I also
made the link display on *all* profiles (not just your own), and changed
the way the headings/titles were formatted.

I also changed CanCan to not specify who can search nearby members, but
to skip it in the controller instead.  It just didn't really make sense
in ability.rb.
2013-04-03 15:28:11 +11:00
Miles Gould
7cdfec3d4c Harmonise "find members near you" language. 2013-04-02 15:55:58 +01:00
Miles Gould
fde8d163a9 Allow non-logged-in folk to search for members near a location. 2013-04-02 15:48:58 +01:00
Miles Gould
8afb826a65 Use members thumbnail on members/near page. 2013-04-02 13:54:37 +01:00