Commit Graph

4030 Commits

Author SHA1 Message Date
David Erwin 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 0807663965 add z-index to popup 2017-04-25 16:31:33 -06:00
riley aad66ec7e0 fix casing 2017-04-25 16:18:21 -06:00
Kim Gardner 94e429e431 Merge branch 'master' into all-comments-queue 2017-04-25 18:16:01 -04:00
Riley Davis 7db5e4d68b Merge branch 'master' into report-popup-fix 2017-04-25 16:14:56 -06:00
riley f3822d09b2 position the reporting popup in a more reliable way 2017-04-25 15:54:18 -06:00
gaba 9e41f0bd65 Merge branch 'master' into i18n-refactor 2017-04-25 16:10:45 -05:00
gaba 527cbc7d63 Recover the scroll. 2017-04-25 16:10:32 -05:00
Gabriela Rodríguez Berón 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
gaba 10cd53b40b Only shows the Loading component when there is no search value 2017-04-25 14:28:37 -05:00
David Erwin 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 Gardner 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 Davis 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 Curcio 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
gaba 0f7b4ddaf6 Removes timeago from i18n module. 2017-04-25 11:43:04 -05: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
gaba 59e23ffd60 Moves into YAML and own module. 2017-04-24 18:09:13 -05:00
riley 19a83a902a Merge branch 'master' into all-comments-queue 2017-04-24 15:15:10 -06:00
Belén Curcio 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
Riley Davis b2428371c7 enable character counting on replies 2017-04-24 13:09:41 -06:00
Riley Davis aaa5d17ca3 Merge branch 'master' into shortcut-hint 2017-04-24 12:34:44 -06:00
Kiwi 35938bbd38 Merge branch 'master' into quick-fix-permalinks 2017-04-25 01:10:12 +07:00
Chi Vinh Le ac2a636274 Quickfix permalinks 2017-04-25 01:04:26 +07:00
gaba 5aacdc3a74 Merge branch 'master' into i18n-refactor 2017-04-24 12:56:32 -05:00
Kim Gardner 860f434335 Merge branch 'master' into all-comments-queue 2017-04-24 13:45:02 -04:00
Kim Gardner 31c6e2f891 Merge branch 'master' into comment-box-mobilify 2017-04-24 13:44:31 -04:00
Riley Davis 76e2066a51 reply box is squished on long comments in Firefox 2017-04-24 11:12:39 -06:00
Chi Vinh Le 027358913d Use container 2017-04-24 23:35:49 +07:00
Chi Vinh Le a91db35f91 Add comments for filter 2017-04-24 23:34:53 +07:00
Riley Davis c60cfebde7 add some styles so mobile doesn't zoom the text box 2017-04-24 10:19:36 -06:00
Chi Vinh Le c261cdc0c6 Compose comment fragments 2017-04-24 22:49:52 +07:00