wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 05:00:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,162 Commits 10 Branches 125 Tags
367ec00a025e0851abe4bcad3cf2df56163f9964
Commit Graph

3544 Commits

Author SHA1 Message Date
Riley Davis 44a06aef46 do not render tab content unless they're active 2017-01-13 14:33:01 -07:00
Belen Curcio f0cc82cb6d Changes 2017-01-13 18:16:46 -03:00
Belen Curcio cae101627f Merge branch 'master' of github.com:coralproject/talk into design-pass-adm 2017-01-13 17:14:51 -03:00
Belen Curcio e69262c665 Community Section Ready 2017-01-13 17:11:46 -03:00
Riley Davis 7295d78523 typos 2017-01-13 11:13:28 -07:00
Belen Curcio 9876e04454 Ban User box 2017-01-13 13:54:45 -03:00
Belen Curcio 712c53389b Banned Words and Suspect 2017-01-13 13:07:45 -03:00
Wyatt Johnson 281a49dc74 Merge branch 'master' into bugfix-flagged-actions 2017-01-12 16:29:32 -07:00
Gabriela Rodríguez Berón 1cc048d46e Merge branch 'master' into unique-username 2017-01-12 14:53:13 -08:00
gaba 1027b19a49 Added regex to look for the field that is duplicated. Not sure if there is a better way to do it. 2017-01-12 14:43:36 -08:00
David Jay f3f5397459 Removing rejected and approved comments from flagged feed. 2017-01-12 17:32:48 -05:00
Riley Davis 0eefd3364b update tests 2017-01-12 15:25:36 -07:00
David Jay 3e0d56b942 Keeping hydrated comments in assets in COMMENTS_BY_USER_REQUEST. 2017-01-12 16:41:50 -05:00
Belen Curcio ce01389809 Ádding Icon to Coral UI Button 2017-01-12 18:20:42 -03:00
Belen Curcio 87b350e3a9 Missing tab wrapper 2017-01-12 17:56:00 -03:00
David Jay 1432cfba4a Updating signing dialog style to render as intended in Firefox. 2017-01-12 15:49:23 -05:00
Belen Curcio c375d11e32 Coral UI - List and Item 2017-01-12 17:47:45 -03:00
Riley Davis f1272338cd re-use dispatch function 2017-01-12 13:30:53 -07:00
Riley Davis 3285a5ec29 add status to Comment. /comments/pending and /comments/rejected ONLY return the respective comments 2017-01-12 12:16:13 -07:00
gaba acf3ad5e28 Some conflicts were added. 2017-01-12 11:10:07 -08:00
gaba 873ec09f62 Merge branch 'master' into unique-username 2017-01-12 08:46:51 -08:00
Belen Curcio 3d65231db5 Progress 2017-01-12 13:27:37 -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
David Jay e8dc319a9a Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-11 13:12:07 -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
David Jay d9147da8fc Making user action item_type 'users' for consistency. 2017-01-10 13:59:36 -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
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 a2704e3099 Updating user email address. 2017-01-09 18:15:25 -05:00
David Jay 9809403701 Pluralizing user item_type for consistency. 2017-01-09 17:43:39 -05: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 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
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
David Jay 9e651a9292 Adding actions to suspend users and send e-mail. 2017-01-06 15:16:23 -05:00
Riley Davis a3bb8e2f41 remove logs. missed some errors 2017-01-06 13:11:37 -07:00
Riley Davis 6a61f47ddf Merged branch master into bad-words 2017-01-06 12:45:41 -07:00
gaba 712e436f58 Cleans error on email address or name. We need to go through all the errors and manage them better with translations. 2017-01-06 16:38:44 -03:00
Riley Davis 72cd78da8c use wordlist service 2017-01-06 12:35:08 -07:00
Gabriela Rodríguez Berón 1e445efaec Merge branch 'master' into issue-191 2017-01-06 13:33:25 -03:00
David Jay e510f99754 Adding style to suspension modal. 2017-01-05 20:51:40 -05:00