 Kim Gardner
|
6a46fb822d
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 13:56:15 -04:00 |
|
|
David Erwin
|
e96c5bbc8f
|
Merge pull request #542 from coralproject/optimise-initial-query
Only query once during initial render
|
2017-04-27 13:53:56 -04:00 |
|
|
David Erwin
|
06378209a2
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 13:49:12 -04:00 |
|
|
riley
|
f6cede3fda
|
add accepted to propTypes
|
2017-04-27 11:23:27 -06:00 |
|
|
riley
|
d5b800f590
|
add accepted rejected aciton buttons
|
2017-04-27 11:17:53 -06:00 |
|
|
Riley Davis
|
8cade04431
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 11:07:43 -06:00 |
|
|
David Erwin
|
efda925efc
|
Merge pull request #546 from coralproject/sub-fix
Moved subscription dep to devDeps
|
2017-04-27 12:53:04 -04:00 |
|
|
Wyatt Johnson
|
ec915208e5
|
Moved dep to devDeps
|
2017-04-27 10:48:03 -06:00 |
|
|
Kim Gardner
|
af80c4d8ad
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 11:59:30 -04:00 |
|
|
Kim Gardner
|
d0090283c0
|
Merge pull request #535 from coralproject/report-popup-fix
position the reporting popup in a more reliable way
|
2017-04-27 11:58:43 -04:00 |
|
|
Chi Vinh Le
|
8c53bc2d22
|
Postpone first query until checked login
|
2017-04-27 22:55:36 +07:00 |
|
|
Kim Gardner
|
f47bd269e5
|
Merge branch 'master' into report-popup-fix
|
2017-04-27 11:48:17 -04:00 |
|
|
Kim Gardner
|
7a99c9358a
|
Merge pull request #533 from coralproject/143530761-remove-loading-when-searching
Only shows the Loading component when there is no search value
|
2017-04-27 11:47:50 -04:00 |
|
|
Riley Davis
|
6330d69649
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 09:42:28 -06:00 |
|
|
Kim Gardner
|
6e98d176e7
|
Merge branch 'master' into 143530761-remove-loading-when-searching
|
2017-04-27 11:41:51 -04:00 |
|
|
Kim Gardner
|
7b84b3daf1
|
Merge pull request #537 from coralproject/profanity-verbiage
update bad username copy
|
2017-04-27 11:41:24 -04:00 |
|
|
Riley Davis
|
40b7669ed8
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 09:40:30 -06:00 |
|
|
Kim Gardner
|
3bb994c562
|
Merge branch 'master' into profanity-verbiage
|
2017-04-27 11:35:47 -04:00 |
|
|
Riley Davis
|
ea8e469c1c
|
Merge branch 'master' into report-popup-fix
|
2017-04-27 09:28:00 -06:00 |
|
|
David Erwin
|
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 Erwin
|
64eb16c3d6
|
Merge pull request #519 from coralproject/more-fragment-matcher
more matching on the fragment
|
2017-04-27 10:17:58 -04:00 |
|
|
David Erwin
|
6972b87b0b
|
Merge branch 'master' into more-fragment-matcher
|
2017-04-27 10:10:19 -04:00 |
|
|
Belén Curcio
|
8c320d09da
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 11:04:11 -03:00 |
|
|
David Erwin
|
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 |
|
|
Chi Vinh Le
|
20b4c4e2d0
|
Only query once during initial render
|
2017-04-27 17:30:43 +07:00 |
|
|
David Erwin
|
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 Erwin
|
5eb26946cb
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 17:21:34 -04:00 |
|
|
David Erwin
|
81680442f0
|
Merge branch 'master' into shortcuts-in-cog
|
2017-04-26 17:20:37 -04:00 |
|
|
David Erwin
|
c86f9877f3
|
Merge pull request #534 from coralproject/143202319-mod-queue-shortcuts
Recover the scroll.
|
2017-04-26 17:20:17 -04:00 |
|
|
David Erwin
|
1b3868edec
|
Merge branch 'master' into 143202319-mod-queue-shortcuts
|
2017-04-26 17:13:46 -04:00 |
|
|
David Erwin
|
4936003f5f
|
Merge pull request #536 from coralproject/fix-case
make Comment comment
|
2017-04-26 17:13:28 -04:00 |
|
|
David Erwin
|
5c4696ed61
|
Merge branch 'master' into fix-case
|
2017-04-26 17:08:56 -04:00 |
|
|
David Erwin
|
bf898fbaec
|
Merge pull request #460 from coralproject/subscriptions
Subscriptions
|
2017-04-26 17:05:58 -04:00 |
|
|
David Erwin
|
41065ba24a
|
Merge branch 'master' into subscriptions
|
2017-04-26 17:01:27 -04:00 |
|
|
David Erwin
|
0e77c93ae5
|
Merge pull request #521 from coralproject/user-metadata
Added user metadata
|
2017-04-26 17:01:15 -04:00 |
|
|
David Erwin
|
2756b794ee
|
Merge branch 'master' into more-fragment-matcher
|
2017-04-26 16:57:37 -04:00 |
|
|
David Erwin
|
626f5cd1e1
|
Merge branch 'master' into user-metadata
|
2017-04-26 16:56:50 -04:00 |
|
|
David Erwin
|
077daeb793
|
Merge branch 'master' into subscriptions
|
2017-04-26 16:55:32 -04:00 |
|
|
Riley Davis
|
fc567e8a92
|
Merge branch 'master' into shortcuts-in-cog
|
2017-04-26 13:34:13 -06:00 |
|
|
gaba
|
60d2735fa5
|
Remove isfetching all together.
|
2017-04-26 14:26:22 -05:00 |
|
|
gaba
|
6f58754617
|
Removing the Loading all together.
|
2017-04-26 14:26:21 -05:00 |
|
|
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 |
|
|
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 |
|