Jeff Nelson
|
7c9e2297df
|
don't hardcode branch
|
2017-08-28 09:54:20 -04:00 |
|
Chi Vinh Le
|
153c5acce1
|
Only load my own comments in history
|
2017-08-28 19:15:29 +07:00 |
|
Chi Vinh Le
|
bb42cffc17
|
Add sort plugins for other reactions
|
2017-08-28 18:50:01 +07:00 |
|
Chi Vinh Le
|
0dffc15836
|
Hover styles
|
2017-08-28 18:22:30 +07:00 |
|
Chi Vinh Le
|
e4490e20a7
|
Merge branch 'master' into user-sort
Conflicts:
package.json
|
2017-08-28 18:16:18 +07:00 |
|
Chi Vinh Le
|
f9bc5f79ec
|
Don't sort and ignore duplicate comments (embed-stream)
|
2017-08-28 18:08:33 +07:00 |
|
Kim Gardner
|
5ec65c86ce
|
Merge pull request #879 from coralproject/questionbox
Question Box Builder
|
2017-08-25 20:58:41 +01:00 |
|
Wyatt Johnson
|
8a5db167ff
|
changed sort -> sortOrder
|
2017-08-25 09:59:37 -06:00 |
|
Chi Vinh Le
|
48595a1bbf
|
Merge branch 'master' into user-sort
Conflicts:
client/coral-admin/src/reducers/moderation.js
client/coral-embed-stream/src/actions/stream.js
client/coral-embed-stream/src/components/Stream.js
client/coral-framework/components/Slot.js
plugin-api/beta/client/utils/index.js
test/server/routes/api/account/index.js
|
2017-08-25 21:55:00 +07:00 |
|
Belén Curcio
|
ce63942902
|
Merge branch 'master' into questionbox
|
2017-08-25 11:52:11 -03:00 |
|
Kim Gardner
|
0ecf1cedc3
|
Merge pull request #874 from coralproject/refactor-global-dependencies
Dependency Management
|
2017-08-25 15:41:53 +01:00 |
|
Chi Vinh Le
|
7f899b0440
|
Attach to fragments tree
|
2017-08-25 21:40:57 +07:00 |
|
Chi Vinh Le
|
88b2798718
|
Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort
|
2017-08-25 21:30:24 +07:00 |
|
Chi Vinh Le
|
e3227322a5
|
Some docs
|
2017-08-25 21:22:48 +07:00 |
|
Kim Gardner
|
a767ab73da
|
Update default plugins to include new sorts
|
2017-08-25 15:20:05 +01:00 |
|
Kim Gardner
|
3e65eac7a0
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-25 15:18:46 +01:00 |
|
Kim Gardner
|
1b6b0a4b87
|
Merge pull request #878 from coralproject/bump-version-3-3-0
Update version to 3.3.0
|
2017-08-25 15:18:36 +01:00 |
|
Chi Vinh Le
|
42951aaf0b
|
Adding proptypes
|
2017-08-25 21:17:15 +07:00 |
|
Chi Vinh Le
|
6b96fcfad1
|
Only unsubscribe from newest comments
|
2017-08-25 21:05:30 +07:00 |
|
Jeff Nelson
|
fe0c32898d
|
Update README.md
|
2017-08-25 10:03:46 -04:00 |
|
Jeff Nelson
|
091d787e34
|
Update README.md
|
2017-08-25 10:02:16 -04:00 |
|
Jeff Nelson
|
7ee2794344
|
Merge branch 'master' into feature/heroku-deploy
|
2017-08-25 09:56:55 -04:00 |
|
Jeff Nelson
|
cc66f1b459
|
update
|
2017-08-25 09:47:59 -04:00 |
|
Jeff Nelson
|
50caddee56
|
update
|
2017-08-25 09:47:40 -04:00 |
|
Jeff Nelson
|
28dafd3e07
|
update
|
2017-08-25 09:27:52 -04:00 |
|
Chi Vinh Le
|
38c290958c
|
Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort
|
2017-08-25 20:22:09 +07:00 |
|
Jeff Nelson
|
2f3d7c5329
|
set default root url
|
2017-08-25 09:17:51 -04:00 |
|
Chi Vinh Le
|
e51e8c543f
|
Add more sort options and improve styling
|
2017-08-25 20:15:07 +07:00 |
|
Jeff Nelson
|
4b7cc9ffcc
|
whoops
|
2017-08-25 08:55:26 -04:00 |
|
Kim Gardner
|
59ddcea592
|
Update version to 3.3.0
|
2017-08-25 13:55:19 +01:00 |
|
Jeff Nelson
|
faecd80543
|
better handling for heroku dynamic port
|
2017-08-25 08:51:36 -04:00 |
|
Chi Vinh Le
|
9e2f6f1f63
|
Use factory
|
2017-08-25 19:40:55 +07:00 |
|
Jeff Nelson
|
e73c113e0d
|
use mailgun since postmark has been deprecated
|
2017-08-25 08:30:29 -04:00 |
|
Chi Vinh Le
|
6ae68a4f90
|
First working version
|
2017-08-25 19:21:57 +07:00 |
|
Chi Vinh Le
|
f0931b4dc6
|
Fix asset.comment resolver
|
2017-08-25 19:21:14 +07:00 |
|
Kim Gardner
|
62687f307a
|
Merge pull request #877 from coralproject/own-user-comments
Cleaned up user query logic
|
2017-08-25 12:37:16 +01:00 |
|
Kim Gardner
|
a83ea98978
|
Merge branch 'master' into own-user-comments
|
2017-08-25 12:22:53 +01:00 |
|
Kim Gardner
|
7aadaa6f8b
|
Merge pull request #873 from coralproject/banned-words
Banned Words / Suspect Words Fix
|
2017-08-25 12:22:28 +01:00 |
|
Belen Curcio
|
46f17f5381
|
Fully working :)
|
2017-08-24 19:10:30 -03:00 |
|
Belen Curcio
|
de7ab8f7ac
|
With fancy lazy load for the Markdown Editor :D
|
2017-08-24 19:05:57 -03:00 |
|
Belen Curcio
|
5302d6d935
|
Markdown Editor Added and Working
|
2017-08-24 18:21:52 -03:00 |
|
Belen Curcio
|
3d0d5df139
|
Markdown Added
|
2017-08-24 18:16:32 -03:00 |
|
Belen Curcio
|
575a3030f9
|
Smooth transition
|
2017-08-24 16:40:16 -03:00 |
|
Belen Curcio
|
73058c624f
|
Linting
|
2017-08-24 16:32:51 -03:00 |
|
Belen Curcio
|
5cb71eaee8
|
Icon List for Question Box
|
2017-08-24 16:32:07 -03:00 |
|
Wyatt Johnson
|
60677e3d2a
|
cleaned up user query logic
|
2017-08-24 13:07:44 -06:00 |
|
Belen Curcio
|
7991188f8d
|
deleting old code from default.css and building QuestionBox component
|
2017-08-24 14:45:47 -03:00 |
|
Wyatt Johnson
|
13796fb268
|
added more test cases
|
2017-08-24 11:18:17 -06:00 |
|
Wyatt Johnson
|
308449a67c
|
added more messaging for cli tool
|
2017-08-24 10:24:56 -06:00 |
|
Kim Gardner
|
c733b7760d
|
Merge branch 'master' into banned-words
|
2017-08-24 17:22:49 +01:00 |
|