Commit Graph
476 Commits
Author SHA1 Message Date
Kim Gardner b3b10efbba Use tú to match other translations 2017-02-28 12:35:20 -05:00
Kim Gardner 3bfde67d58 Copy updates with translations 2017-02-28 12:32:51 -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
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
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 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 886240a7bc translations. remove console.log on frontend. remove notification on POST moderation 2017-02-24 11:11:18 -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 2acd099f3f add empty state for asset search 2017-02-22 11:15:13 -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 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
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
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 Davis 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 Erwin 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 Johnson 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 Erwin 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