Commit Graph
1940 Commits
Author SHA1 Message Date
Riley DavisandGitHub 6330d69649 Merge branch 'master' into approved-comments-queue 2017-04-27 09:42:28 -06:00
Riley DavisandGitHub 40b7669ed8 Merge branch 'master' into approved-comments-queue 2017-04-27 09:40:30 -06:00
Kim GardnerandGitHub 3bb994c562 Merge branch 'master' into profanity-verbiage 2017-04-27 11:35:47 -04:00
David ErwinandGitHub 6972b87b0b Merge branch 'master' into more-fragment-matcher 2017-04-27 10:10:19 -04:00
Chi Vinh Le 794cc0fc6c Support login on all IOS browsers 2017-04-27 19:28:54 +07:00
David ErwinandGitHub 5eb26946cb Merge branch 'master' into profanity-verbiage 2017-04-26 17:21:34 -04:00
David ErwinandGitHub 81680442f0 Merge branch 'master' into shortcuts-in-cog 2017-04-26 17:20:37 -04:00
David ErwinandGitHub 1b3868edec Merge branch 'master' into 143202319-mod-queue-shortcuts 2017-04-26 17:13:46 -04:00
David ErwinandGitHub 5c4696ed61 Merge branch 'master' into fix-case 2017-04-26 17:08:56 -04:00
David ErwinandGitHub 2756b794ee Merge branch 'master' into more-fragment-matcher 2017-04-26 16:57:37 -04:00
David ErwinandGitHub 077daeb793 Merge branch 'master' into subscriptions 2017-04-26 16:55:32 -04:00
Riley DavisandGitHub fc567e8a92 Merge branch 'master' into shortcuts-in-cog 2017-04-26 13:34:13 -06:00
Gabriela Rodríguez BerónandGitHub 3ad8d9ffec Merge branch 'master' into 143202319-mod-queue-shortcuts 2017-04-26 12:51:30 -05:00
Riley DavisandGitHub a793d63f65 Merge branch 'master' into profanity-verbiage 2017-04-26 11:45:20 -06:00
Riley Davis ccc512cddd if there is no available translation, do not show error.whatever in the UI 2017-04-26 11:43:34 -06:00
David ErwinandGitHub e20b6e1b25 Merge branch 'master' into fix-case 2017-04-26 13:19:50 -04:00
Riley DavisandGitHub 4ff37d9063 Merge branch 'master' into approved-comments-queue 2017-04-26 11:01:41 -06:00
Riley Davis 4ddaca7655 español 2017-04-26 09:20:23 -06:00
Riley Davis 03e0c62b72 accepted => approved 2017-04-26 08:45:37 -06:00
Riley Davis a21d73dcad accepted queue 2017-04-26 08:26:29 -06:00
David ErwinandGitHub 85674b3ef5 Merge branch 'master' into query-composition 2017-04-26 10:09:14 -04:00
Chi Vinh Le d56c35ea64 Merge branch 'master' into query-composition 2017-04-26 19:28:46 +07:00
Chi Vinh Le 9ff2ccf1ed Safari IOS ignores width=100% in iframes 2017-04-26 18:52:30 +07:00
riley aad66ec7e0 fix casing 2017-04-25 16:18:21 -06:00
Kim GardnerandGitHub 94e429e431 Merge branch 'master' into all-comments-queue 2017-04-25 18:16:01 -04:00
Gabriela Rodríguez BerónandGitHub 9e35b7b39f Merge branch 'master' into 143202319-mod-queue-shortcuts 2017-04-25 16:10:23 -05:00
gaba 33d71df049 Recover the scroll. 2017-04-25 15:52:52 -05:00
David ErwinandGitHub d4c4b5a3e9 Merge branch 'master' into fix-view-more 2017-04-25 15:26:20 -04:00
Riley Davis b88cbe30de have all the comments show up in All Queue with proper statuses 2017-04-25 13:23:39 -06:00
Belen Curcio 9c448d5143 View More working with asset_id 2017-04-25 16:17:10 -03:00
Chi Vinh Le cb5228a423 Document getSlotFragments 2017-04-26 01:58:07 +07:00
Kim GardnerandGitHub 4f70a24a32 Merge branch 'master' into subscriptions 2017-04-25 14:54:07 -04:00
riley ad4386b235 Merge branch 'all-comments-queue' into comment-status-display 2017-04-25 12:51:20 -06:00
Riley Davis a94e6a0ada have default...just in case 2017-04-25 12:40:28 -06:00
Riley Davis 89f0663723 shortcuts list should be accessible from the cog 2017-04-25 12:38:00 -06:00
Chi Vinh Le eb9846ba40 Merge branch 'master' into query-composition
Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-embed-stream/src/Stream.js
2017-04-26 01:22:14 +07:00
Chi Vinh Le 9d7524644c Merge branch 'master' into query-composition 2017-04-26 01:11:07 +07:00
Chi Vinh Le f142f3a27f Introduce separateDataAndRoot 2017-04-26 01:10:16 +07:00
Chi Vinh Le df2c33ac35 Introduce getDefinitionName 2017-04-26 01:07:07 +07:00
Riley Davis 5666c4ac90 condense some var definitions 2017-04-25 11:57:36 -06:00
Riley DavisandGitHub 37ac5157dd Merge branch 'master' into comment-status-display 2017-04-25 11:45:27 -06:00
Chi Vinh Le f79af56468 Better API for slot fragments 2017-04-26 00:44:02 +07:00
Belén CurcioandGitHub a4b9f86e29 Merge branch 'master' into shortcut-hint 2017-04-25 14:38:47 -03:00
Riley Davis cee1c5bc1c have active state on action buttons depending on comment status 2017-04-25 11:21:28 -06:00
Chi Vinh Le 15d410ba12 Workaround weird Apollo bug 2017-04-25 23:20:23 +07:00
Chi Vinh Le 54ea71bedf Support fragments in plugins 2017-04-25 18:24:25 +07:00
riley 19a83a902a Merge branch 'master' into all-comments-queue 2017-04-24 15:15:10 -06:00
Belén CurcioandGitHub 7d56404e84 Merge branch 'master' into subscriptions 2017-04-24 18:09:34 -03:00
Riley Davis 801ce13960 my fix did not work. 2017-04-24 14:19:01 -06:00
Riley Davis b71b7cc883 move the shortcuts note logic into redux state 2017-04-24 14:04:57 -06:00