 Riley Davis
|
04ab00d053
|
ignore this
|
2017-03-01 10:40:40 -07:00 |
|
|
Kim GardnerandGitHub
|
87dddaf5b3
|
Merge branch 'master' into admin-login-upgrade
|
2017-03-01 09:01:15 -05:00 |
|
|
Kim GardnerandGitHub
|
0af08fcaea
|
Merge pull request #352 from coralproject/fix-permalink
Fix permalink
|
2017-03-01 09:00:59 -05:00 |
|
|
Kim GardnerandGitHub
|
945e576ce7
|
Merge branch 'master' into fix-permalink
|
2017-03-01 08:57:17 -05:00 |
|
|
riley
|
7ccf77b1ad
|
add reset password link
|
2017-02-28 17:10:51 -07:00 |
|
|
Belén CurcioandGitHub
|
cc9de0b02c
|
Merge pull request #348 from coralproject/whizard-whitelist
Permitted Domains for Talk Install
|
2017-02-28 21:06:16 -03:00 |
|
|
Belen Curcio
|
dc81ec1e80
|
Merge branch 'whizard-whitelist' of github.com:coralproject/talk into whizard-whitelist
|
2017-02-28 20:44:55 -03:00 |
|
|
Belen Curcio
|
1db0a75010
|
Merge
|
2017-02-28 20:42:03 -03:00 |
|
|
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 |
|
|
David Jay
|
d8117494d1
|
Cleaning up after merge conflict.
|
2017-02-28 18:18:17 -05:00 |
|
|
David JayandGitHub
|
e68358a211
|
Merge branch 'master' into fix-permalink
|
2017-02-28 18:07:31 -05:00 |
|
|
Kim GardnerandGitHub
|
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 |
|
|
David Jay
|
037f5be377
|
Merge branch 'master' of github.com:coralproject/talk into fix-permalink
|
2017-02-28 14:28:32 -05:00 |
|
|
David Jay
|
62fe63d323
|
Scrolling to permalinked comment or reply.
|
2017-02-28 14:27:53 -05:00 |
|
|
David Jay
|
158f31d603
|
Highlighting permalinked comment.
|
2017-02-28 13:55:28 -05:00 |
|
|
Riley DavisandGitHub
|
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 |
|
|
Gabriela Rodríguez BerónandGitHub
|
1db68a12a8
|
Merge branch 'master' into whizard-whitelist
|
2017-02-28 09:54:39 -08:00 |
|
|
Riley Davis
|
65e8e42ae6
|
remove query from Dashboard component per belen's advice
|
2017-02-28 10:51:14 -07:00 |
|
|
Kim GardnerandGitHub
|
b3b10efbba
|
Use tú to match other translations
|
2017-02-28 12:35:20 -05:00 |
|
|
Kim GardnerandGitHub
|
3bfde67d58
|
Copy updates with translations
|
2017-02-28 12:32:51 -05:00 |
|
|
Kim GardnerandGitHub
|
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 JayandGitHub
|
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 |
|
|
David Jay
|
bf23fc2974
|
Moving comment id into query.
|
2017-02-28 12:02:51 -05:00 |
|
|
Riley DavisandGitHub
|
ac3e6a12bd
|
Merge branch 'master' into assets-by-like
|
2017-02-28 09:27:46 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
87d64e575b
|
Merge branch 'master' into whizard-whitelist
|
2017-02-27 15:52:16 -07:00 |
|
|
David JayandGitHub
|
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 |
|
|
Belen Curcio
|
95876fa0e8
|
Merge branch 'master' of github.com:coralproject/talk into whizard-whitelist
|
2017-02-27 17:19:54 -03:00 |
|
|
Belen Curcio
|
555faa02f5
|
new translations for configure
|
2017-02-27 17:18:37 -03:00 |
|
|
Belen Curcio
|
1234a99a0d
|
copy for install permitted domains updated
|
2017-02-27 17:16:19 -03:00 |
|
|
Belen Curcio
|
b9e9d3e7fa
|
status
|
2017-02-27 17:06:22 -03:00 |
|
|
Belen Curcio
|
628e8844f3
|
final translations
|
2017-02-27 17:04:14 -03:00 |
|
|
Belen Curcio
|
b47fd35437
|
add user translations
|
2017-02-27 16:58:16 -03:00 |
|
|
David JayandGitHub
|
1b495b9b09
|
Merge branch 'master' into bugfix-second-new-comments
|
2017-02-27 14:57:24 -05:00 |
|
|
David JayandGitHub
|
373d0de576
|
Merge pull request #346 from coralproject/mod-queue-sort
Adding sort to moderation queue.
|
2017-02-27 14:57:09 -05:00 |
|
|
Belen Curcio
|
7341fdff4e
|
add Organization translations
|
2017-02-27 16:54:03 -03:00 |
|
|
Belen Curcio
|
1e52c579cc
|
Ínitial translations
|
2017-02-27 16:50:04 -03:00 |
|
|
Belen Curcio
|
013625df27
|
no validation for domains
|
2017-02-27 16:39:52 -03:00 |
|
|
David Jay
|
ab16e5bfe7
|
Retrieving comment y id from backend
|
2017-02-27 14:26:20 -05:00 |
|
|
David JayandGitHub
|
dfd211deda
|
Merge branch 'master' into mod-queue-sort
|
2017-02-27 14:05:04 -05:00 |
|
|
Belen Curcio
|
9305853502
|
Renamed to PermittedDomains
|
2017-02-27 15:50:07 -03:00 |
|
|
Belen Curcio
|
b1ec512721
|
Adding whitelist step, sending whitelist
|
2017-02-27 14:42:57 -03:00 |
|
|
David JayandGitHub
|
83e713d889
|
Merge branch 'master' into bugfix-second-new-comments
|
2017-02-27 12:34:11 -05:00 |
|
|
David JayandGitHub
|
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 |
|