 Gabriela Rodríguez Berón
|
e935fff8ac
|
Merge branch 'master' into 143530761-remove-loading-when-searching
|
2017-04-26 12:52:30 -05:00 |
|
|
Gabriela Rodríguez Berón
|
3ad8d9ffec
|
Merge branch 'master' into 143202319-mod-queue-shortcuts
|
2017-04-26 12:51:30 -05:00 |
|
|
Riley Davis
|
0df40c7e35
|
make the popup not full width like before
|
2017-04-26 11:50:17 -06:00 |
|
|
Riley Davis
|
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 |
|
|
Benjamin Goering
|
84016e362d
|
Delete Comment UI
|
2017-04-26 12:37:33 -05:00 |
|
|
David Erwin
|
e20b6e1b25
|
Merge branch 'master' into fix-case
|
2017-04-26 13:19:50 -04:00 |
|
|
Riley Davis
|
4ff37d9063
|
Merge branch 'master' into approved-comments-queue
|
2017-04-26 11:01:41 -06:00 |
|
|
David Erwin
|
c02890af00
|
Merge pull request #526 from coralproject/query-composition
Query composition
|
2017-04-26 12:58:51 -04:00 |
|
|
Benjamin Goering
|
add7bfc170
|
Remove commented out css from TopRightMenu.css
|
2017-04-26 10:33:24 -05:00 |
|
|
Riley Davis
|
cea0b4942a
|
prevent text overflow
|
2017-04-26 09:32:00 -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 |
|
|
Kiwi
|
b20d8c18a3
|
Merge branch 'master' into report-popup-fix
|
2017-04-26 21:22:23 +07:00 |
|
|
David Erwin
|
85674b3ef5
|
Merge branch 'master' into query-composition
|
2017-04-26 10:09:14 -04:00 |
|
|
David Erwin
|
80f695e23d
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 09:53:19 -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 |
|
|
riley
|
0807663965
|
add z-index to popup
|
2017-04-25 16:31:33 -06:00 |
|
|
riley
|
f296fe2abd
|
update bad username copy
|
2017-04-25 16:22:31 -06:00 |
|
|
Kim Gardner
|
2654e3d452
|
Merge branch 'master' into user-metadata
|
2017-04-25 18:21:45 -04:00 |
|
|
Kim Gardner
|
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 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 |
|
|
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 |
|
|
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
|
bd91f898f5
|
Merge branch 'master' into FE_Plugin_DOCS
|
2017-04-25 14:54:29 -04:00 |
|
|
Kim Gardner
|
4f70a24a32
|
Merge branch 'master' into subscriptions
|
2017-04-25 14:54:07 -04:00 |
|
|
Kim Gardner
|
62835acc76
|
Merge branch 'master' into user-metadata
|
2017-04-25 14:53:30 -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 |
|
|
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 |
|