 Riley Davis
|
1f3eb5f516
|
Merged branch master into admin-login-upgrade
|
2017-02-28 16:31:49 -07:00 |
|
|
riley
|
8f23ca678d
|
add Alert component to coral-ui
|
2017-02-28 16:31:30 -07:00 |
|
|
Kim Gardner
|
7bd9411e73
|
Merge pull request #332 from coralproject/assets-by-like
Dashboard: Articles with most likes, articles with most flags
|
2017-02-28 16:57:47 -05:00 |
|
|
Riley Davis
|
b369fb9101
|
re-rename
|
2017-02-28 14:38:19 -07:00 |
|
|
Riley Davis
|
bb1aea63ba
|
add a couple of routes
|
2017-02-28 14:33:57 -07:00 |
|
|
Riley Davis
|
e2273f5810
|
change PermissionRequired to LoginView and create a login form. delete old login page
|
2017-02-28 14:32:01 -07:00 |
|
|
Riley Davis
|
c6885c8f1c
|
Merge branch 'master' into assets-by-like
|
2017-02-28 11:16:26 -07:00 |
|
|
Riley Davis
|
86a6b545cc
|
create a fragment for asset metrics. add some comments
|
2017-02-28 11:15:44 -07:00 |
|
|
Riley Davis
|
65e8e42ae6
|
remove query from Dashboard component per belen's advice
|
2017-02-28 10:51:14 -07:00 |
|
|
Kim Gardner
|
cdbc065c90
|
Merge pull request #351 from coralproject/mod-queue-sort
Fixing order bug with mod queue sorting.
|
2017-02-28 12:22:41 -05:00 |
|
|
David Jay
|
b9297b6079
|
Merge branch 'master' into mod-queue-sort
|
2017-02-28 12:11:05 -05:00 |
|
|
David Jay
|
95a9259c06
|
Fixing bug with mod queue sorting.
|
2017-02-28 12:06:27 -05:00 |
|
|
Riley Davis
|
ac3e6a12bd
|
Merge branch 'master' into assets-by-like
|
2017-02-28 09:27:46 -07:00 |
|
|
David Jay
|
303148e5ba
|
Merge pull request #345 from coralproject/bugfix-second-new-comments
Prevents "0" from appearing on empty comment streams
|
2017-02-27 15:34:40 -05:00 |
|
|
David Jay
|
1b495b9b09
|
Merge branch 'master' into bugfix-second-new-comments
|
2017-02-27 14:57:24 -05:00 |
|
|
David Jay
|
373d0de576
|
Merge pull request #346 from coralproject/mod-queue-sort
Adding sort to moderation queue.
|
2017-02-27 14:57:09 -05:00 |
|
|
David Jay
|
dfd211deda
|
Merge branch 'master' into mod-queue-sort
|
2017-02-27 14:05:04 -05:00 |
|
|
David Jay
|
83e713d889
|
Merge branch 'master' into bugfix-second-new-comments
|
2017-02-27 12:34:11 -05:00 |
|
|
David Jay
|
a47e2378e9
|
Merge pull request #331 from coralproject/dont-agree
Don't Agree flags
|
2017-02-27 12:32:56 -05:00 |
|
|
David Jay
|
491f254206
|
Merge branch 'mod-queue-sort' of github.com:coralproject/talk into mod-queue-sort
|
2017-02-27 12:30:04 -05:00 |
|
|
David Jay
|
2b22ce076c
|
Merge branch 'master' into mod-queue-sort
|
2017-02-27 12:29:42 -05:00 |
|
|
David Jay
|
22793c02e2
|
Merge branch 'master' into dont-agree
|
2017-02-27 12:29:19 -05:00 |
|
|
David Jay
|
37b08fd4e4
|
Displaying oldest first by default.
|
2017-02-27 12:28:13 -05:00 |
|
|
Kim Gardner
|
7914296997
|
Merge pull request #347 from coralproject/header
[Tablet] - Header and Drawer
|
2017-02-27 11:50:30 -05:00 |
|
|
Belen Curcio
|
e8a92b768c
|
logout and version in drawer
|
2017-02-27 11:52:21 -03:00 |
|
|
Belen Curcio
|
f85a6d4da1
|
Drawer
|
2017-02-27 11:49:53 -03:00 |
|
|
Kim Gardner
|
3a6a8ff199
|
Merge pull request #334 from coralproject/story-140080313-modal-dn
Prompt for username when signing up with Facebook
|
2017-02-27 08:08:19 -05:00 |
|
|
David Jay
|
847df91cbc
|
Merge branch 'master' into bugfix-second-new-comments
|
2017-02-24 20:03:42 -05:00 |
|
|
gaba
|
a429af3c0e
|
Removes varialbe not used.
|
2017-02-24 16:10:39 -08:00 |
|
|
gaba
|
d650779c1a
|
Removes ;
|
2017-02-24 16:10:38 -08:00 |
|
|
David Jay
|
66a890458c
|
Adding sort to moderation queue.
|
2017-02-24 17:42:29 -05:00 |
|
|
David Jay
|
6a9d8c0436
|
Removing refetch and prevent 0 from displaying on empty comment streams.
|
2017-02-24 15:51:43 -05:00 |
|
|
David Erwin
|
f1c1214229
|
Merge branch 'master' into story-140080313-modal-dn
|
2017-02-24 15:40:11 -05:00 |
|
|
David Erwin
|
2739a01cd3
|
Merge pull request #341 from coralproject/notifications-alerts
copy updates and remove notification
|
2017-02-24 15:37:34 -05:00 |
|
|
Wyatt Johnson
|
212037891a
|
Merge branch 'master' into assets-by-like
|
2017-02-24 13:36:54 -07:00 |
|
|
Riley Davis
|
11a664d446
|
Merge branch 'master'
Conflicts:
client/coral-plugin-commentbox/CommentBox.js
|
2017-02-24 13:33:25 -07:00 |
|
|
David Erwin
|
b981bea97f
|
Merge pull request #343 from coralproject/updateCountCache-bug
fix Reply bug
|
2017-02-24 15:31:16 -05:00 |
|
|
Riley Davis
|
d20fa3f497
|
Merge branch 'master' into notifications-alerts
|
2017-02-24 13:29:44 -07:00 |
|
|
Riley Davis
|
5c441e90e7
|
do not update countCache if the CommentBox is in a reply
|
2017-02-24 13:08:48 -07:00 |
|
|
Riley Davis
|
893fe97e66
|
Merged branch master into assets-by-like
|
2017-02-24 12:58:33 -07:00 |
|
|
Riley Davis
|
aefcb29877
|
remove comment count from results
|
2017-02-24 12:58:06 -07:00 |
|
|
David Jay
|
dcc16dc598
|
Removing extra semicolon.
|
2017-02-24 14:45:47 -05:00 |
|
|
David Jay
|
4015bea1db
|
Merge branch 'master' into story-140080313-modal-dn
|
2017-02-24 14:39:51 -05:00 |
|
|
Riley Davis
|
1058bff8ad
|
remove logs
|
2017-02-24 11:30:59 -07:00 |
|
|
Riley Davis
|
38e093aac3
|
remove most liked comments widget
|
2017-02-24 11:26:23 -07:00 |
|
|
Wyatt Johnson
|
e14389c492
|
Merge pull request #340 from coralproject/heroku-setup-patch
Adjusted route for Heroku app.json
v0.0.4
|
2017-02-24 11:20:01 -07:00 |
|
|
Wyatt Johnson
|
6566505fc1
|
Adjusted route
|
2017-02-24 11:15:46 -07:00 |
|
|
Riley Davis
|
886240a7bc
|
translations. remove console.log on frontend. remove notification on POST moderation
|
2017-02-24 11:11:18 -07:00 |
|
|
Wyatt Johnson
|
799727264e
|
Removed log
|
2017-02-24 09:57:57 -07:00 |
|
|
Wyatt Johnson
|
f5277ce5e3
|
Patched silly bug
|
2017-02-24 09:57:24 -07:00 |
|