wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-19 12:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,320 Commits 10 Branches 125 Tags
1f3eb5f516c879eecdd00f80752e62a5dd37dcba
Commit Graph
493 Commits
Author SHA1 Message Date
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
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
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 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 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 Jay 66a890458c Adding sort to moderation queue. 2017-02-24 17:42:29 -05:00
Riley Davis aefcb29877 remove comment count from results 2017-02-24 12:58:06 -07: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
Riley Davis 886240a7bc translations. remove console.log on frontend. remove notification on POST moderation 2017-02-24 11:11:18 -07:00
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 Gardner 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ón 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 Davis 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ón 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