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
1,142 Commits 10 Branches 125 Tags
e2e278e2965167f757a9dcffdecd1b6d89d804ea
Commit Graph
185 Commits
Author SHA1 Message Date
Belen Curcio f52a1668b0 Test logouts and approves after commenting 2016-12-18 19:07:31 -03:00
Belen Curcio 927a3fcd83 Updating package.json and nightwatch package 2016-12-17 10:50:47 -03:00
gaba ee6c4bb831 Merge branch 'master' into issue-186 2016-12-16 17:55:21 -08:00
Gabriela Rodríguez BerónandGitHub 4f0c0d2e42 Merge branch 'master' into fix-config-warnings 2016-12-16 17:44:21 -08:00
gaba 3266934fc8 It needed to have the Moderation Modal inside a tab container too. 2016-12-16 17:39:22 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
Riley Davis 13994686e4 fix some config warnings 2016-12-16 15:20:02 -07:00
Dan ZajdbandandGitHub decdfad39b Adding show shortcuts button and minor fixes (#177) 
* Adding show shortcuts button and minor fixes

* Lint

* Unwrapping the showComments method
 2016-12-16 12:32:09 -05:00
Dan Zajdband 9e9291ba64 Lint 2016-12-16 12:07:54 -05:00
Dan Zajdband 8631c3bd9b Adding show shortcuts button and minor fixes 2016-12-16 12:03:37 -05:00
Dan ZajdbandandGitHub fcb107aefe Global comment stream close setting (#171) 
* Added basic ui

* Added functionality

* Linted code

* using named params instead of props

* lint

* fixed missing merge
 2016-12-15 15:50:19 -05:00
David JayandGitHub 5cb1a15273 Merge branch 'master' into use-js-while-rendering 2016-12-13 13:06:47 -05:00
Gabriela Rodríguez BerónandGitHub b895dbc8cd Update translations.json 2016-12-12 22:38:53 -08:00
David Jay e88e8212f4 Updating translations. 2016-12-12 20:33:55 -05:00
David Jay 426e0a02bd Raising error if no count is entered. 2016-12-12 19:12:53 -05:00
David Jay bd240923cc Updating default charcount setting. 2016-12-12 19:10:54 -05:00
David Jay cd63f49a5e Disabling save button on error and updating translations. 2016-12-12 19:08:35 -05:00
David Jay ba8a845741 Making character input field green to match designs. 2016-12-12 18:14:03 -05:00
David Jay 4a4b92299c Adding error message. 2016-12-12 18:10:47 -05:00
David Jay 48b1f7fc2b Moving text to translations file. 2016-12-12 17:45:20 -05:00
David Jay 182c504edb Updating settings box style. 2016-12-12 17:35:33 -05:00
David Jay 39479fd9ad Add character count field. 2016-12-12 17:07:43 -05:00
Riley DavisandGitHub 749a5d9853 Merge branch 'master' into use-js-while-rendering 2016-12-12 07:34:36 -10:00
Riley DavisandGitHub c18f885277 Merge branch 'master' into use-js-while-rendering 2016-12-09 15:06:51 -10:00
Riley DavisandGitHub 9e353eaae8 Merge branch 'master' into simplify-community-page 2016-12-09 15:06:43 -10:00
Riley DavisandGitHub 84453ef7bd Merge branch 'master' into use-js-while-rendering 2016-12-09 14:53:56 -10:00
Riley Davis 0f7e4bd239 simplify Community page 2016-12-09 14:52:17 -10:00
Riley Davis 7bfd9e2e71 remove lodash implementation 2016-12-09 14:48:29 -10:00
Riley Davis 74c4d812cd less changes 2016-12-09 14:39:16 -10:00
Riley Davis 7186c2b060 have moderation queue use proper mapStateToProps 2016-12-09 14:38:29 -10:00
David Jay faca09dbd2 Merge branch 'master' of github.com:coralproject/talk into update-users-api 2016-12-09 19:35:09 -05:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
Riley Davis b05f4cfb16 remove logs 2016-12-09 14:25:24 -10:00
Riley Davis 7732aa4abe typo 2016-12-09 14:20:46 -10:00
Riley Davis a80dd953c8 update ModerationQueue and CommentStream to not use immutable.js deep in the stack 2016-12-09 14:13:48 -10:00
Kim Gardner 5279ad3305 Typo 2016-12-09 13:01:54 -10:00
Riley Davis 1c2ef760ef remove cruft by pulling out some immutable.js stuff 2016-12-09 11:46:04 -10:00
Gabriela Rodríguez BerónandGitHub f29c0a3a09 Merge branch 'master' into ban-user 2016-12-09 10:43:55 -10:00
Riley Davis 44ae886af7 put some space between buttons on the banuserdialog 2016-12-09 10:08:55 -10:00
gaba d9b778fa74 A few translations for the spanish for this feature. 2016-12-09 09:19:08 -10:00
gaba 01dc4e4144 fix merge. 2016-12-09 08:30:30 -10:00
gaba 15557c16e2 Merge branch 'master' into ban-user 2016-12-09 08:28:46 -10:00
David Jay bfe188eb5c Cleaning up from merge. 2016-12-09 13:17:50 -05:00
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
gaba 71d6b90993 SMall changes for PR. 2016-12-08 18:29:15 -10:00
gaba ecd3f5c347 IT removes duplicated code. 2016-12-08 18:19:00 -10:00
gaba 9bfac3872e Moves banUser to users actions instead of comments actions. 2016-12-08 18:16:17 -10:00
gaba 0df1b9a498 Remove file that is not being used anymore. 2016-12-08 16:37:05 -10:00
gaba 1eb204f822 Merge branch 'master' into ban-user 2016-12-08 13:28:12 -10:00