 gaba
|
9043ae9f20
|
We are using asset and not article.
|
2016-12-12 22:19:09 -08:00 |
|
|
gaba
|
475c84dfbc
|
Fix date comparision and change article for asset.
|
2016-12-12 22:18:11 -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 |
|
|
gaba
|
0648b2b1c8
|
More tests.
|
2016-12-12 15:38:28 -08:00 |
|
|
Riley Davis
|
d43cd9caf9
|
list comments out
|
2016-12-12 16:26:02 -07: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 |
|
|
Wyatt Johnson
|
5284ccc8b7
|
Added support for the suspect wordlist
|
2016-12-12 15:05:19 -07:00 |
|
|
gaba
|
83a7ffee6f
|
Merge branch 'master' into asset-status
|
2016-12-12 13:03:58 -08:00 |
|
|
gaba
|
ee38f697ad
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-12-12 13:03:51 -08:00 |
|
|
gaba
|
3b131ce315
|
Removes status field for Asset. Now closedAt and closedMessage are in the settings field.
|
2016-12-12 13:02:39 -08: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 |
|
|
Riley Davis
|
c016e29290
|
separate route for loading comments per user
|
2016-12-12 13:00:39 -07:00 |
|
|
Riley Davis
|
c999e1c1a9
|
use new coralApi fetch
|
2016-12-12 12:28:10 -07:00 |
|
|
Riley Davis
|
c9a8d448ba
|
use plugin CommentHistory component
|
2016-12-12 12:20:38 -07:00 |
|
|
David Jay
|
7b113c1931
|
Merge branch 'master' of github.com:coralproject/talk into wordlist
|
2016-12-12 13:37:43 -05:00 |
|
|
Riley Davis
|
a5b2a4ebc0
|
merge master
|
2016-12-12 11:35:25 -07:00 |
|
|
gaba
|
d228b30f36
|
Merge branch 'master' into asset-status
|
2016-12-12 10:34:05 -08:00 |
|
|
gaba
|
8da59c166e
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-12-12 10:33:57 -08: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 |
|
|
Gabriela Rodríguez Berón
|
7fba082c02
|
Merge branch 'master' into asset-status
|
2016-12-11 18:56:07 -10: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 |
|
|
gaba
|
5e21102c2f
|
Fix routes and tests for asset status change.
|
2016-12-10 14:01:24 -10:00 |
|
|
gaba
|
81071eacd6
|
It adds a status field and change the name of the closedAt and closedMessage to record changes from the status from closed to open too.
|
2016-12-10 14:00:46 -10: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 |
|