Commit Graph
660 Commits
Author SHA1 Message Date
Belén Curcio 72bdf5d40b Changes 2018-09-25 11:08:31 -03:00
Belén Curcio 661f392281 Adding the difss 2018-09-24 10:58:40 -03:00
Belén Curcio 2502dfedd2 Show profile tab if user is signed in 2018-09-24 10:54:45 -03:00
Belén Curcio 0cea633b0b Merge branch 'next' of github.com:coralproject/talk into next-profile
* 'next' of github.com:coralproject/talk:
  [next] Embed plus (#1877)
  [next] Permit (#1899)
  Use upstream @types/recompose
  [next] Limited threading (#1894)
  More clarifying comments
  Improve cross browser support
  Don't use css capitalize
  Upgrade RTE to fix a paste issue
  [next] Resubscribe local state (#1884)
  Styling fixes
  WIP
  Update snapshots
  Namespace ids
  Move styles to button
2018-09-24 10:30:20 -03:00
KiwiandGitHub 65156c0528 Merge pull request #1897 from coralproject/improve-cross-browser-support
[next] Improve cross browser support
2018-09-22 01:05:05 +02:00
KiwiandGitHub 30d0541c69 Merge branch 'next' into improve-cross-browser-support 2018-09-22 00:55:03 +02:00
KiwiandGitHub fa17582e93 Merge pull request #1900 from coralproject/update-types-recompose
[next] Use upstream @types/recompose
2018-09-22 00:54:51 +02:00
KiwiandGitHub 007e6f5e66 Merge branch 'next' into improve-cross-browser-support 2018-09-22 00:54:14 +02:00
Wyatt JohnsonandGitHub 6e8c0df9fe Merge branch 'next' into update-types-recompose 2018-09-21 22:44:05 +00:00
KiwiandWyatt Johnson 106a5d36ed [next] Embed plus (#1877)
* Implement StreamEmbed instance and rename library to coral

* Add article & articleButton.html, only show embed htmls in production

* Respect assetURL

* Add tests

* Add parseHashQuery

* Fix permalink query and integration tests

* Fix permalink URL

* Remove optionalparams from pym

* Scroll when showing permalink view

* Implement autoRender

* AutoRender immediately when render permalink

* Add test for `showPermalink` event

* Add comment
2018-09-21 22:43:28 +00:00
Wyatt JohnsonandGitHub 85af8d1bbf [next] Permit (#1899)
* feat: replaced custom auth extraction logic with permit

* fix: fixed tests
2018-09-21 22:06:46 +00:00
Chi Vinh Le a996c5da2b Use upstream @types/recompose 2018-09-21 19:02:27 +02:00
Wyatt JohnsonandGitHub 029f4641d0 Merge branch 'next' into improve-cross-browser-support 2018-09-21 15:58:33 +00:00
KiwiandWyatt Johnson 18e6638162 [next] Limited threading (#1894)
* Implement limited threading

* Adapt snapshots

* Test threading
2018-09-21 15:57:33 +00:00
KiwiandGitHub 7ae3e4886a Merge branch 'next' into improve-cross-browser-support 2018-09-20 22:54:59 +02:00
Chi Vinh Le 6df0568378 More clarifying comments 2018-09-20 22:53:34 +02:00
Chi Vinh Le 8efeb3106f Improve cross browser support 2018-09-20 22:10:06 +02:00
Belén Curcio f87b2b05ba Merge branch 'next-profile' of github.com:coralproject/talk into next-profile
* 'next-profile' of github.com:coralproject/talk:
  fix: linting
  fix: server fixes
2018-09-20 16:00:00 -03:00
KiwiandGitHub 8b1aec5f24 Merge pull request #1895 from coralproject/rte-upgrade
[next] Upgrade RTE to fix a paste issue
2018-09-20 18:35:55 +02:00
KiwiandGitHub 7e10f4a7bb Merge branch 'next' into rte-upgrade 2018-09-20 18:15:03 +02:00
KiwiandGitHub 2f1c4fb9a3 Merge pull request #1896 from coralproject/no-capitalize-css
[next] Don't use css capitalize
2018-09-20 18:14:51 +02:00
Chi Vinh Le 2a640d2bbc Don't use css capitalize 2018-09-20 17:23:26 +02:00
Chi Vinh Le 6c75298b8c Upgrade RTE to fix a paste issue 2018-09-20 17:06:31 +02:00
KiwiandWyatt Johnson dbd7f4f820 [next] Resubscribe local state (#1884)
* Resubscribe local state

* Don't pass context
2018-09-18 14:59:51 -06:00
KiwiandGitHub 4e9b00934d Merge pull request #1858 from coralproject/ui-tab
[next] Tabs Components - Tab, TabBar, TabPane, TabContent
2018-09-18 21:08:36 +02:00
Wyatt Johnson 8283932c29 fix: linting 2018-09-17 17:16:43 -06:00
Wyatt Johnson 9044fc2400 fix: server fixes 2018-09-17 17:16:10 -06:00
Chi Vinh Le 2af01e5f4b Styling fixes 2018-09-17 22:12:58 +02:00
Chi Vinh Le b00a7f9618 WIP 2018-09-17 21:12:27 +02:00
Chi Vinh Le 0983d31c10 Update snapshots 2018-09-17 21:01:20 +02:00
Chi Vinh Le 0b0aa7b1ee Namespace ids 2018-09-17 20:56:42 +02:00
Chi Vinh Le 3314bc3ba6 Move styles to button 2018-09-17 20:52:36 +02:00
Belén Curcio fa67da7183 Adding translations 2018-09-17 13:30:13 -03:00
Belén Curcio 5bf6161e46 Adding div as mapping, since div cannot be descendant of p 2018-09-17 11:04:47 -03:00
Belén Curcio 601436cf99 Updated snapshots 2018-09-14 17:56:32 -03:00
Belén Curcio cb2cfe1581 Adding View Conversation functionality and styling 2018-09-14 17:52:55 -03:00
Belén Curcio c199bede53 Merge branch 'next' of github.com:coralproject/talk into next-profile
* 'next' of github.com:coralproject/talk:
2018-09-14 13:11:05 -03:00
Kim GardnerandGitHub 1bd31285a6 Merge branch 'next' into ui-tab 2018-09-14 12:04:58 -04:00
Belén Curcio 52c8c8a625 Styling 2018-09-14 13:03:26 -03:00
Belén Curcio f391d7b7ad Working comment history, styling in progress 2018-09-14 12:37:25 -03:00
Belén Curcio ced45a914c Comment History Working 2018-09-14 12:05:19 -03:00
Belén Curcio 60d61d40b6 Comment History 2018-09-14 11:35:01 -03:00
KiwiandGitHub 4f9e1ba535 Merge pull request #1873 from coralproject/reorganize2
[next] Reorganize 2
2018-09-14 16:21:16 +02:00
KiwiandGitHub b044b0f225 Merge branch 'next' into reorganize2 2018-09-14 16:03:48 +02:00
Belén Curcio 935c2ff629 WIP 2018-09-14 10:43:40 -03:00
Belén Curcio 1009045c4c Working tabs 2018-09-14 10:13:42 -03:00
Belén Curcio 05296d4802 Adding tabs to the stream <3 2018-09-14 10:03:25 -03:00
Belén Curcio a30e3ce526 Merge branch 'next-edit' of github.com:coralproject/talk into next-profile
* 'next-edit' of github.com:coralproject/talk:
  Implement SetActiveTabMutation
  Change translation strings
  Add activeTab to local state
  Move files into tab structure
2018-09-14 09:56:14 -03:00
Belén Curcio 2969dad58b Merge branch 'next' of github.com:coralproject/talk into ui-tab
* 'next' of github.com:coralproject/talk:
  Adapt snapshot
  Fix lint
  Only show edit button for the author
  Use Message Component
  Adapt integration test
  Fix integration test
  Add edited marker
  fix: remove assetID from client queries to edit comment
  feat: merge metadata during edit
  fix: remove assetID from EditCommentInput
  Fix linting
  Add integration tests
  Add integration test
  More unit tests
  Fix lint and test
  Implement edit
2018-09-14 09:50:23 -03:00
Belén Curcio a68ca34d62 Merge branch 'next' of github.com:coralproject/talk into next-profile
* 'next' of github.com:coralproject/talk:
  Adapt snapshot
  Fix lint
  Only show edit button for the author
  Use Message Component
  Adapt integration test
  Fix integration test
  Add edited marker
  fix: remove assetID from client queries to edit comment
  feat: merge metadata during edit
  fix: remove assetID from EditCommentInput
  Fix linting
  Add integration tests
  Add integration test
  More unit tests
  Fix lint and test
  Implement edit
2018-09-14 09:49:07 -03:00