Commit Graph

3586 Commits

Author SHA1 Message Date
Belen Curcio 3d65231db5 Progress 2017-01-12 13:27:37 -03:00
Belén Curcio b957e75d68 Merge branch 'master' into moderate-bio 2017-01-12 09:21:02 -03:00
Belen Curcio 4a4affad70 More Design Tweaks 2017-01-12 09:16:23 -03:00
Belen Curcio 7101d99187 Merge branch 'master' of github.com:coralproject/talk into design-pass-adm 2017-01-12 08:09:55 -03:00
David Jay 61bc87bafc Adding ALL moderation list. 2017-01-11 17:35:09 -05:00
Riley Davis 18b35e38a8 Merge pull request #227 from coralproject/flagged-queue-bugfix
Fix flagged comment queue bug
2017-01-11 14:20:03 -07:00
Wyatt Johnson 6ca7e92171 Merge branch 'master' into flagged-queue-bugfix 2017-01-11 13:48:09 -07:00
David Jay 09e3889793 Updating action type from to for consistency. 2017-01-11 15:42:56 -05:00
David Jay 2a1ea01827 Merge pull request #226 from coralproject/dev-start
Added dev-start and --config flag
2017-01-11 15:14:59 -05:00
Wyatt Johnson 10aaa037dc Added dev-start and --config flag 2017-01-11 11:37:06 -07:00
David Jay 30c7539cde Merge branch 'moderate-bio' of github.com:coralproject/talk into moderate-bio 2017-01-11 13:14:44 -05:00
David Jay e8dc319a9a Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-11 13:12:07 -05:00
David Jay 98a6ba5f1f Merge branch 'master' into moderate-bio 2017-01-11 12:32:25 -05:00
Wyatt Johnson 5f215a95f9 Merge pull request #222 from coralproject/hide-passwords
Cleaned user auth response
2017-01-11 10:22:28 -07:00
David Jay 9d7810f48c Merge branch 'master' into moderate-bio 2017-01-10 19:48:09 -05:00
Wyatt Johnson 7a21879628 Merge branch 'master' into hide-passwords 2017-01-10 14:53:26 -07:00
Kim Gardner 2e4256bf4a Merge pull request #223 from coralproject/users-bug-fix
Making user action item_type 'users' for consistency.
2017-01-10 16:11:22 -05:00
David Jay 11f18c23cb Merge branch 'master' into users-bug-fix 2017-01-10 14:13:31 -05:00
Belen Curcio 3a510168d3 design progress 2017-01-10 16:12:15 -03:00
Wyatt Johnson 8519d07c67 Cleaned user auth response 2017-01-10 12:00:06 -07:00
David Jay d9147da8fc Making user action item_type 'users' for consistency. 2017-01-10 13:59:36 -05:00
Kim Gardner e87a471eb9 Merge pull request #201 from coralproject/frontenddocs
Frontend Docs
2017-01-10 11:44:03 -05:00
Kim Gardner 6cf4011cde Merge branch 'master' into frontenddocs 2017-01-10 11:40:03 -05:00
Belen Curcio ca369dcb4a Header version 2017-01-10 12:01:48 -03:00
Belen Curcio a4e6638217 Tab bar, removing extra mdl js. It adds more events 2017-01-10 10:55:03 -03:00
Riley Davis f76177c1db Merge pull request #214 from coralproject/bad-words
Bad usernames
2017-01-09 18:13:18 -07:00
Wyatt Johnson 7283feab6b Merge branch 'master' into bad-words 2017-01-09 16:44:19 -07:00
David Jay f957e3c8ce Closing suspend user modal once user is suspended and e-mail is sent. 2017-01-09 18:33:12 -05:00
David Jay 8fa7561e20 Updating item_type for consitency. 2017-01-09 18:27:54 -05:00
David Jay 01d9fc313e Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-09 18:20:44 -05:00
David Jay 296b941ee8 Merge pull request #221 from coralproject/email-confirm
Email Confirmation Resend Endpoint + Fixes to mailer
2017-01-09 18:19:53 -05:00
David Jay 8601562418 Improving extraction of user e-mail address. 2017-01-09 18:18:19 -05:00
David Jay a2704e3099 Updating user email address. 2017-01-09 18:15:25 -05:00
Wyatt Johnson 586ce941e5 Merge branch 'master' into email-confirm 2017-01-09 16:10:46 -07:00
Wyatt Johnson ec3a114e65 Added missing endpoint + fix for mailer 2017-01-09 15:50:46 -07:00
David Jay 9809403701 Pluralizing user item_type for consistency. 2017-01-09 17:43:39 -05:00
Riley Davis b6eaf210fe don't use regex on existing lists 2017-01-09 15:41:47 -07:00
Belen Curcio be293a03de Header 2017-01-09 19:17:21 -03:00
Belen Curcio 4f4ecd8dfb header 2017-01-09 18:07:02 -03:00
David Jay b8fc2c9cc7 Addressing CSRF and user status issues. 2017-01-09 15:39:08 -05:00
riley 7bc848b801 make tests pass 2017-01-09 10:47:28 -07:00
Belen Curcio 226af72ac9 Adding Roboto 2017-01-09 12:54:28 -03:00
Belen Curcio 1acc92a1f2 Header Changes 2017-01-09 12:45:41 -03:00
David Jay 0f24ab6b28 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-06 15:56:03 -05:00
gaba 976f0762b3 Password lenght of 8. 2017-01-06 17:42:42 -03:00
David Jay ec020df488 Adding account flags tab. 2017-01-06 15:42:19 -05:00
David Jay d5a82f04c2 Fixing issues with e-mail and status update. 2017-01-06 15:35:32 -05:00
Riley Davis bba597f086 even more lint 2017-01-06 13:28:48 -07:00
Riley Davis abd2332745 lint 2017-01-06 13:23:51 -07:00
David Jay 9e651a9292 Adding actions to suspend users and send e-mail. 2017-01-06 15:16:23 -05:00