 David Erwin
|
b76f3bbf91
|
Merge branch 'all-flag'
t push origin master
|
2017-02-14 16:31:01 -05:00 |
|
|
David Jay
|
a07b98dcc4
|
Updating logout path.
|
2017-02-14 16:16:40 -05:00 |
|
|
David Jay
|
85ea41725a
|
Increasing logout button load time.
|
2017-02-14 16:03:38 -05:00 |
|
|
David Jay
|
f524f539da
|
Increasing logout time.
|
2017-02-14 15:53:40 -05:00 |
|
|
David Jay
|
b497dc2286
|
Merge branch 'master' of github.com:coralproject/talk into load-more-comments
|
2017-02-14 15:42:32 -05:00 |
|
|
David Jay
|
c3fe9fb43e
|
Commenting out brittle e2e test.
|
2017-02-14 15:41:25 -05:00 |
|
|
Belén Curcio
|
023ba74c8f
|
Merge branch 'master' into all-flag
|
2017-02-14 16:34:44 -03:00 |
|
|
Belen Curcio
|
41a1eeda26
|
Removing all code
|
2017-02-14 16:10:08 -03:00 |
|
|
Belen Curcio
|
bbb82b6a77
|
New static routes <3 for global and single assets, also, deprecating the all view
|
2017-02-14 16:06:13 -03:00 |
|
|
Riley Davis
|
5e2c1a9d4f
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/translations.json
|
2017-02-14 12:03:54 -07:00 |
|
|
David Erwin
|
daec809d87
|
Merge pull request #307 from coralproject/external-css-file
Configure override css file
|
2017-02-14 13:58:05 -05:00 |
|
|
David Erwin
|
ce2213549b
|
Merge branch 'master' into external-css-file
|
2017-02-14 13:40:22 -05:00 |
|
|
David Erwin
|
d2c9b4b7a7
|
Merge pull request #310 from coralproject/close-time-bug
fix Configure in admin
|
2017-02-14 13:40:07 -05:00 |
|
|
Riley Davis
|
53e3147290
|
properly save settings to server
|
2017-02-14 11:29:40 -07:00 |
|
|
Riley Davis
|
fe1aaba9ed
|
revert state shape to what it was before
|
2017-02-14 11:05:39 -07:00 |
|
|
David Jay
|
330c37ef86
|
Merge branch 'load-more-comments' of github.com:coralproject/talk into load-more-comments
|
2017-02-14 12:27:17 -05:00 |
|
|
David Jay
|
03a198a867
|
Adding View More translation.
|
2017-02-14 12:25:39 -05:00 |
|
|
David Jay
|
6b4ea14ce2
|
Merge branch 'master' into load-more-comments
|
2017-02-14 12:00:12 -05:00 |
|
|
gaba
|
f51c857e8b
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-14 08:51:58 -08:00 |
|
|
Wyatt Johnson
|
d987b33d99
|
Merge branch 'master' into flag-widget
|
2017-02-14 09:00:12 -07:00 |
|
|
David Erwin
|
d1749e0f35
|
Merge branch 'master' into external-css-file
|
2017-02-14 09:59:37 -05:00 |
|
|
David Erwin
|
b85950140b
|
Merge pull request #309 from coralproject/install-missing
Missing reducer in Talk Installer
|
2017-02-14 09:59:16 -05:00 |
|
|
Belen Curcio
|
f07900b294
|
Missing reducer
|
2017-02-14 11:44:22 -03:00 |
|
|
gaba
|
d4109c8fca
|
Adds textfield to coral-UI.
|
2017-02-13 16:51:31 -08:00 |
|
|
David Jay
|
edc3671839
|
Updating load-more-comments style.
|
2017-02-13 19:32:39 -05:00 |
|
|
David Jay
|
7d617ca611
|
Merge branch 'master' of github.com:coralproject/talk into load-more-comments
|
2017-02-13 18:26:05 -05:00 |
|
|
Riley Davis
|
86d0e59147
|
add translation to input label
|
2017-02-13 16:09:06 -07:00 |
|
|
Riley Davis
|
183d2e1ea0
|
Merged branch master into external-css-file
|
2017-02-13 16:04:00 -07:00 |
|
|
Riley Davis
|
0234112ad0
|
enable configuration for linking override stylesheets
|
2017-02-13 16:03:49 -07:00 |
|
|
David Erwin
|
586d3c4c8a
|
Merge pull request #304 from coralproject/mod-queues-ql
Moderation Queue
|
2017-02-13 17:40:26 -05:00 |
|
|
Wyatt Johnson
|
51cbf79f30
|
Changed fragment
|
2017-02-13 15:33:10 -07:00 |
|
|
gaba
|
1d70ae0dec
|
Adds question enable checkbox.
|
2017-02-13 14:31:56 -08:00 |
|
|
Belen Curcio
|
8953182329
|
merge
|
2017-02-13 19:14:27 -03:00 |
|
|
gaba
|
f9f32b1ef6
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-13 14:13:28 -08:00 |
|
|
gaba
|
1b788b98c6
|
Adds questionBox to the gl query
|
2017-02-13 14:12:32 -08:00 |
|
|
Belen Curcio
|
51be47b62e
|
added flag functionality
|
2017-02-13 19:09:26 -03:00 |
|
|
David Erwin
|
b30ace74b4
|
Merge pull request #299 from coralproject/username-displayname
Inital rename of displayName -> username
|
2017-02-13 17:07:56 -05:00 |
|
|
gaba
|
5a2e4b708b
|
Adds question box
|
2017-02-13 13:48:03 -08:00 |
|
|
David Jay
|
1af25bb2a7
|
Updating mocks.
|
2017-02-13 16:29:56 -05:00 |
|
|
Belen Curcio
|
37ba14f3b5
|
breaking big words
|
2017-02-13 18:27:26 -03:00 |
|
|
Belen Curcio
|
519298b980
|
Design Pass
|
2017-02-13 18:12:37 -03:00 |
|
|
gaba
|
b16bdafc1a
|
Adds plugin for question box.
|
2017-02-13 12:22:05 -08:00 |
|
|
David Jay
|
c756b22302
|
Switching Load More to stateless component.
|
2017-02-13 15:15:27 -05:00 |
|
|
Belen Curcio
|
732ef9b8bd
|
Adding moderationList for the tests
|
2017-02-13 16:24:12 -03:00 |
|
|
Belen Curcio
|
72156a01b8
|
Merge branch 'mod-queues-ql' of github.com:coralproject/talk into mod-queues-ql
|
2017-02-13 16:14:48 -03:00 |
|
|
Belen Curcio
|
0403c46c6c
|
Adding errors response
|
2017-02-13 16:13:03 -03:00 |
|
|
Belen Curcio
|
594b87208a
|
GraphQL Review and Responses
|
2017-02-13 16:00:55 -03:00 |
|
|
David Jay
|
03b73d8d6d
|
Merge branch 'master' into load-more-comments
|
2017-02-13 12:45:25 -06:00 |
|
|
Belén Curcio
|
12acbeee45
|
Merge branch 'master' into mod-queues-ql
|
2017-02-13 15:23:43 -03:00 |
|
|
David Jay
|
5b2f52a283
|
Restyling Load More button.
|
2017-02-13 13:22:50 -05:00 |
|