Commit Graph

116 Commits

Author SHA1 Message Date
Wyatt Johnson 76a255fb7b initial pass at status support 2017-11-02 17:16:57 -06:00
Wyatt Johnson 5657fde7dc Merge branch 'master' into e2e-browserstack 2017-10-18 13:25:59 -06:00
Wyatt Johnson b97b5e97f2 load username from graph and not auth 2017-10-18 12:23:16 -06:00
Belen Curcio 2c757e9d57 Missing classes 2017-10-17 15:18:53 -03:00
Belen Curcio 8633a0f457 Missing classes 2017-10-17 14:54:06 -03:00
Chi Vinh Le 24d73b2770 Use page objects + one more test 2017-10-12 21:56:56 +07:00
Ryan Yun 3f90f72bee update classes to follow talk naming convention 2017-09-25 12:33:59 -04:00
Ryan Yun 235b2e1068 add class name for my profile container 2017-09-22 11:10:39 -04:00
Chi Vinh Le e7c78a2465 Pluginize timestamp 2017-09-20 22:53:04 +07:00
Chi Vinh Le 4046b6e0a6 Remove zombie files 2017-09-09 00:20:18 +07:00
Wyatt Johnson 2e350c2244 Merge branch 'master' into prop-types 2017-09-08 00:44:09 -06:00
Chi Vinh Le e1a5a64b39 Pluginize stop ignoring user feature in profile 2017-09-05 01:09:43 +07:00
Wyatt Johnson c8d1871418 Merge branch 'master' into lint-upgrade 2017-08-29 11:56:59 -06:00
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -06:00
Belen Curcio e77bdf0b90 linting 2017-08-28 16:31:46 -03:00
Belen Curcio 93c1ecd12d My Comment Reactions 2017-08-28 16:25:26 -03:00
Wyatt Johnson deb69d4e8c fixed prop-types deprecation 2017-08-28 12:03:20 -06:00
Chi Vinh Le 9436188487 Merge branch 'master' into load-more-history
Conflicts:
	client/coral-settings/containers/ProfileContainer.js
2017-08-28 22:25:20 +07:00
Chi Vinh Le 153c5acce1 Only load my own comments in history 2017-08-28 19:15:29 +07:00
Chi Vinh Le f9bc5f79ec Don't sort and ignore duplicate comments (embed-stream) 2017-08-28 18:08:33 +07:00
Chi Vinh Le 48595a1bbf Merge branch 'master' into user-sort
Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js
2017-08-25 21:55:00 +07:00
Wyatt Johnson ec2c62a607 Merge branch 'master' into user-sort 2017-08-21 08:48:26 -06:00
Chi Vinh Le 74f778aef7 Merge branch 'master' into talk-provider
Conflicts:
	client/coral-embed-stream/src/containers/Embed.js
	plugin-api/beta/client/hocs/withReaction.js
2017-08-21 21:38:39 +07:00
Chi Vinh Le 9566f83eac Remove coral-framework reducers
Some of them were only related to the embed stream.
Auth code is too convoluted with the embed stream and can't be reused atm.
2017-08-21 21:31:54 +07:00
Chi Vinh Le 833e78f99a Integrate ProfileContainer slot into graphql framework 2017-08-18 21:44:56 +07:00
Chi Vinh Le 8eaac3eaa2 Tiny refactor.. 2017-08-18 19:50:56 +07:00
Chi Vinh Le 6a5f6e3ce1 Adapt loading detection 2017-08-18 17:57:32 +07:00
Wyatt Johnson 686eb614f7 changed cursor to Cursor scalar type, changed SORT_ORDER 2017-08-17 16:43:55 -06:00
Chi Vinh Le 7360a43898 Remove immutable from embed stream 2017-08-11 22:50:12 +07:00
Chi Vinh Le 976bd1e9ad Paginate my comments in profile tab 2017-08-08 22:39:24 +07:00
Belen Curcio eb3a9431f9 Renaming 2017-07-20 11:50:13 -03:00
Chi Vinh Le b7c4dbd224 Remove CommonJS style exports in framework 2017-07-07 17:27:05 +07:00
gaba eadbb03c15 Fix typo. 2017-06-02 06:54:01 -07:00
gaba b6dbb5975f Adds missing translations. 2017-06-01 17:26:49 -07:00
Chi Vinh Le 30d4562383 Refactor pagination 2017-06-01 01:18:41 +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
gaba 492f4a674c OMG. Strings. 2017-05-25 12:02:26 -04:00
Chi Vinh Le b43a0f533b Harmonize naming in admin and embed-stream 2017-05-25 18:37:23 +07:00
gaba a184837ff8 Goes back to load all translations... 2017-05-23 12:46:53 -04:00
gaba f525af4c6e Added a few more translations that were missing. 2017-05-19 15:42:56 -07:00
gaba 9be443eda8 Moves i18n into coral-framework. 2017-05-19 12:28:44 -07:00
gaba 3aceb0dc38 Merge branch 'master' into i18n-refactor 2017-05-17 12:59:24 -07:00
gaba 5bd9bc992b Move i18n into a service 2017-05-17 12:53:36 -07:00
Chi Vinh Le c7e0577708 Merge branch 'master' into invalidate-old-data 2017-05-16 18:17:45 +07:00
Chi Vinh Le 2ab8cc9481 Allow Apollo to invalidate old user data 2017-05-16 18:17:43 +07:00
Chi Vinh Le e1b80c3317 Only refetch for login 2017-05-16 17:50:17 +07:00
Chi Vinh Le ec19618052 Readd login fixes 2017-05-16 17:26:53 +07:00
gaba 423cb3cade Merge branch 'master' into i18n-refactor 2017-05-15 14:02:34 -07:00
Belen Curcio 2b7f545c2d lint 2017-05-15 17:31:53 -03:00