Commit graph

  • 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
  • f4b9efff77 Merge branch 'focus-on-search-input' into 'develop' Shpuld Shpludson 2019-07-31 17:39:35 +0000
  • 254648991d Focus on the search input when the search icon is clicked Eugenij 2019-07-31 17:39:35 +0000
  • 3f4cb1d58e Merge branch '626' into 'develop' Shpuld Shpludson 2019-07-31 17:39:26 +0000
  • af75791f1b prevent scrolling top when click search input taehoon 2019-07-31 12:20:05 -0400
  • be7a508d89 add zoom-in indication to avatar taehoon 2019-07-25 15:49:02 -0400
  • 1e613ae9b3 add zoom-in icon taehoon 2019-07-25 15:48:44 -0400
  • b2bd128f05 allow zooming avatar in profile panel header taehoon 2019-07-25 15:14:44 -0400
  • 5881d92eb7 use $route instead of $router.currentRoute taehoon 2019-07-23 15:04:28 -0400
  • 7c2982064e enlarge avatar in profile page taehoon 2019-07-22 16:58:20 -0400
  • fd66afe1e5 linting Henry Jameson 2019-07-29 00:10:43 +0300
  • 8aa3e7d52e Merge branch '549' into 'develop' HJ 2019-07-28 21:05:22 +0000
  • 18a41e785e update unit test taehoon 2019-07-28 16:55:34 -0400
  • 03c2f29b0a cleanup and appropriation for new emoji-input component API, styles updates Henry Jameson 2019-07-28 16:07:01 +0300
  • 4c78fdb393 rename emoji-selector to emoji-picker Henry Jameson 2019-07-28 13:56:08 +0300
  • 259e8c52ee post-merge fix Henry Jameson 2019-07-28 13:33:05 +0300
  • b3aff9bbae Merge remote-tracking branch 'upstream/develop' into emoji-selector-update Henry Jameson 2019-07-28 13:30:29 +0300
  • d3f6b581d1 Merge branch 'develop' into 'feat/conversation-muting' Shpuld Shpludson 2019-07-26 12:44:32 +0000
  • d785ed5a05 rewrite unit tests taehoon 2019-07-25 23:34:56 -0400
  • a443a5203e add more unit tests for elimination logic taehoon 2019-07-25 14:17:48 -0400
  • 65ef039316 add unit test for elimination logic taehoon 2019-07-25 08:03:41 -0400
  • 53c9517a4a use array.includes instead of array.indexOf taehoon 2019-07-24 22:42:06 -0400
  • 0f8ace4836 update status eliminating logic taehoon 2019-07-20 16:54:30 -0400
  • 876c6de806 fix typos taehoon 2019-07-19 22:49:29 -0400
  • dca384f123 update prop syntax taehoon 2019-07-19 22:47:40 -0400
  • d7dc070667 put two loops in one parent taehoon 2019-07-19 22:46:11 -0400
  • ae829e8df1 move pinned statuses showing logic in timeline taehoon 2019-07-19 22:40:37 -0400
  • 4826d72549 update prop name taehoon 2019-07-19 21:48:09 -0400
  • 7f9feacd26 prevent showing pinned statuses twice taehoon 2019-05-26 14:15:35 -0400
  • 6380f7df16 Update es.json (add sticker) tarteka 2019-07-24 22:06:45 +0000
  • 4827e4d972 Merge branch 'feature/add-sticker-picker' into 'develop' HJ 2019-07-24 19:35:52 +0000
  • fa6210872f Feature/add sticker picker absturztaube 2019-07-24 19:35:52 +0000
  • 28f777cb8a Merge branch '587' into 'develop' Shpuld Shpludson 2019-07-24 16:17:06 +0000
  • 8375d7a3aa guard more secure routes taehoon 2019-07-23 21:52:24 -0400
  • ad29e20324 guard secure routes by redirecting to root taehoon 2019-07-23 20:54:15 -0400
  • 1f8f2e26e3 Merge branch 'patch-2' into 'develop' Shpuld Shpludson 2019-07-24 13:32:57 +0000
  • c2cef3055d Merge branch '592' into 'develop' Shpuld Shpludson 2019-07-24 13:23:04 +0000
  • 1cefaa8446 closest can returns itself as well taehoon 2019-07-23 20:59:37 -0400
  • 17ad5bbdf9 find inside status-content div only taehoon 2019-07-23 15:44:41 -0400
  • 09efcb48a4 try to use the closest a tag as target taehoon 2019-07-23 15:43:03 -0400
  • 51fc0a5c52 Update es.json tarteka 2019-07-23 15:16:03 +0000
  • e448950023 Merge branch 'fix/keyword-filter' into 'develop' kaniini 2019-07-22 20:06:57 +0000
  • fb9f254f8d Also apply keyword filter to subjects Toromino 2019-07-20 19:06:54 +0200
  • 9c2c00992d Remove files I accidentally pushed in shpuld 2019-07-18 17:25:06 +0300
  • 619608ea7a fix issues caused by merges in usersearch on @ shpuld 2019-07-18 17:22:51 +0300
  • 029dc7405e Merge branch 'add-user-search-at' into 'develop' Shpuld Shpludson 2019-07-18 03:40:02 +0000
  • 5909baba7c Add user search at Wyatt Benno 2019-07-18 03:40:02 +0000
  • cc2e35f499 Merge branch '609' into 'develop' HJ 2019-07-16 20:49:49 +0000
  • 051b3b5141 fix eslint warnings taehoon 2019-07-11 11:50:56 -0400
  • d35a16b4bd remove vue-popperjs taehoon 2019-07-11 11:50:41 -0400
  • e3ac71968b fix moderation menu partially hidden by usercard boundary taehoon 2019-07-11 11:49:18 -0400
  • c4789a348f migrate popper css taehoon 2019-07-11 11:01:12 -0400
  • 4f74392641 rewrite ModerationTools using v-tooltip taehoon 2019-07-11 08:33:10 -0400
  • b9c547828e make popover position for status action dropdow relative to parent node taehoon 2019-07-11 08:32:57 -0400
  • 005815c825 rewrite ExtraButtons using v-tooltip taehoon 2019-07-11 08:31:02 -0400
  • 1727c815f8 install v-tooltip taehoon 2019-07-11 08:30:35 -0400
  • f734a72116 Merge branch 'fix/respect-hide-post-stats' into 'develop' HJ 2019-07-15 21:47:45 +0000
  • e86f6edb7c Merge branch 'patch-2' into 'develop' Shpuld Shpludson 2019-07-15 19:21:37 +0000
  • bfc6f7b3ec Merge branch 'revert-0a7c60c3' into 'develop' Shpuld Shpludson 2019-07-15 19:21:01 +0000
  • c649e202b3 Merge branch 'i18n/update-pedantic-japanese-traslation' into 'develop' Shpuld Shpludson 2019-07-15 19:18:40 +0000
  • 54b45ec4a3 i18n/Update pedantic Japanese translation Hakaba Hitoyo 2019-07-15 19:18:40 +0000
  • 34ca0d369f Merge branch 'i18n/update-japanese-trasnlation' into 'develop' Shpuld Shpludson 2019-07-15 19:18:20 +0000
  • f665ac83e7 i18n/Update easy Japanese trasnlation Hakaba Hitoyo 2019-07-15 19:18:20 +0000
  • 3370dd80dc Merge branch 'develop' into 'feat/conversation-muting' Shpuld Shpludson 2019-07-15 19:09:01 +0000
  • e9b452575b Merge branch 'new-search' into 'develop' Shpuld Shpludson 2019-07-15 16:42:27 +0000
  • 69a4bcb238 New search Eugenij 2019-07-15 16:42:27 +0000
  • 0c06410584 Merge branch '482-subscribe-user' into 'develop' HJ 2019-07-15 06:50:31 +0000
  • ff90d864cc fix wrong eslint comments taehoon 2019-07-12 15:11:54 -0400
  • 78594f61d4 add a todo comment taehoon 2019-07-12 15:10:30 -0400
  • 57c5d269b8 add bell-ringing icon taehoon 2019-07-11 12:52:05 -0400
  • b2dbf01a72 eslint —fix taehoon 2019-07-10 20:59:10 -0400
  • 9712e324e5 hide subscribe button unless following taehoon 2019-05-20 11:36:44 -0400
  • 81d1d30586 revert font change taehoon 2019-05-19 14:34:51 -0400
  • 1237d0d2b8 use normal bell for unsubscribed state taehoon 2019-05-19 14:33:25 -0400
  • 4f26299bd5 update copy taehoon 2019-05-19 09:21:48 -0400
  • 0f4cccd115 improve ui taehoon 2019-05-04 13:23:57 -0400