wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-17 11:33:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,034 Commits 10 Branches 125 Tags
330c37ef8656b097bdb8b49ae2a072e2aaa5fd10
Commit Graph
280 Commits
Author SHA1 Message Date
David Jay edc3671839 Updating load-more-comments style. 2017-02-13 19:32:39 -05:00
David Jay 7d617ca611 Merge branch 'master' of github.com:coralproject/talk into load-more-comments 2017-02-13 18:26:05 -05:00
Belen Curcio 8953182329 merge 2017-02-13 19:14:27 -03:00
David Jay c756b22302 Switching Load More to stateless component. 2017-02-13 15:15:27 -05:00
David Jay 5b2f52a283 Restyling Load More button. 2017-02-13 13:22:50 -05:00
Belen Curcio 90ed1f1056 Ban user with graphql, 100 refactor 2017-02-13 11:50:16 -03:00
Wyatt Johnson de54433c5c Merge branch 'master' into username-displayname 2017-02-10 16:19:27 -07:00
David Jay 4fedb7f31e Merge branch 'master' of github.com:coralproject/talk into load-more-comments 2017-02-10 14:34:19 -08:00
gaba e2e40ca2b3 Merge branch 'master' into story-137818425-tag-staff 2017-02-10 13:42:50 -08:00
gaba 11ef12c14c Adds padding and resolves when is not staff. 2017-02-10 13:33:57 -08:00
gaba 71fcf9cd3f FE for the Staff Tag. Modifed typedfs graphql. 2017-02-10 10:20:34 -08:00
David Jay 05fcc61c9c Resolving bug on comment load. 2017-02-09 17:56:28 -08:00
David Jay 1272dabb4b Updating frontend actions to new format. 2017-02-09 17:01:16 -08:00
Wyatt Johnson 3cd2b28bc2 Inital rename of displayName -> username 2017-02-09 16:48:59 -07:00
gaba 10937cf717 Tag.name as string. Debuging comment.tag in Embed stream. 2017-02-09 15:28:09 -08:00
gaba 3be4fea8ad Merge branch 'master' into story-137818425-tag-staff 2017-02-09 12:32:26 -08:00
gaba 1c26e64c71 Adds Tags to the graphql. 2017-02-09 12:23:40 -08:00
gaba f2341ca9d3 Adds tag label plugin. 2017-02-09 09:17:56 -08:00
Belen Curcio d3184d9afb Merge issues and Settings reducer updated 2017-02-09 13:58:55 -03:00
Riley Davis ddeb28d729 have cursor be the date of the oldest comment 2017-02-08 16:27:09 -07:00
David Jay 0c777cbad4 Adding loadMore function. 2017-02-08 08:59:38 -08:00
Belen Curcio 6a6574239f Mod Queue Working 2017-02-08 12:36:05 -03:00
Belen Curcio a4d62f78f2 Apollo config ready 2017-02-07 20:10:18 -03:00
Belen Curcio f8d83ffbde Rest of the embed side config 2017-02-07 16:15:53 -03:00
David JayandGitHub 652170735b Merge branch 'master' into username-ban 2017-02-06 18:14:13 -08:00
David JayandGitHub cb78e8d563 Merge branch 'master' into username-ban 2017-02-06 10:23:14 -08:00
Riley Davis a0c03605b9 Merge branch 'master' 
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-framework/constants/auth.js
	client/coral-framework/reducers/auth.js
	client/coral-sign-in/components/SignUpContent.js
 2017-02-03 13:12:32 -07:00
Riley Davis a0cf467f1b remove confirm and replace with verify 2017-02-02 14:59:45 -07:00
David Jay feb0860ba1 Merge branch 'master' of github.com:coralproject/talk into username-ban 2017-02-02 12:29:29 -05:00
gaba d53dc09aed Merge branch 'master' into story-134624635 2017-02-02 08:16:50 -08:00
Belén CurcioandGitHub b4a03a5133 Merge branch 'master' into design-pass-tweaks 2017-02-02 07:55:41 -03:00
David Jay 5831a6f927 Merge branch 'master' of github.com:coralproject/talk into username-ban 2017-02-01 20:00:54 -05:00
David Jay d703cc2168 Prompting user to update name when banned. 2017-02-01 19:53:37 -05:00
gaba 445eb97d76 Moves create displayname dialog to sign-in plugin. 2017-02-01 14:00:09 -08:00
David Jay e3da45daeb Displaying appropriate suspension message. 2017-02-01 16:38:01 -05:00
gaba f4d672ddcf Merge branch 'master' into story-134624635 2017-02-01 10:42:00 -08:00
David Jay 6c01a37f6a Removing user bio. 2017-02-01 11:48:16 -05:00
gaba 097934dee5 Merge branch 'master' into story-134624635 2017-01-31 15:00:14 -08:00
gaba 282c7dc4f5 Removes duplicate func and adds tests. 2017-01-31 14:04:31 -08:00
Riley Davis e63e1f3428 Merge branch 'master' 
Conflicts:
	errors.js
	test/routes/api/auth/index.js
 2017-01-31 12:05:16 -07:00
Belen Curcio 6fd2a927f1 Linted 2017-01-30 20:51:28 -03:00
Belen Curcio 76f55b4524 Cursor on user name, and Reply Bio box 2017-01-30 20:50:25 -03:00
Belen Curcio 5b926b9b85 merge 2017-01-30 20:42:15 -03:00
Riley Davis 976c821715 move FormField to coral-ui 2017-01-30 16:00:24 -07:00
Belen Curcio f83def83bd tab 2017-01-30 19:38:58 -03:00
Belen Curcio f9363e86d0 Merge 2017-01-30 17:24:57 -03:00
Belén CurcioandGitHub 887fe08819 Merge branch 'master' into graph-pagination 2017-01-30 17:12:23 -03:00
Belen Curcio 019e2a4fa9 Flag order 2017-01-30 16:37:00 -03:00
gaba e803593fc7 Move stuff around. 2017-01-30 11:34:04 -08:00
Belen Curcio 744f2085da Lint 🎉 2017-01-30 15:38:26 -03:00