wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-29 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,206 Commits 10 Branches 125 Tags
3e2634be76f1750bcdd4344bc118fe33e00d5091
Commit Graph
2206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David JayandGitHub 3e2634be76 Merge branch 'master' into new-comments 2017-02-23 16:11:01 -05:00
David JayandGitHub 2dda81f257 Merge pull request #338 from coralproject/admin-login 
show login page instead of communicorn :'(
 2017-02-23 12:12:21 -05:00
Riley Davis e3b9799d4a nested ternaries hurt me 2017-02-23 09:58:31 -07:00
Riley Davis 7ae81fd172 fixing mixed types 2017-02-23 09:43:50 -07:00
Riley Davis 953c749bd2 show login page instead of communicorn :'( 2017-02-22 16:14:14 -07:00
David JayandGitHub 9d13a95a7c Merge branch 'master' into new-comments 2017-02-22 15:20:39 -05:00
David Jay 27bd1404b3 Adding es translation. 2017-02-22 15:13:46 -05:00
David Jay bb0b3f461a Moving polling interval to constant. 2017-02-22 15:11:50 -05:00
David Jay 6becb88b56 Adding style to new comments button. 2017-02-22 15:07:32 -05:00
David Jay 096bd12df6 Loading new comments. 2017-02-22 13:45:02 -05:00
David Jay dd09ddf968 Adding NewCount component. 2017-02-22 13:13:25 -05:00
Wyatt JohnsonandGitHub 07a956e582 Merge pull request #333 from coralproject/rest-depreciation 
Cleaned up some routes
 2017-02-22 08:13:02 -07:00
David Jay ca107afb9b Avoiding new comment button when a comment is posted. 2017-02-21 17:29:58 -05:00
Wyatt Johnson d7a6bf9e1f Cleaned up some routes 2017-02-21 15:24:44 -07:00
David Jay 9149b737f5 Retrieving counts and displaying new comments to user. 2017-02-21 17:23:09 -05:00
David ErwinandGitHub 17813e23a9 Merge pull request #327 from coralproject/error_translation_key 
Error translation key
 2017-02-17 20:13:11 -05:00
David ErwinandGitHub 0563b93d39 Merge branch 'master' into error_translation_key 2017-02-17 20:07:49 -05:00
David ErwinandGitHub df53b101ab Merge pull request #316 from coralproject/update-on-post-comment 
Apollo update on post comment
 2017-02-17 20:07:40 -05:00
David ErwinandGitHub 6f17a84097 Merge branch 'master' into update-on-post-comment 2017-02-17 20:02:41 -05:00
Wyatt JohnsonandGitHub 09513c0e83 Merge pull request #329 from coralproject/docker-fixx 
Added yarn.lock to Dockerfile
 2017-02-17 18:02:26 -07:00
Wyatt Johnson 301c8e829f Added production flag back 2017-02-17 17:56:44 -07:00
Wyatt Johnson afcdacff0d Added yarn.lock to Dockerfile 2017-02-17 17:49:59 -07:00
David ErwinandGitHub a8396481f9 Merge pull request #328 from coralproject/graph-tests 
Initial graph tests
 2017-02-17 18:01:17 -05:00
Wyatt Johnson 4cccf09a87 spelling... 2017-02-17 15:53:23 -07:00
Wyatt JohnsonandGitHub 3e4dc9c8b2 Merge branch 'master' into graph-tests 2017-02-17 15:50:21 -07:00
Wyatt Johnson a00befafcb Initial graph tests 2017-02-17 15:48:46 -07:00
Gabriela Rodríguez BerónandGitHub 31dda920c6 Merge branch 'master' into error_translation_key 2017-02-17 14:30:00 -08:00
gaba 9f168e627a It uses message and not translation key. 2017-02-17 14:19:30 -08:00
Riley Davis 2506442453 toISOString 2017-02-17 14:10:21 -07:00
Riley Davis 6eb4725dd9 remove ternary from return statement 2017-02-17 14:03:37 -07:00
David ErwinandGitHub 5d1bc5fb5a Merge branch 'master' into update-on-post-comment 2017-02-17 13:52:25 -05:00
David ErwinandGitHub 62ee81e5a9 Merge pull request #326 from coralproject/stream-settings 
Stream Settings
 2017-02-17 13:51:26 -05:00
gaba 5a09beb727 It has to be translation_key and not message. 2017-02-17 10:12:37 -08:00
Belen Curcio 2d374fcdab Úsing the db url 2017-02-17 15:08:55 -03:00
Belen Curcio 54f0705f0f Merge branch 'master' of github.com:coralproject/talk into stream-settings 2017-02-17 15:05:17 -03:00
David ErwinandGitHub c92e336c7f Merge pull request #321 from coralproject/the-answer-is-42 
Counts on Mod Queues
 2017-02-17 13:00:24 -05:00
Belén CurcioandGitHub 98a34892ff Merge branch 'master' into the-answer-is-42 2017-02-17 14:42:44 -03:00
David JayandGitHub f6a6f443a9 Merge branch 'master' into update-on-post-comment 2017-02-17 12:30:42 -05:00
Gabriela Rodríguez BerónandGitHub bf387af586 Merge pull request #325 from coralproject/displayNameFORALL 
From displayName to username everywhere
 2017-02-17 09:24:38 -08:00
Belen Curcio 051978a1ee to the configure 2017-02-17 14:21:47 -03:00
Belen Curcio 761afeaf4f Stream cog, settings 2017-02-17 14:15:16 -03:00
Belen Curcio 25f366c5f1 Comment Count Component 2017-02-17 13:55:35 -03:00
Belen Curcio 7eca9db63c null assetIDs and old typo 2017-02-17 13:53:34 -03:00
gaba dd3435fffe Replace with translation_key to manage error translation. 2017-02-17 08:42:48 -08:00
David Jay a35af36ee1 Handling premod in optimistic comment updates. 2017-02-17 11:26:19 -05:00
Belen Curcio 41d0610985 PropTypes 2017-02-17 13:22:41 -03:00
gaba 3bfac591b3 An N was missing... 2017-02-17 08:20:27 -08:00
gaba 5370a6f81a A few more changes from display to username. 2017-02-17 08:05:32 -08:00
David Erwin 8502b43974 Updating more displayname to username 2017-02-17 10:04:15 -05:00
Belén CurcioandGitHub e8f711ff9c Merge branch 'master' into update-on-post-comment 2017-02-17 02:38:22 -03:00