Commit Graph
969 Commits
Author SHA1 Message Date
Belen Curcio d386316f8a Styles, copy, funtionality, state changes and clicks. Ready to be tested. 2017-06-16 08:19:22 -03:00
Belen Curcio 5604aa8525 Overlay and Container 2017-06-16 07:33:22 -03:00
Belen Curcio b518358ea8 Lintin 2017-06-15 22:51:15 -03:00
Belen Curcio fe74f4a8d2 Search on enter, removed unused links 2017-06-15 20:24:22 -03:00
Belen Curcio ca08efea8a Adding proptypes as a package, and linting 2017-06-15 18:49:05 -03:00
Belen Curcio 0123736275 Deleting unnecesary connects 2017-06-15 17:42:22 -03:00
Belen Curcio 18061e3e1c new func and style 2017-06-15 17:32:14 -03:00
Belen Curcio 685695bf43 Clear search value 2017-06-15 14:32:50 -03:00
Belen Curcio 928e19ed67 Merge branch 'master' of github.com:coralproject/talk into search-stories 2017-06-15 14:14:13 -03:00
Belen Curcio e160dfaa3e Style and functionality 2017-06-14 18:40:44 -03:00
David ErwinandGitHub 82acab2726 Merge branch 'master' into flagged-usernames-styling 2017-06-13 17:26:24 -04:00
IAmSamHankins 99745723fb style updates to flagged user names queue and updated translations 2017-06-13 12:40:07 -04:00
riley c7d5ab935f merge master 2017-06-09 15:27:44 -06:00
IAmSamHankins cc4c943a21 hover states, link styling, alignment fixes 2017-06-09 17:27:35 -04:00
Riley Davis aa289ecbfe less terrible looking 2017-06-09 14:32:12 -06:00
Riley Davis de665b3a0d show stories in dropdown 2017-06-09 14:10:21 -06:00
Riley Davis 06da4d7d26 toggle story search 2017-06-07 16:36:27 -06:00
Riley Davis 9818b851db clean up the ModerationHeader component 2017-06-07 15:40:36 -06:00
Belen Curcio 63a35cbceb Merge issues 2017-06-07 16:38:36 -03:00
Riley Davis 9f4df35c3a percents have to be multiplied by 100 2017-06-07 10:15:50 -06:00
Riley Davis 2384ae4baa move edit comment config 2017-06-06 14:49:07 -06:00
Riley Davis 4e19d5eecf don't have functions re-created every render 2017-06-06 13:11:31 -06:00
Riley Davis 5465563856 reload and clear selections 2017-06-06 12:52:26 -06:00
Riley DavisandGitHub 1c8e1cc46c Merge branch 'master' into bulk-actions 2017-06-05 14:42:07 -06:00
Riley Davis c4a41af33b clear selected ids when panel is closed 2017-06-05 14:40:03 -06:00
Riley Davis 39d8a5d01b bulk operations on User Detail comments 2017-06-05 14:20:34 -06:00
KiwiandGitHub 7efdccb683 Merge branch 'master' into auth-token-via-config 2017-06-05 17:57:13 +07:00
Chi Vinh Le 7c145bbb3c Refactor import order and framework initialization 2017-06-05 17:49:43 +07:00
Riley Davis e097b8eb21 design pass 2017-06-02 13:50:00 -06:00
Riley Davis 22c2843ae5 remove moderate link per designs 2017-06-02 13:12:59 -06:00
Riley Davis d8cb560755 add a tab for All/Rejected user detail comments 2017-06-02 13:02:22 -06:00
Riley Davis 555d54425a implement kiwi's pagination changes 2017-06-01 15:34:05 -06:00
Riley DavisandGitHub d981b5a85b Merge branch 'master' into user-comment-history 2017-06-01 10:52:24 -06:00
Riley Davis 576cbed8e9 no more errors 2017-05-31 13:44:38 -06:00
Chi Vinh Le 30d4562383 Refactor pagination 2017-06-01 01:18:41 +07:00
riley 6e458e0149 resolve missing files 2017-05-31 10:54:34 -06:00
Riley Davis 259ce9c9fb merge master 2017-05-31 10:36:01 -06:00
Riley Davis 29753a958b show comments on the UserDetail drawer 2017-05-30 15:50:56 -06:00
Chi Vinh Le 109f4b2c0f Handle mutation errors 2017-05-31 00:44:16 +07:00
Chi Vinh Le 1acf58182f Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
	client/coral-admin/src/containers/Community/Loading.js
	client/coral-admin/src/containers/Community/Table.js
	client/coral-admin/src/containers/Streams/Stories.js
	client/coral-admin/src/index.js
	client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
	client/coral-admin/src/routes/Community/components/People.js
	client/coral-admin/src/routes/Configure/components/Configure.js
	client/coral-admin/src/routes/Configure/components/Domainlist.js
	client/coral-admin/src/routes/Configure/components/EmbedLink.js
	client/coral-admin/src/routes/Configure/components/ModerationSettings.js
	client/coral-admin/src/routes/Configure/components/StreamSettings.js
	client/coral-admin/src/routes/Configure/components/TechSettings.js
	client/coral-admin/src/routes/Configure/components/Wordlist.js
	client/coral-admin/src/routes/Dashboard/components/CountdownTimer.js
	client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
	client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
	client/coral-admin/src/routes/Install/components/Steps/FinalStep.js
	client/coral-admin/src/routes/Install/components/Steps/InitialStep.js
	client/coral-admin/src/routes/Install/components/Steps/PermittedDomainsStep.js
	client/coral-admin/src/routes/Install/components/translations.json
	client/coral-admin/src/routes/Moderation/components/Moderation.js
	client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
	client/coral-admin/src/routes/Stories/components/Stories.js
	client/coral-embed-stream/src/index.js
2017-05-29 23:06:40 +07:00
Chi Vinh Le 0b7432b75e Merge branch 'master' into i18n-refactor
Conflicts:
	client/coral-sign-in/components/FakeComment.js
	client/coral-sign-in/components/UserBox.js
2017-05-29 20:23:27 +07:00
Chi Vinh Le 9a6532ecea Merge branch 'master' into integrate-admin-graphql-framework
Conflicts:
	client/coral-embed-stream/src/index.js
2017-05-29 20:09:03 +07:00
Kim GardnerandGitHub 82d442d95b Merge branch 'master' into minor-stream-style-changes 2017-05-26 16:53:55 -04:00
Chi Vinh Le ee2068f5f1 Merge branch 'master' into auth-flow
Conflicts:
	client/coral-admin/src/actions/auth.js
2017-05-27 01:07:19 +07:00
Chi Vinh Le a7cdcb0bf7 Fix request options and use better filename 2017-05-27 00:54:36 +07:00
IAmSamHankins 05e5200e79 moderation panel design cleanup PT 144120491 2017-05-26 12:48:15 -04:00
Chi Vinh Le 6a1befc3f0 Detect mobile safari & desktop safari 2017-05-26 20:48:24 +07:00
Chi Vinh Le a39fcee3f8 More error handling fixes 2017-05-26 03:04:06 +07:00
Chi Vinh Le 841735b787 Restore error functionality 2017-05-26 02:55:09 +07:00
Belen Curcio 21644bda8a Linting 2017-05-25 16:24:39 -03:00