 David Erwin
|
077daeb793
|
Merge branch 'master' into subscriptions
|
2017-04-26 16:55:32 -04:00 |
|
|
David Erwin
|
c02890af00
|
Merge pull request #526 from coralproject/query-composition
Query composition
|
2017-04-26 12:58:51 -04:00 |
|
|
David Erwin
|
85674b3ef5
|
Merge branch 'master' into query-composition
|
2017-04-26 10:09:14 -04:00 |
|
|
David Erwin
|
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 |
|
|
Kim Gardner
|
2c2c2dc604
|
Merge pull request #502 from coralproject/all-comments-queue
All comments queue
|
2017-04-25 18:20:36 -04:00 |
|
|
Kim Gardner
|
94e429e431
|
Merge branch 'master' into all-comments-queue
|
2017-04-25 18:16:01 -04:00 |
|
|
David Erwin
|
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 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
|
67301e6e85
|
Merge branch 'comment-status-display' into all-comments-queue
|
2017-04-25 12:52:32 -06:00 |
|
|
riley
|
ad4386b235
|
Merge branch 'all-comments-queue' into comment-status-display
|
2017-04-25 12:51:20 -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 |
|
|
Riley Davis
|
5db9ea6520
|
Merge pull request #520 from coralproject/shortcut-hint
add a little keyboard shortcut hint widget
|
2017-04-25 11:44:18 -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 |
|
|
Chi Vinh Le
|
15d410ba12
|
Workaround weird Apollo bug
|
2017-04-25 23:20:23 +07:00 |
|
|
Chi Vinh Le
|
3a7b17750e
|
Use unique name for fragment
|
2017-04-25 23:00:11 +07:00 |
|
|
Chi Vinh Le
|
4bacc2b0c2
|
Update Apollo
|
2017-04-25 22:31:59 +07:00 |
|
|
Chi Vinh Le
|
3d10534da1
|
RespectPlugin use fat query
|
2017-04-25 19:54:54 +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 Curcio
|
7d56404e84
|
Merge branch 'master' into subscriptions
|
2017-04-24 18:09:34 -03:00 |
|
|
Kim Gardner
|
c74de328f2
|
Merge pull request #529 from coralproject/undo-mobile-fix-attempt
reset the button css fixes
v1.5.2
|
2017-04-24 16:38:39 -04: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 |
|
|
Kim Gardner
|
78ef98bc8c
|
Merge pull request #528 from coralproject/reply-char-count
enable character counting on replies
|
2017-04-24 15:52:35 -04:00 |
|
|
Riley Davis
|
b2428371c7
|
enable character counting on replies
|
2017-04-24 13:09:41 -06:00 |
|
|
Kim Gardner
|
bb4f660bb6
|
Merge pull request #527 from coralproject/quick-fix-permalinks
Quickfix permalinks
|
2017-04-24 14:40:13 -04:00 |
|
|
Riley Davis
|
aaa5d17ca3
|
Merge branch 'master' into shortcut-hint
|
2017-04-24 12:34:44 -06:00 |
|
|
Kim Gardner
|
f6938271f6
|
Merge branch 'master' into quick-fix-permalinks
|
2017-04-24 14:34:03 -04:00 |
|
|
Kim Gardner
|
54b5dcb244
|
Merge pull request #517 from coralproject/status-fix
Fixed bug with status changes in the graph
|
2017-04-24 14:33:37 -04: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 |
|
|
Kim Gardner
|
56e2f70ebb
|
Merge branch 'master' into status-fix
|
2017-04-24 13:52:39 -04:00 |
|
|
Kim Gardner
|
188db361ac
|
Merge pull request #524 from coralproject/comment-box-mobilify
add some styles so mobile doesn't zoom the text box
|
2017-04-24 13:48:45 -04: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 |
|
|
Kim Gardner
|
a8a32ef36f
|
Merge pull request #525 from coralproject/reply-length
reply box is squished on long comments in Firefox
|
2017-04-24 13:44:21 -04:00 |
|
|
Riley Davis
|
76e2066a51
|
reply box is squished on long comments in Firefox
|
2017-04-24 11:12:39 -06:00 |
|