 David Jay
|
8d35e65cba
|
Merge branch 'view-char-count' of github.com:coralproject/talk into view-char-count
|
2016-12-13 14:06:39 -05:00 |
|
|
David Jay
|
277eecaf6c
|
Merge branch 'master' into view-char-count
|
2016-12-13 14:06:38 -05:00 |
|
|
Riley Davis
|
ac82f3dd98
|
Merge pull request #150 from coralproject/use-js-while-rendering
remove cruft by pulling out some immutable.js stuff
|
2016-12-13 14:06:38 -05:00 |
|
|
David Jay
|
9c7eeb1ec5
|
Merge branch 'master' into use-js-while-rendering
|
2016-12-13 14:06:37 -05:00 |
|
|
David Jay
|
0de2cb7d82
|
Merge branch 'view-char-count' of github.com:coralproject/talk into view-char-count
|
2016-12-13 13:37:46 -05:00 |
|
|
David Jay
|
643373e224
|
Rejecting comments on the server if the character count is too long.
|
2016-12-13 13:36:54 -05:00 |
|
|
David Jay
|
113ceb9889
|
Merge branch 'master' into view-char-count
|
2016-12-13 13:28:06 -05:00 |
|
|
David Jay
|
6301408973
|
Merge pull request #165 from coralproject/set-char-count
Set char count as admin
|
2016-12-13 12:02:24 -05:00 |
|
|
David Jay
|
4dca9ff061
|
Updating translation.
|
2016-12-13 12:02:00 -05:00 |
|
|
Gabriela Rodríguez Berón
|
b895dbc8cd
|
Update translations.json
|
2016-12-12 22:38:53 -08:00 |
|
|
David Jay
|
24cc86b130
|
Merge branch 'master' into use-js-while-rendering
|
2016-12-12 20:36:10 -05:00 |
|
|
David Jay
|
533e8d9b94
|
Merge branch 'set-char-count' of github.com:coralproject/talk into set-char-count
|
2016-12-12 20:34:45 -05:00 |
|
|
David Jay
|
e88e8212f4
|
Updating translations.
|
2016-12-12 20:33:55 -05:00 |
|
|
David Jay
|
ff62c9c14d
|
Merge branch 'master' of github.com:coralproject/talk into set-char-count
|
2016-12-12 20:30:32 -05:00 |
|
|
David Jay
|
87a5c4b2d6
|
Displaying character count and preventing user from posting when count is too high.
|
2016-12-12 20:29:54 -05:00 |
|
|
Kim Gardner
|
e4ad374366
|
Merge pull request #162 from coralproject/wordlist
Fix banned word bug
|
2016-12-12 19:39:41 -05:00 |
|
|
David Jay
|
44e397b86c
|
Passing character count into commentbox.
|
2016-12-12 19:36:32 -05:00 |
|
|
David Jay
|
aed1516f95
|
Merge branch 'master' into set-char-count
|
2016-12-12 19:21:06 -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
|
f58ede45d9
|
Merge branch 'master' into wordlist
|
2016-12-12 17:20:33 -05:00 |
|
|
David Jay
|
39479fd9ad
|
Add character count field.
|
2016-12-12 17:07:43 -05:00 |
|
|
Gabriela Rodríguez Berón
|
43512819a5
|
Merge pull request #164 from coralproject/fix-signup-bug
Updating signup endpoint to reflect current api.
|
2016-12-12 13:01:47 -08:00 |
|
|
Wyatt Johnson
|
f7b4aed620
|
Merge branch 'master' into wordlist
|
2016-12-12 15:58:40 -05:00 |
|
|
David Jay
|
409c9c3eb5
|
Merge branch 'master' into fix-signup-bug
|
2016-12-12 15:56:26 -05:00 |
|
|
David Jay
|
cb576dca8f
|
Updating signup endpoint to reflect current api.
|
2016-12-12 15:52:34 -05:00 |
|
|
David Jay
|
e85906b841
|
Merge pull request #160 from coralproject/configure-bug
Configure Tab
|
2016-12-12 15:50:50 -05:00 |
|
|
David Jay
|
7b113c1931
|
Merge branch 'master' of github.com:coralproject/talk into wordlist
|
2016-12-12 13:37:43 -05:00 |
|
|
Riley Davis
|
749a5d9853
|
Merge branch 'master' into use-js-while-rendering
|
2016-12-12 07:34:36 -10:00 |
|
|
Belén Curcio
|
55df0f3036
|
Merge branch 'master' into configure-bug
|
2016-12-12 14:08:32 -03:00 |
|
|
Belén Curcio
|
93183015e0
|
Merge pull request #158 from coralproject/simplify-community-page
simplify Community page
|
2016-12-11 23:29:53 -03:00 |
|
|
Belen Curcio
|
42ff3ae4a2
|
filter restricted tabs
|
2016-12-11 23:10:25 -03:00 |
|
|
Belen Curcio
|
a872128a55
|
logOut Stae
|
2016-12-11 22:52:47 -03:00 |
|
|
Riley Davis
|
c18f885277
|
Merge branch 'master' into use-js-while-rendering
|
2016-12-09 15:06:51 -10:00 |
|
|
Riley Davis
|
9e353eaae8
|
Merge branch 'master' into simplify-community-page
|
2016-12-09 15:06:43 -10:00 |
|
|
Riley Davis
|
116368dcd3
|
Merge pull request #156 from coralproject/update-users-api
Updating user route to users.
|
2016-12-09 15:06:09 -10:00 |
|
|
Riley Davis
|
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 |
|
|
Kim Gardner
|
1c670835d1
|
Merge pull request #151 from coralproject/flag-bio
Flag bio
|
2016-12-09 14:30:19 -10:00 |
|
|
David Jay
|
d229d5a96f
|
Updating route to davidjay.
|
2016-12-09 19:28:19 -05:00 |
|
|
Gabriela Rodríguez Berón
|
02015bc5c3
|
Merge branch 'master' into flag-bio
|
2016-12-09 14:26:28 -10:00 |
|