wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-18 12:40:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,782 Commits 10 Branches 125 Tags
445eb97d7647dd25fa35e01980d1234e2c8a4679
Commit Graph
122 Commits
Author SHA1 Message Date
David JayandGitHub f09d9d0a8b Merge branch 'master' into e2e-env-fix 2017-01-27 14:10:59 -05:00
David Jay fcf22ef4f9 Adding selenium settings and fixing bug in moderation approval. 2017-01-27 14:07:34 -05:00
David Erwin c8c160a551 Remove avatar from user cards 2017-01-27 10:16:09 -05:00
David Jay b6d8a90084 Updating style of UserActions and moving ActionButton to its own component. 2017-01-26 16:36:43 -05:00
David Jay 06331d3c07 Updating bio moderation to graphQL architecture. 2017-01-26 15:31:15 -05:00
David Jay 31abe57cb2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
 2017-01-25 17:15:12 -05:00
David Erwin 9435b627b1 Uppercase more enums in coral-admin 2017-01-24 17:17:03 -05:00
Belen Curcio 3640a93a2f Changes 2017-01-17 16:25:47 -03:00
Belen Curcio e69262c665 Community Section Ready 2017-01-13 17:11:46 -03:00
Belen Curcio 9876e04454 Ban User box 2017-01-13 13:54:45 -03:00
Belen Curcio 4a4affad70 More Design Tweaks 2017-01-12 09:16:23 -03:00
David Jay 61bc87bafc Adding ALL moderation list. 2017-01-11 17:35:09 -05:00
Belen Curcio 3a510168d3 design progress 2017-01-10 16:12:15 -03: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
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 9e651a9292 Adding actions to suspend users and send e-mail. 2017-01-06 15:16:23 -05:00
David Jay e510f99754 Adding style to suspension modal. 2017-01-05 20:51:40 -05:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
David Jay a468fe4c28 Adding language and e-mail input to suspend user modal. 2017-01-05 16:51:37 -05:00
David Jay 890ab810f3 Activating SuspendUserModal and updating language for clarity. 2017-01-05 14:50:21 -05:00
David Jay 9ba0176b3c Seperating username and bio flags 2017-01-04 16:11:31 -05:00
David Jay 7a239c02ab Limiting to user actions. 2017-01-04 15:56:52 -05:00
David Jay 216b21251d Styling UserActions Component. 2017-01-04 15:33:41 -05:00
David Jay c1e3580ef7 Resolving error in moderation list. 2017-01-04 14:46:06 -05:00
David Jay 0a064c0e11 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-04 14:33:27 -05:00
David Jay 3fa0460f34 Sending actions to ModerationList. 2017-01-04 14:20:00 -05:00
David Jay f792aeccd2 Adding user display. 2017-01-04 13:39:10 -05:00
David Jay b517adab56 Moving commentList to ModerationList 2017-01-03 16:57:53 -05:00
gaba e2a032d4a5 Merge branch 'master' into csrf 2017-01-03 16:25:05 -03:00
gaba 950340d5e7 Fix lint. 2017-01-03 15:18:39 -03:00
Riley Davis a1def6f950 missing state for the wordlist. 2017-01-03 10:33:25 -07:00
Dan Zajdband 759e74a88d coral-admin: Fixed check for component unmount removing a listener when there is no object 2017-01-03 10:46:55 -03:00
gaba 111e83a1e6 Removes plugin csrf 2017-01-03 08:41:28 -03:00
gaba 8e6aa23d32 More CSRF in front-end. 2016-12-23 13:07:16 -08:00
gaba ec3e9d1cd4 Merge branch 'master' into csrf 2016-12-22 14:23:01 -08:00
gaba 54d0096dd1 More CSRF in forms. 2016-12-22 14:17:09 -08:00
Riley Davis 9d1d109ec0 Merge branch 'master' 
Conflicts:
	client/coral-admin/src/reducers/index.js
 2016-12-22 12:28:55 -07:00
riley f5b8c0bbba fix lint 2016-12-21 11:19:17 -07:00
David Jay a490aaeaf0 Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:02:24 -08:00
Riley Davis 9315337ce6 suspect words are marked up 2016-12-20 16:56:16 -07:00
Riley Davis ef0055e689 highlight suspect words 2016-12-20 16:42:16 -07:00