Commit Graph
3559 Commits
Author SHA1 Message Date
Riley DavisandGitHub 6330d69649 Merge branch 'master' into approved-comments-queue 2017-04-27 09:42:28 -06:00
Kim GardnerandGitHub 7b84b3daf1 Merge pull request #537 from coralproject/profanity-verbiage
update bad username copy
2017-04-27 11:41:24 -04: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 6e3159c7e1 Merge pull request #545 from coralproject/docker-fix
Fixed Dockerfile for regression with yarn
2017-04-27 10:34:26 -04:00
Wyatt Johnson 5559940967 Fixed dockerfile temp, updated yarn.lock 2017-04-27 08:29:16 -06:00
David ErwinandGitHub 64eb16c3d6 Merge pull request #519 from coralproject/more-fragment-matcher
more matching on the fragment
2017-04-27 10:17:58 -04:00
David ErwinandGitHub 6972b87b0b Merge branch 'master' into more-fragment-matcher 2017-04-27 10:10:19 -04:00
David ErwinandGitHub 279ff0655f Merge pull request #544 from coralproject/login-ios-safari
More reliable login support including IOS browsers
2017-04-27 10:03:29 -04:00
Chi Vinh Le 794cc0fc6c Support login on all IOS browsers 2017-04-27 19:28:54 +07:00
David ErwinandGitHub bb532b5eb2 Merge pull request #531 from coralproject/shortcuts-in-cog
shortcuts list should be accessible from the cog
2017-04-26 17:41:04 -04: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 c86f9877f3 Merge pull request #534 from coralproject/143202319-mod-queue-shortcuts
Recover the scroll.
2017-04-26 17:20:17 -04:00
David ErwinandGitHub 1b3868edec Merge branch 'master' into 143202319-mod-queue-shortcuts 2017-04-26 17:13:46 -04:00
David ErwinandGitHub 4936003f5f Merge pull request #536 from coralproject/fix-case
make Comment comment
2017-04-26 17:13:28 -04:00
David ErwinandGitHub 5c4696ed61 Merge branch 'master' into fix-case 2017-04-26 17:08:56 -04:00
David ErwinandGitHub bf898fbaec Merge pull request #460 from coralproject/subscriptions
Subscriptions
2017-04-26 17:05:58 -04:00
David ErwinandGitHub 41065ba24a Merge branch 'master' into subscriptions 2017-04-26 17:01:27 -04:00
David ErwinandGitHub 0e77c93ae5 Merge pull request #521 from coralproject/user-metadata
Added user metadata
2017-04-26 17:01:15 -04:00
David ErwinandGitHub 2756b794ee Merge branch 'master' into more-fragment-matcher 2017-04-26 16:57:37 -04:00
David ErwinandGitHub 626f5cd1e1 Merge branch 'master' into user-metadata 2017-04-26 16:56:50 -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
David ErwinandGitHub c02890af00 Merge pull request #526 from coralproject/query-composition
Query composition
2017-04-26 12:58:51 -04: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
David ErwinandGitHub 80f695e23d Merge branch 'master' into profanity-verbiage 2017-04-26 09:53:19 -04:00
David ErwinandGitHub 8b4c2876c7 Merge pull request #538 from coralproject/ios-safari-full-width
Safari IOS ignores width=100% in iframes
v1.5.4
2017-04-26 09:44:01 -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 f296fe2abd update bad username copy 2017-04-25 16:22:31 -06:00
Kim GardnerandGitHub 2654e3d452 Merge branch 'master' into user-metadata 2017-04-25 18:21:45 -04:00
Kim GardnerandGitHub 2c2c2dc604 Merge pull request #502 from coralproject/all-comments-queue
All comments queue
2017-04-25 18:20:36 -04: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 7d0aac5d4a Merge pull request #532 from coralproject/fix-view-more
Fix: View More working with asset_id
v1.5.3
2017-04-25 16:01:38 -04: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