Commit graph

  • 457290e81e Replace /api/externalprofile/show.json with a MastoAPI equialent rinpatch 2019-09-03 19:59:28 +0300
  • 49159e6db3 Merge branch 'mastoapi-follow-reqs' into 'develop' HJ 2019-09-03 10:58:17 +0000
  • 8e3d6f5c28 Use mastodon api in follow requests rinpatch 2019-09-03 13:38:52 +0300
  • 6238fe3633 Merge branch '652' into 'develop' Shpuld Shpludson 2019-09-03 04:48:24 +0000
  • c43a5ab992 Merge branch 'patch-1' into 'develop' Shpuld Shpludson 2019-09-03 04:11:16 +0000
  • fbfedf0084 Merge branch 'fix/attachment-css' into 'develop' Shpuld Shpludson 2019-09-03 04:09:56 +0000
  • 66e9f17c58 "Optional" in lowercase. Echedey López Romero 2019-09-02 11:41:30 +0000
  • 4f82ea0fea Update es.json Echedey López Romero 2019-09-01 21:57:07 +0000
  • daf7d4e661 fix pin/unpin status logic taehoon 2019-08-30 15:57:24 -0400
  • 13b80b5c7c rename a mutation taehoon 2019-08-30 15:55:28 -0400
  • 9825a857f3 Merge branch 'docs' into 'develop' HJ 2019-08-31 19:44:44 +0000
  • 9e3891de61 Merge remote-tracking branch 'upstream/docs' into docs Henry Jameson 2019-08-31 22:39:56 +0300
  • 2dfba76772 update Henry Jameson 2019-08-31 22:39:26 +0300
  • 18ec13d796 Merge remote-tracking branch 'upstream/develop' into docs Henry Jameson 2019-08-31 22:38:02 +0300
  • 018a650166 Merge branch 'remove-dead-code' into 'develop' Shpuld Shpludson 2019-08-29 17:16:57 +0000
  • 814ba88f1c Merge branch 'fix-user-avatar-fallback' into 'develop' Shpuld Shpludson 2019-08-29 17:10:18 +0000
  • 9476fbba5a fix user avatar fallback logic taehoon 2019-08-28 14:02:04 -0400
  • c01d2543d5 remove dead code taehoon 2019-08-26 15:47:29 -0400
  • a15810afc8 Corrected "Media Proxy" translation. Echedey López Romero 2019-08-27 19:07:07 +0000
  • 50bf9e633b Update es.json Echedey López Romero 2019-08-26 21:37:39 +0000
  • 8c465719cc Merge branch '650' into 'develop' HJ 2019-08-26 21:18:11 +0000
  • e1c2c5cfed make bio textarea resizable vertically only taehoon 2019-08-26 16:00:19 -0400
  • 8e33934e50 Merge branch 'remove-dead-code' into 'develop' HJ 2019-08-26 18:34:56 +0000
  • a0712270aa remove dead code taehoon 2019-08-26 14:29:40 -0400
  • 15c4088a68 Make image orientation consistent on FF, fix videos w/ modal Shpuld Shpuldson 2019-08-26 14:08:30 +0300
  • 7b5cdab7cd remove dead code taehoon 2019-08-25 16:58:13 -0400
  • 0e21c3cdd9 Merge branch '646' into 'develop' Shpuld Shpludson 2019-08-25 20:03:06 +0000
  • 9b8bf655e1 fix crazy watch logic in conversation taehoon 2019-08-23 13:49:39 -0400
  • d7647be812 Merge branch '645' into 'develop' Shpuld Shpludson 2019-08-21 04:56:38 +0000
  • 65579796ed show three dot button only if needed taehoon 2019-08-20 17:00:28 -0400
  • 92a0c475f7 hide mute conversation button to guests taehoon 2019-08-20 16:55:42 -0400
  • 6504d8ca0f Merge branch '640' into 'develop' Shpuld Shpludson 2019-08-18 08:24:56 +0000
  • 4bedbfea3c update keyBy taehoon 2019-08-17 22:10:01 -0400
  • 1146119d6a generate idObj at timeline level taehoon 2019-08-15 13:16:55 -0400
  • 4b444708f2 fix pin showing logic in conversation taehoon 2019-08-15 13:07:07 -0400
  • 61f61947ad Merge branch 'feature/noscript-message' into 'develop' Shpuld Shpludson 2019-08-17 08:26:00 +0000
  • 6795769b93 Show a message when JS is disabled Sergey Suprunenko 2019-08-17 08:26:00 +0000
  • 7f35489e3e Merge branch 'fix/chat-issues' into 'develop' Shpuld Shpludson 2019-08-17 08:18:42 +0000
  • d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before Sergey Suprunenko 2019-08-17 08:18:42 +0000
  • 58713e342d Merge branch 'eu-translate' into 'develop' Shpuld Shpludson 2019-08-17 08:16:45 +0000
  • 84c3403143 Merge branch 'es-translate' into 'develop' Shpuld Shpludson 2019-08-17 08:15:06 +0000
  • aef97bc9bc Merge branch 'update-nb' into 'develop' Shpuld Shpludson 2019-08-17 08:14:47 +0000
  • 71eccabbe0 Merge branch 'i18n/update-japanese' into 'develop' Shpuld Shpludson 2019-08-17 08:14:18 +0000
  • 091fb5573c i18n/Update Japanese Hakaba Hitoyo 2019-08-17 08:14:17 +0000
  • 271cf18f3c Merge branch 'i18n/update-pedantic-japanese' into 'develop' Shpuld Shpludson 2019-08-17 08:14:00 +0000
  • fc68c3907d i18n/Update pedantic Japanese Hakaba Hitoyo 2019-08-17 08:14:00 +0000
  • e8fad7a460 Merge branch 'telugu-translation' into 'develop' Shpuld Shpludson 2019-08-17 08:13:29 +0000
  • e5fe4f420c Merge branch '564' into 'develop' Shpuld Shpludson 2019-08-17 08:12:21 +0000
  • 7dfcabb543 sync profile tab state with location query taehoon 2019-08-10 14:49:37 -0400
  • e8c22fbfa3 refactor TabSwitcher taehoon 2019-08-10 14:48:05 -0400
  • 6e51774ccb use better name of controlled prop taehoon 2019-08-10 00:26:29 -0400
  • eafd53f994 fix potential bug to render active tab in controlled way taehoon 2019-08-10 00:25:09 -0400
  • 9dd9ba0205 remove unused param taehoon 2019-08-09 23:48:33 -0400
  • df3e80b7c3 use key prop instead of dataset to identify active tab taehoon 2019-08-09 23:48:08 -0400
  • cd14566a34 remove useless index param of onSwitch taehoon 2019-08-09 23:28:46 -0400
  • 539913673f reset error state when load new profile taehoon 2019-08-09 16:50:49 -0400
  • 2e0603bdca clear timelines only if load user not viewed previously taehoon 2019-08-09 16:47:11 -0400
  • 9f6be4fe65 Merge branch 'fix/fix-link-to-external-users-in-who-to-follow-page' into 'develop' HJ 2019-08-15 17:19:49 +0000
  • dd340bb9e3 Fix/Fix links to external users in Who to follow page Hakaba Hitoyo 2019-08-15 17:19:49 +0000
  • 877a71fa41 Merge branch '293' into 'develop' Shpuld Shpludson 2019-08-14 05:24:19 +0000
  • 0ea1f6f582 Merge branch 'fix-chrome-logo' into 'develop' Shpuld Shpludson 2019-08-14 05:23:44 +0000
  • aeae25b74e revives autoprefixer which went AWOL during Webpack v1 -> v4 migration Henry Jameson 2019-08-14 01:18:07 +0300
  • 9229f28edb rel also accepts list, update rel detection logic taehoon 2019-08-13 13:11:37 -0400
  • 5aa2c44487 use hashtag class detection as fallback taehoon 2019-08-12 15:22:39 -0400
  • 5e99bad417 detect hashtag using rel instead of class taehoon 2019-08-08 14:31:32 -0400
  • 58b9b6c0a2 Merge branch '638' into 'develop' Shpuld Shpludson 2019-08-12 18:42:58 +0000
  • 0bce615fe8 hide ISP if the panel content is empty taehoon 2019-08-12 14:29:11 -0400
  • 07086ec9ae Merge branch '637' into 'develop' HJ 2019-08-12 18:04:52 +0000
  • a71d14704f fix user card overflow bug taehoon 2019-08-12 13:59:39 -0400
  • 5851f97eb0 fixed a lot of bugs with emoji picker, improved relevant components Henry Jameson 2019-08-12 20:01:38 +0300
  • 579b5c9e77 initial attempts at making emoji-picker somewhat extensible Henry Jameson 2019-08-12 14:20:08 +0300
  • 036882d27c rename for consistency Henry Jameson 2019-08-12 13:18:37 +0300
  • f1bdbeabf0 fix js error on mute shpuld 2019-08-10 15:53:46 +0300
  • 5e0b4e06ec
    i18n: Translated to Telugu (44.3%) Joseph Nuthalpati 2019-08-10 16:50:59 +0530
  • 7e2d48a26e Merge branch 'fix/incorrect-follow-request-status' into 'develop' HJ 2019-08-09 12:57:05 +0000
  • 114b5f6eff Apply suggestion to src/services/follow_manipulate/follow_manipulate.js rinpatch 2019-08-09 12:26:58 +0000
  • 5f3ac6625f Apply suggestion to src/services/follow_manipulate/follow_manipulate.js rinpatch 2019-08-09 12:25:58 +0000
  • e83b321ff2 Apply suggestion to src/services/follow_manipulate/follow_manipulate.js rinpatch 2019-08-09 12:01:57 +0000
  • 766bcc2a72 Fix sent follow request detection rinpatch 2019-08-09 14:18:46 +0300
  • 59f2931361 Merge branch 'fix/text-dont-media-viewer' into 'develop' HJ 2019-08-09 08:31:02 +0000
  • 3e7f0ecf9b fix english settings label regarding how to view videos matrixsasuke 2019-08-09 08:03:21 +0200
  • d4c366a123 fix extra buttons merge bug shpuld 2019-08-08 21:24:40 +0300
  • a45f258a2c Merge branch '632' into 'develop' Shpuld Shpludson 2019-08-08 10:12:46 +0000
  • acb788d575 Merge branch '631' into 'develop' Shpuld Shpludson 2019-08-08 10:10:58 +0000
  • 74cf601094 Merge branch '627' into 'develop' Shpuld Shpludson 2019-08-08 10:10:23 +0000
  • 92380652fe Merge branch 'feat/conversation-muting' into 'develop' Shpuld Shpludson 2019-08-08 10:09:07 +0000
  • b9fd3bebc5
    Update norwegian bokmål translation morguldir 2019-08-06 06:20:26 +0200
  • 4d54c67daa make size of gif image and preview equal taehoon 2019-08-06 22:41:27 -0400
  • 32b4d4d223 css improvements taehoon 2019-07-31 13:19:05 -0400
  • a13c945143 do not unmount post status modal in desktop taehoon 2019-07-31 13:18:47 -0400
  • bb9cee84a3 hide rich media preview image in case of broken image taehoon 2019-08-04 14:15:43 -0400
  • 17dc7357d5 Merge branch 'issue-617' into 'develop' HJ 2019-08-06 18:03:32 +0000
  • 4fc27414d2 Handle JSONified errors while registering Lee Starnes 2019-08-06 18:03:31 +0000
  • c0e8d1a809 Corrections and semantics changes for Spanish translation tarteka 2019-08-05 15:23:39 +0200
  • 39106dc545 Update oc.json Exilat 2019-08-03 14:04:49 +0000
  • 920bd05081 Update for Interactions, new search, sticker picker, update copy. Exilat 2019-08-03 13:55:05 +0000
  • 5f6456703c add Basque translate tarteka 2019-08-01 18:21:32 +0200
  • 5d70ada203 Apply suggestion to docs/HACKING.md HJ 2019-08-01 15:51:15 +0000
  • 0e6489d840 Merge branch 'patch-2' into 'develop' Shpuld Shpludson 2019-07-31 17:46:40 +0000
  • f031e96334 Merge branch '618' into 'develop' Shpuld Shpludson 2019-07-31 17:46:24 +0000