Commit Graph

1146 Commits

Author SHA1 Message Date
Al Snow e35d2f9c21 Merge branch 'master' of https://github.com/OWASP/railsgoat 2014-01-11 09:50:54 -05:00
Al Snow 48acca6eda Upgraded 3 gems by rebuilding Gemfile.lock file 2014-01-10 14:19:26 -05:00
mccabe615 0b04dd58cf Merge pull request #83 from jasnow/master
Upgraded 2 gems by rebuilding Gemfile.lock file
2014-01-08 18:15:58 -08:00
Al Snow 42eb12b602 Upgraded 2 gems by rebuilding Gemfile.lock file 2014-01-08 11:13:14 -05:00
mccabe615 db16a73e00 Merge pull request #82 from jasnow/master
Upgraded 1 gem by rebuilding Gemfile.lock file
2014-01-05 22:15:37 -08:00
Al Snow 429d1b0f78 Upgraded 1 gem by rebuilding Gemfile.lock file 2014-01-05 09:10:12 -05:00
mccabe615 460ab928f5 Merge pull request #81 from jasnow/master
Upgraded simplecov and database_cleaner gems then refreshed Gemfile.lock file
2014-01-02 17:21:28 -08:00
Al Snow 0acf26379b Removed several gem numbers then refreshed Gemfile.lock file 2014-01-01 14:21:35 -05:00
mccabe615 30441ad50b Merge pull request #80 from jasnow/master
Upgraded 5 gems by rebuilding Gemfile.lock file
2013-12-30 18:51:23 -08:00
Al Snow 161b390d70 Upgraded 5 gems by rebuilding Gemfile.lock file 2013-12-30 07:58:23 -05:00
mccabe615 1193e14b16 Merge pull request #79 from jasnow/master
Rebuilt Gemfile.lock file
2013-12-29 13:35:51 -08:00
mccabe615 ad4f982992 Update README.md 2013-12-27 15:47:41 -05:00
Al Snow 0b4425550b Rebuilt Gemfile.lock file 2013-12-26 15:12:27 -05:00
cktricky 80e9fd11a8 minor UI improvements on the Forgot Password and Register pages 2013-12-24 08:46:43 -05:00
cktricky e757f33c0a UI improvements for the login page 2013-12-24 08:35:29 -05:00
mccabe615 b0a02cdf89 Merge pull request #78 from jasnow/master
Rebuilt Gemfile.lock file
2013-12-23 09:44:38 -08:00
Al Snow 98dbad1cec Upgraded better_errors gem by rebuilding Gemfile.lock file 2013-12-23 11:55:04 -05:00
Al Snow c1a3e806de Rebuilt Gemfile.lock file 2013-12-20 19:59:00 -05:00
mccabe615 0d7ceaf68e Merge pull request #77 from jasnow/master
Upgraded 6+4 gems and then rebuilt Gemfile.lock file
2013-12-15 08:25:56 -08:00
Al Snow a673f13b29 Rebuilt Gemfile.lock file - 4 more gem upgrades 2013-12-15 10:51:30 -05:00
Al Snow 67514193d3 Rebuilt Gemfile.lock file 2013-12-13 17:46:42 -05:00
Al Snow 80479eec24 Merge branch 'master' of https://github.com/OWASP/railsgoat 2013-12-13 17:40:54 -05:00
Mike McCabe abe22b19e9 adding password rest method and changing some logic around 2013-12-11 22:25:02 -05:00
mccabe615 8eb398950f Merge pull request #76 from jamesejr/feature/user_mailer
Implement Forgot Password Feature
2013-12-11 09:19:42 -08:00
James Espinosa bfa3467107 Remove default RSpec tests to fix build 2013-12-10 23:08:46 -06:00
James Espinosa 76bf8fa45d Update README to include MailCatcher notes 2013-12-10 22:35:42 -06:00
James Espinosa 0318205ecb Add MailCatcher for SMTP support to Gemfile 2013-12-10 22:07:05 -06:00
Al Snow 13cb50201a Rebuilt Gemfile.lock file 2013-12-09 11:21:44 -05:00
mccabe615 18d36cdf9a Merge pull request #74 from jasnow/master
Rebuilt Gemfile.lock file (i18n, listen) then got rid of i18n warning.
2013-12-08 10:06:45 -08:00
Al Snow 2067fab928 Rebuilt Gemfile.lock file 2013-12-07 18:23:55 -05:00
Al Snow 88d3faa9dd Rebuilt Gemfile.lock file 2013-12-07 11:28:11 -05:00
Al Snow 938afef084 Merge branch 'master' of https://github.com/OWASP/railsgoat 2013-12-07 11:25:21 -05:00
James Espinosa be0d8f7594 Remove unnecessary comment 2013-12-04 00:59:00 -06:00
James Espinosa da1845e8f9 Implement working mailer and controller 2013-12-04 00:57:32 -06:00
James Espinosa 1a3d6d690c Update SMTP settings for Mailcatcher 2013-12-03 21:16:44 -06:00
Al Snow 5cd7a1b9cb Got rid of i18n warning; Rebuilt Gemfile.lock file 2013-12-03 20:35:04 -05:00
Al Snow 880ede5574 Rebuilt Gemfile.lock file (i18n, listen) 2013-12-03 16:46:03 -05:00
mccabe615 29092d6c90 Merge pull request #73 from jasnow/master
Rebuilt Gemfile.lock file
2013-12-03 07:28:17 -08:00
Al Snow a75416f506 Rebuilt Gemfile.lock file 2013-12-03 06:48:20 -05:00
Ken Johnson b1b8aac5f3 Merge pull request #70 from jasnow/master
Upgrade .rvmrc to 1.9.3-p484; Rebuilt Gemfile.lock file
2013-11-29 06:41:59 -08:00
James Espinosa 26e04deb9f Implement basic password reset mailer 2013-11-25 19:36:33 -06:00
James Espinosa 93d7c2bd44 Add mailtrap.io SMTP settings 2013-11-24 23:57:52 -06:00
James Espinosa 9a5f04cefd Update button, for consistency 2013-11-24 20:48:07 -06:00
James Espinosa a9fad698e8 Minor code cleanup, for readability 2013-11-24 20:42:17 -06:00
James Espinosa 5db8eab564 Fix typo, should be password 2013-11-24 20:34:18 -06:00
Mike McCabe ce239e84be oops, maybe I should actually run the tests before committing 2013-11-23 17:59:41 -05:00
Mike McCabe c7515af6ab adding basic forgot password controller and views 2013-11-23 16:04:48 -05:00
Al Snow 209d2440a8 Upgrade .rvmrc to 1.9.3-p484; Rebuilt Gemfile.lock file 2013-11-23 16:00:32 -05:00
Ken Johnson 73d11226c1 Merge pull request #69 from jasnow/master
Rebuilt Gemfile.lock file
2013-11-18 14:05:52 -08:00
Al Snow ab22759bbf Rebuilt Gemfile.lock file 2013-11-18 11:13:34 -05:00