wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-01 13:00:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,252 Commits 10 Branches 125 Tags
c283f193deceb61e5f07b423cd0e103933ff341c
Commit Graph
451 Commits
Author SHA1 Message Date
Riley Davis c283f193de remove console.log 2017-02-24 09:07:03 -07:00
riley c8c3c4acaf lint 2017-02-24 08:59:23 -07:00
Riley Davis dc5f95ec7f simplify moderationqueue 2017-02-24 08:50:52 -07:00
Riley Davis 5d1139dbdd Merge branch 'master' 
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
 2017-02-24 08:49:30 -07:00
Riley Davis be25d6f56d "works" 2017-02-23 15:46:44 -07:00
Riley Davis 2f314c6937 omg, a bunch of UI madness 2017-02-23 14:29:51 -07:00
Kim GardnerandGitHub 532f2d92ca Merge branch 'master' into empty-states 2017-02-23 16:15:05 -05:00
Riley Davis 953c749bd2 show login page instead of communicorn :'( 2017-02-22 16:14:14 -07:00
Riley Davis 197569714b Merged branch assets-by-like into assets-by-like 2017-02-22 14:25:19 -07:00
Wyatt Johnson 9e759c7667 Adjusted BE beheviour 2017-02-22 13:55:48 -07:00
Riley Davis e6b78a3e63 change some copy 2017-02-22 13:33:50 -07:00
Riley Davis 111b956522 change index route to Dashboard component 2017-02-22 13:10:50 -07:00
Riley Davis 2acd099f3f add empty state for asset search 2017-02-22 11:15:13 -07:00
Riley Davis 691d001213 simplify a bit 2017-02-22 10:49:48 -07:00
Riley Davis bc48496327 add most liked comments widget 2017-02-22 10:47:23 -07:00
Gabriela Rodríguez BerónandGitHub b29614256b Merge branch 'master' into empty-states 2017-02-22 08:13:44 -08:00
Riley Davis e7c4acde4d small bugfix 2017-02-21 16:11:56 -07:00
Riley DavisandGitHub 30fbcd30a9 Merge branch 'master' into assets-by-like 2017-02-21 14:18:22 -07:00
Riley Davis f32fe2629c css is the worst 2017-02-21 14:16:02 -07:00
Riley Davis 5d94a98305 Like and Flag summaries work again 2017-02-21 14:05:49 -07:00
Riley Davis 9000778d8f empty result for users in Community 2017-02-21 12:39:29 -07:00
Riley Davis e24a0caa20 add EmptyCard component. fix typos. more PropTypes. 2017-02-21 12:08:02 -07:00
Riley Davis 364cf1808e assets by like? 2017-02-21 10:28:33 -07:00
Riley Davis 8866366d3c storing my place in case we want to come back to this 2017-02-17 16:07:34 -07:00
Gabriela Rodríguez BerónandGitHub 31dda920c6 Merge branch 'master' into error_translation_key 2017-02-17 14:30:00 -08:00
gaba 5a09beb727 It has to be translation_key and not message. 2017-02-17 10:12:37 -08:00
Belen Curcio 2d374fcdab Úsing the db url 2017-02-17 15:08:55 -03:00
Belen Curcio 54f0705f0f Merge branch 'master' of github.com:coralproject/talk into stream-settings 2017-02-17 15:05:17 -03:00
Belen Curcio 051978a1ee to the configure 2017-02-17 14:21:47 -03:00
Belen Curcio 761afeaf4f Stream cog, settings 2017-02-17 14:15:16 -03:00
Belen Curcio 25f366c5f1 Comment Count Component 2017-02-17 13:55:35 -03:00
Belen Curcio 7eca9db63c null assetIDs and old typo 2017-02-17 13:53:34 -03:00
Belen Curcio 41d0610985 PropTypes 2017-02-17 13:22:41 -03:00
Riley DavisandWyatt Johnson f925e6a8ea fix bug when likes or flags were 0 for an article 2017-02-16 16:49:14 -07:00
Riley Davis 2b4e16edfa fix bug when likes or flags were 0 for an article 2017-02-16 16:39:02 -07:00
Riley Davis c53aa1d93b add a badge to the queues to show the count. proptypes 2017-02-16 12:48:36 -07:00
Riley Davis 1dcdd4a9c9 make Dashboard first tab per Sam. simplify tabs 2017-02-16 12:04:24 -07:00
David ErwinandGitHub 5467d980df Merge branch 'master' into sory-139595043-qbox 2017-02-16 11:26:22 -05:00
Riley Davis 6c141cbce0 now with likes 2017-02-15 16:52:06 -07:00
Wyatt JohnsonandGitHub 56fe8ef08e Merge branch 'master' into flag-widget 2017-02-15 16:17:30 -07:00
Riley Davis f91607cff9 show the author and publication date 2017-02-15 15:36:46 -07:00
Riley Davis b3b36a245a even more translations en Español 2017-02-15 14:23:54 -07:00
riley b26c170a52 add some translations and link to mod queue 2017-02-15 14:11:44 -07:00
David ErwinandGitHub 8a3309da92 Merge branch 'master' into sory-139595043-qbox 2017-02-15 15:50:42 -05:00
Belen Curcio 1796efd3ba Ádding NONE to the FE 2017-02-15 17:34:29 -03:00
Belen Curcio 675f823849 no comments endpoints in /admin 🎉 2017-02-15 17:32:54 -03:00
Riley Davis efb529d7bd Merge branch 'master' 
Conflicts:
	client/coral-admin/src/AppRouter.js
 2017-02-15 13:03:19 -07:00
Riley Davis 6eda495663 display most flagged assets in a table 2017-02-15 12:57:51 -07:00
gaba 68c764fd43 Rename coral-ui/FormField with TextField. 2017-02-15 11:50:21 -08:00
Belen Curcio ed105f876e not Accepted ones in the Flagged queue 2017-02-15 16:19:31 -03:00