Commit Graph

495 Commits

Author SHA1 Message Date
Skud
3c0e467da1 prettified signed-in homepage; tests still needed 2013-03-05 22:20:13 +11:00
Skud
204b5cdf8c initial tweaks to homepage 2013-02-26 09:23:49 +11:00
Skud
3bcaaa4025 Merge pull request #107 from phazel/unique_usernames
Add validation for uniqueness of login_name
2013-02-21 19:57:25 -08:00
Courtney Hazel
2de9c5c961 Merge pull request #4 from jcaudle/unique_usernames
Fix intermittent build failure due to timezones
2013-02-21 19:32:01 -08:00
Joseph Caudle
6b37bbc8da Fix intermittent build failure due to timezones
Because our default timezone for the app is UTC, at certain times, some
tests could fail outside of UTC. This commit fixes that by changing a
single call to Time.now to Time.zone.now.
2013-02-21 22:29:36 -05:00
Courtney Hazel
2f34badaa5 Merge pull request #3 from jcaudle/unique_usernames
Unique usernames
2013-02-21 19:21:31 -08:00
Joseph Caudle
9e29aec14a Merge branch 'dev' into unique_usernames
* dev: (28 commits)
  Upgrade bootstrap by running `rails g bootstrap:install`
  added .to_i to times to attempt to pass tests on travis
  stubbed Time.now to prevent test failures
  Added friendly IDs for forum and role
  General prettification and making it look nice.
  show forum name in post meta
  Added a rake task to create an admin user.
  hooked roles up to cancan
  Added roles, but haven't yet hooked them up to CanCan
  PT story 41985889, Hides 'new garden' tab on other member's pages
  Add forums to top nav
  Display posts in summary on forum page
  tests for markdown
  post in (or not in) a forum
  prettifying forum views
  added associations between forums, posts, and members
  rails g scaffold Forum
  Rearranging password fields
  Attempted rearranging settings page, broke something
  Upgrade to Rails 3.2.12, after *another* security flaw.
  ...

Conflicts:
	spec/models/member_spec.rb
2013-02-21 22:19:45 -05:00
Courtney Hazel
b51113bc0f Merge pull request #2 from jcaudle/unique_usernames
Unique usernames
2013-02-21 19:11:25 -08:00
Joseph Caudle
434d06ad83 Add test to ensure uniqueness of login_name 2013-02-21 22:08:25 -05:00
Joseph Caudle
728f8ec9ce Update factory for members and specs about members
We have added a sequence for login_name which is similar to the one for
emails in which the member name is incremented each time a new member is
saved.

In addition, we have updated all specs which asked for an explicit
login_name of member1 to use a regex looking only for member and some
digit.
2013-02-21 21:57:39 -05:00
Skud
1bee0a7752 Merge pull request #115 from jcaudle/upgrade-bootstrap
Upgrade bootstrap by running `rails g bootstrap:install`
2013-02-21 18:05:17 -08:00
Joseph Caudle
a257c7037c Upgrade bootstrap by running rails g bootstrap:install 2013-02-21 20:55:58 -05:00
Joseph Caudle
20a15e449c Merge pull request #114 from Skud/forums
Forums
2013-02-21 17:14:42 -08:00
Skud
75306dc57a added .to_i to times to attempt to pass tests on travis 2013-02-22 09:19:30 +11:00
Skud
da5a3fb76c stubbed Time.now to prevent test failures 2013-02-22 08:28:14 +11:00
Skud
b743fe9465 Added friendly IDs for forum and role 2013-02-20 15:51:31 +11:00
Skud
0aab5286f0 General prettification and making it look nice.
Also upgraded Bootstrap, just for the hell of it.
2013-02-20 15:42:44 +11:00
Skud
11fa06b56c show forum name in post meta 2013-02-20 14:54:38 +11:00
Skud
81f247769f Added a rake task to create an admin user.
You should only have to do this once, after deploying.  Subsequent
admins can add new ones via the web interface.

The syntax is:

rake growstuff:admin_user name=skud

or, on heroku:

heroku run rake growstuff:admin_user name=skud
2013-02-20 14:54:38 +11:00
Skud
f12941576c hooked roles up to cancan
Now only admins can create/edit forums, or mess with roles.

To add an admin user:

rails c
m = Member.find('skud')
r = Role.create(:name => 'admin')
r.members << m

We'll have to do this on the server to bootstrap the admin stuff.
Though actually, we should really write a rake task to generalise this.
2013-02-20 14:53:11 +11:00
Skud
69414db0f1 Merge pull request #112 from cesullivan/garden_permissions
PT story 41985889, Hides 'new garden' tab on other member's pages
2013-02-19 18:45:57 -08:00
Skud
0bc2ff25fe Added roles, but haven't yet hooked them up to CanCan 2013-02-19 12:29:22 +11:00
Cathy Sullivan
86f7d25411 PT story 41985889, Hides 'new garden' tab on other member's pages 2013-02-18 12:18:45 -08:00
Skud
2e8867dda7 Add forums to top nav 2013-02-14 13:37:48 +11:00
Skud
b4c6a74caa Display posts in summary on forum page
Also had to tweak timezone config so that "X minutes ago" display
worked.  This *may* break tests or who knows what, for devs who are
elsewhere. Let's keep an eye out for that!
2013-02-14 13:35:23 +11:00
Skud
430068458d tests for markdown 2013-02-14 11:53:01 +11:00
Skud
a0955d2bfc post in (or not in) a forum 2013-02-14 11:46:25 +11:00
Skud
ef236befcd prettifying forum views 2013-02-13 15:55:16 +11:00
gnattery
de85a6dcce added associations between forums, posts, and members 2013-02-13 15:17:40 +11:00
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
Gnat
efd90e2d76 Add validation for uniqueness of login_name 2013-02-11 02:43:47 +00: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