 Belen Curcio
|
e59534bf46
|
merge confict
|
2017-02-15 16:09:04 -03:00 |
|
|
David Jay
|
1cad1d36d5
|
Updating asset_id to camelcase.
|
2017-02-15 13:26:56 -05:00 |
|
|
David Jay
|
88843486f1
|
Removing log statement.
|
2017-02-15 13:21:34 -05:00 |
|
|
David Jay
|
79dbe7dcda
|
Updating commentCount on comment post.
|
2017-02-15 13:05:31 -05:00 |
|
|
David Jay
|
904bda86db
|
Fixing error with replies.
|
2017-02-15 12:36:19 -05:00 |
|
|
David Jay
|
a9104b749c
|
Updating comments and replies using updatequeries w/ optimistic updating.
|
2017-02-15 12:19:36 -05:00 |
|
|
Belen Curcio
|
417edc81ca
|
Admin actions for flagged comments
|
2017-02-15 13:40:01 -03:00 |
|
|
gaba
|
d7469d648d
|
Replace element with name instead of id. Add style to textfield from coral-ui.
|
2017-02-14 17:48:10 -08:00 |
|
|
gaba
|
0f074dc034
|
Changes styles for Emma and Sam's design.
|
2017-02-14 17:13:08 -08:00 |
|
|
gaba
|
d3f81353a6
|
Fix TextField for coral-ui and setting configure stream, question box.
|
2017-02-14 16:51:57 -08:00 |
|
|
Wyatt Johnson
|
e640bc2cc0
|
Added edge for metrics, fixed client linting errors
|
2017-02-14 17:02:50 -07:00 |
|
|
David Jay
|
6bc610d2c6
|
Merge branch 'load-more-replies' of github.com:coralproject/talk into load-more-replies
|
2017-02-14 18:59:00 -05:00 |
|
|
David Jay
|
fbf543727b
|
Moving load more limit to constant.
|
2017-02-14 18:54:51 -05:00 |
|
|
David Jay
|
bab2acc557
|
Merge branch 'master' into load-more-replies
|
2017-02-14 18:36:15 -05:00 |
|
|
gaba
|
52a1ebe82a
|
Merge branch 'master' into sory-139595043-qbox
|
2017-02-14 15:35:43 -08:00 |
|
|
gaba
|
b1d90dfd87
|
Fix TextField for the Configure Stream.
|
2017-02-14 15:31:12 -08:00 |
|
|
David Jay
|
00c2305ff7
|
Adding view more button to replies.
|
2017-02-14 18:29:59 -05:00 |
|
|
Riley Davis
|
50e3e733c3
|
create FlagWidget
|
2017-02-14 16:12:38 -07:00 |
|
|
Riley Davis
|
63982aa241
|
add PropTypes to LoadMore component
|
2017-02-14 15:27:36 -07:00 |
|
|
Riley Davis
|
0bef413a3a
|
saving my place
|
2017-02-14 15:20:28 -07:00 |
|
|
David Jay
|
714c251c77
|
Merge branch 'master' into load-more-comments
|
2017-02-14 17:02:32 -05:00 |
|
|
David Erwin
|
d4651d4a2f
|
Merge pull request #312 from coralproject/disable-e2e-ci
Comment out e2e in ci
|
2017-02-14 17:01:46 -05:00 |
|
|
David Erwin
|
06422d7074
|
Comment out e2e in ci
|
2017-02-14 16:56:55 -05:00 |
|
|
David Jay
|
e95372373c
|
Merge branch 'master' into load-more-comments
|
2017-02-14 16:35:44 -05:00 |
|
|
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 |
|