wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-24 13:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,819 Commits 10 Branches 125 Tags
f7cddad6593e8ce9d7593c66bc9de348b5f48ee2
Commit Graph
879 Commits
Author SHA1 Message Date
Benjamin Goering f7cddad659 Futureproof Embed Code 
* Add client/coral-embed-api module. It's meant to be included in an HTML page and define window.Coral
* Serve coral-embed-api at /Coral.js
* Update / handler (article view) to use new embed format
* Update Talk Admin embed code section to use new embed format
 2017-02-04 00:47:32 +08:00
Belén CurcioandGitHub 7fe6002219 Merge branch 'master' into hide-pending-sometimes 2017-02-02 12:28:17 -03:00
David ErwinandGitHub 22e32b1869 Merge branch 'master' into hide-pending-sometimes 2017-02-02 10:16:53 -05:00
Belén CurcioandGitHub 04669350a1 Merge branch 'master' into design-pass-tweaks 2017-02-02 12:15:23 -03:00
Wyatt JohnsonandGitHub bd86eef441 Merge branch 'master' into add-yarn 2017-02-02 08:02:06 -07:00
Belén CurcioandGitHub b4a03a5133 Merge branch 'master' into design-pass-tweaks 2017-02-02 07:55:41 -03:00
Riley Davis 22c0ed686f rename everything to Pre-Mod from Pending. hide the pre-mod tab sometimes. 2017-02-01 13:33:29 -07:00
Wyatt Johnson 7beb28e077 Updated documentation 2017-02-01 12:54:15 -07:00
Riley DavisandGitHub ec956165a3 Merge branch 'master' into bugfix-asset-search 2017-02-01 11:35:59 -07:00
Gabriela Rodríguez BerónandGitHub e1650aa721 Merge branch 'master' into timeago-fix 2017-02-01 09:52:40 -08:00
Riley Davis e6e8ad5ca6 close the resend email box after use. remove dead code 2017-01-31 13:29:23 -07:00
David Jay 7babb14bab Addressing bug in asset search. 2017-01-31 14:37:52 -05:00
Riley Davis ec1dfefc5d lint 2017-01-31 12:15:33 -07:00
Riley Davis e63e1f3428 Merge branch 'master' 
Conflicts:
	errors.js
	test/routes/api/auth/index.js
 2017-01-31 12:05:16 -07:00
Riley Davis 56ddc49386 resend verify email 2017-01-31 12:04:19 -07:00
Belen Curcio 6fd2a927f1 Linted 2017-01-30 20:51:28 -03:00
Belen Curcio 76f55b4524 Cursor on user name, and Reply Bio box 2017-01-30 20:50:25 -03:00
Belen Curcio 5b926b9b85 merge 2017-01-30 20:42:15 -03:00
Riley Davis 976c821715 move FormField to coral-ui 2017-01-30 16:00:24 -07:00
Belen Curcio 0881201465 Notification 2017-01-30 20:00:01 -03:00
David Jay 235214642e Fixing bug where timeAgo cannot interpret dates from mongoose properly. 2017-01-30 17:55:06 -05:00
Belen Curcio 5d2ed3f585 Notifications 2017-01-30 19:48:07 -03:00
Belen Curcio f83def83bd tab 2017-01-30 19:38:58 -03:00
Belen Curcio f9363e86d0 Merge 2017-01-30 17:24:57 -03:00
Belén CurcioandGitHub 887fe08819 Merge branch 'master' into graph-pagination 2017-01-30 17:12:23 -03:00
Belen Curcio 2e1dd35de3 Permalink box 2017-01-30 16:47:26 -03:00
Belen Curcio 019e2a4fa9 Flag order 2017-01-30 16:37:00 -03:00
Belen Curcio 744f2085da Lint 🎉 2017-01-30 15:38:26 -03:00
Belen Curcio e4839468e3 Merge branch 'master' of github.com:coralproject/talk into design-pass-tweaks 2017-01-30 15:34:23 -03:00
Belen Curcio b316d626f5 Bio and Embed Stream refresh 2017-01-30 15:33:08 -03:00
Belen Curcio f7725f4143 Notifications working everywhere :D 2017-01-30 15:27:09 -03:00
Belen Curcio 7a227dff91 Notification in the CommentStream Working 2017-01-30 15:11:16 -03:00
Belen Curcio 805b5cb441 Lintin 2017-01-30 09:04:00 -03:00
Belen Curcio c42fea5889 SnackBar 2017-01-30 08:19:18 -03:00
Belen Curcio 8fe8f6c690 Working permalink 2017-01-30 07:56:08 -03:00
Belen Curcio 177a4d8f2e Permalinks and Embed 2017-01-30 07:32:19 -03:00
Belen Curcio 0105b1d4ac Permalink 2017-01-30 06:57:12 -03:00
Belen Curcio 61d24bad60 User bio, onClick and onMouseOver - Styles and Tooltip 2017-01-30 06:17:39 -03:00
Belen Curcio e5976576c1 merge 2017-01-30 05:37:25 -03:00
Wyatt Johnson 04cd7312a6 Added support for new commentCount 2017-01-27 15:52:05 -07:00
David Jay b674ff45c0 Addressing errors with replies in e2e. 2017-01-27 17:29:23 -05:00
Riley Davis 5e521b832c add a confirm-email landing page 2017-01-27 15:04:42 -07:00
David JayandGitHub f09d9d0a8b Merge branch 'master' into e2e-env-fix 2017-01-27 14:10:59 -05:00
David Jay fcf22ef4f9 Adding selenium settings and fixing bug in moderation approval. 2017-01-27 14:07:34 -05:00
Belen Curcio 55a8b4984a only importing isEqual 2017-01-27 14:58:36 -03:00
Belen Curcio 1778c19f6a çhanges 2017-01-27 14:55:55 -03:00
David Erwin c8c160a551 Remove avatar from user cards 2017-01-27 10:16:09 -05:00
David Jay f06edec6a2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-26 16:38:43 -05:00
David Jay b6d8a90084 Updating style of UserActions and moving ActionButton to its own component. 2017-01-26 16:36:43 -05:00
David ErwinandGitHub f42b8f324a Merge branch 'master' into hide-premod-links 2017-01-26 16:24:06 -05:00