mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 09:43:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
465 Commits 64 Branches 76 Tags
e10ea7f1809dc0bf41ac26b98d322fa3ea99d0bf
Commit Graph

465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gnattery
e10ea7f180 rails g scaffold Forum 2013-02-13 12:55:17 +11:00
Skud
3052e41278 Merge pull request #110 from phazel/password_fields 
Password fields
 2013-02-12 17:27:51 -08:00
gnattery
d5d894d133 Rearranged password fields 2013-02-13 12:19:21 +11:00
gnattery
f6ad4fec75 Rearranging password fields 2013-02-13 12:14:36 +11:00
Gnat
41fcc5bd06 Attempted rearranging settings page, broke something 2013-02-13 12:14:36 +11:00
Skud
fcbabf52f1 Merge pull request #109 from Skud/geolocation 
Geolocation
 2013-02-12 16:25:51 -08:00
Miles Gould
59372df8ef Merge branch 'rails_3_2_12' into dev 2013-02-12 12:52:32 +00:00
Miles Gould
3d37f35457 Upgrade to Rails 3.2.12, after *another* security flaw. 
https://groups.google.com/forum/?hl=en&fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8
 2013-02-12 12:49:52 +00:00
Skud
192196ae8e added map to profile. 
also making sure lat/long are zeroed if location is blanked
 2013-02-12 22:38:48 +11:00
Skud
8ded8eb0c3 display location as text on profile 2013-02-12 11:56:56 +11:00
Skud
879bf0ca2c add location fields to member settings page 2013-02-12 11:45:26 +11:00
Skud
c50a652eb7 geocode locations when saved, using google API 2013-02-12 11:36:33 +11:00
Skud
807a840528 Added location and lat/long fields to Member 2013-02-12 11:26:13 +11:00
Skud
8c367f713d added geocoder gem 2013-02-12 11:17:02 +11:00
Skud
b479106169 Merge pull request #108 from sabreuse/json-update 
Update json for security fix
 2013-02-11 16:04:50 -08:00
Amy
fd37e437d7 Update json for security fix 2013-02-11 18:51:35 -05:00
pozorvlak
649a1a4091 Merge pull request #106 from Skud/rack-upgrade 
rack upgrade to 1.4.5
 2013-02-08 15:31:54 -08:00
Skud
a4938eba23 rack upgrade to 1.4.5 2013-02-09 10:26:51 +11:00
pozorvlak
b126ac8358 Merge pull request #105 from Skud/comments2 
Comments
 2013-02-08 15:18:50 -08:00
Skud
8caa4d12e8 limit to recent comments 2013-02-08 18:14:37 +11:00
Skud
d37e7a148d Delete comments when post is deleted 2013-02-08 17:45:37 +11:00
Skud
b7f3634615 redirect to post after deleting comment 2013-02-08 17:37:37 +11:00
Skud
40bcb8c380 fixed up titles 2013-02-08 17:35:08 +11:00
Skud
979ad334f3 made the index page not be ugly 2013-02-08 17:31:17 +11:00
Skud
801347976e Added edit/delete buttons to comment display 2013-02-08 17:24:06 +11:00
Skud
62af897bf1 various prettification 2013-02-08 16:55:55 +11:00
Skud
f45434ff83 redirect to post after new/edit comment 2013-02-08 16:40:27 +11:00
Skud
660c626581 show comments on post page 2013-02-08 16:36:15 +11:00
Skud
acc1f4006f fixed tests to reflect removed fields 2013-02-08 16:13:52 +11:00
Skud
93edede4da Merged from mistaken branch on G/g 2013-02-08 16:11:38 +11:00
Skud
3b3f9d261f can't create a new post without a post_id 2013-02-08 15:02:21 +11:00
Skud
b6c759e521 edit comments 2013-02-08 14:49:07 +11:00
Skud
ae59b1e18d pass post_id through to comment 2013-02-08 14:37:57 +11:00
Skud
f66b4a64a3 added comment button to posts 2013-02-08 14:22:49 +11:00
Skud
a0a88bee11 comment form shouldn't have author/post fields 2013-02-08 14:14:07 +11:00
Gnat
d800747365 Attempted rearranging settings page, broke something 2013-02-08 01:43:23 +00:00
Joseph Caudle
01ab177cc9 Merge pull request #104 from Skud/public_email 
Public email
 2013-02-05 22:25:06 -08:00
Skud
09727d99b2 show email on profile if wanted 2013-02-06 16:54:15 +11:00
Skud
d5327ebbf3 show_email checkbox on settings page 2013-02-06 16:31:11 +11:00
Joseph Caudle
cf05e4108d Merge pull request #103 from Skud/edit_settings 
Edit settings
 2013-02-05 21:28:31 -08:00
Skud
363502a807 add show_email field to members 2013-02-06 16:25:17 +11:00
Skud
4f64946de2 Wrote some very basic tests for the improved settings page 2013-02-06 16:10:43 +11:00
Skud
a50bee4828 oops, broke tests with the change to 'Sign in' 2013-02-06 16:00:47 +11:00
Skud
1dbed949f6 s/Log in/Sign in/ -- be consistent with devise 2013-02-06 15:56:51 +11:00
Skud
9b458070e0 Settings form now works (and is prettified) 
Had to add some Devise crud based on advice on their wiki, otherwise
you couldn't change your settings without changing your password.

Also had to make a hidden field for tos_agreement. I don't really love
it but nobody seems to be able to recommend a better way.
 2013-02-06 15:54:43 +11:00
Skud
dfac54d936 Added hidden TOS field to edit settings page so it works 2013-02-06 15:31:14 +11:00
gnattery
6da3e4fae5 Added associations and tested them 2013-02-06 15:20:44 +11:00
gnattery
3cff543184 rails g scaffold Comment 2013-02-06 14:49:49 +11:00
Skud
e5d380729e we more or less have a settings page. doesn't WORK though. 2013-02-06 12:46:45 +11:00
Skud
fb37e1abaa fixed a weird variable expansion 2013-02-06 11:41:08 +11:00