wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,345 Commits 10 Branches 125 Tags
c33ae1f7f832f2decc86239d3cf5b2a8c5137ae9
Commit Graph
1226 Commits
Author SHA1 Message Date
Belen Curcio c33ae1f7f8 Merge branch 'master' of github.com:coralproject/talk into comment-component 2017-03-01 11:08:46 -03:00
Kim GardnerandGitHub 945e576ce7 Merge branch 'master' into fix-permalink 2017-03-01 08:57:17 -05:00
Belen Curcio 339aefa72a Merge branch 'master' of github.com:coralproject/talk into comment-component 2017-02-28 21:26:57 -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
David JayandGitHub e68358a211 Merge branch 'master' into fix-permalink 2017-02-28 18:07:31 -05: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
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
Belen Curcio 061efd4734 Comment Component Design 2017-02-28 09:03:19 -03:00
Wyatt JohnsonandGitHub 87d64e575b Merge branch 'master' into whizard-whitelist 2017-02-27 15:52:16 -07: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
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 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 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 JayandGitHub 2b22ce076c Merge branch 'master' into mod-queue-sort 2017-02-27 12:29:42 -05:00
David JayandGitHub 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
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
David JayandGitHub 847df91cbc Merge branch 'master' into bugfix-second-new-comments 2017-02-24 20:03:42 -05: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 ErwinandGitHub f1c1214229 Merge branch 'master' into story-140080313-modal-dn 2017-02-24 15:40:11 -05:00
Wyatt JohnsonandGitHub 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
Riley Davis 5c441e90e7 do not update countCache if the CommentBox is in a reply 2017-02-24 13:08:48 -07:00
Riley Davis aefcb29877 remove comment count from results 2017-02-24 12:58:06 -07:00