Commit Graph

3472 Commits

Author SHA1 Message Date
HJ
9651293956 Apply suggestion to src/components/emoji_picker/emoji_picker.js 2019-09-09 19:42:33 +00:00
Henry Jameson
9146bee7aa better hitbox for status emoji 2019-09-08 21:18:52 +03:00
Henry Jameson
7360a4d9ef fix aspect 2019-09-08 17:11:45 +03:00
HJ
2237da0151 Apply suggestion to src/components/emoji_input/emoji_input.js 2019-09-08 14:08:39 +00:00
Henry Jameson
4f88bb4ea1 scale emoji on hover 2019-09-08 17:01:28 +03:00
Henry Jameson
83f45167b6 added emoji zoom for picker 2019-09-08 16:56:54 +03:00
Henry Jameson
94afc5ee19 fixed scroll when switching back to emoji 2019-09-08 15:57:49 +03:00
Henry Jameson
14df84d89b fixed some bugs, added spam mode, minor collateral fixes 2019-09-08 15:51:17 +03:00
Henry Jameson
db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (116 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
2019-09-08 13:44:29 +03:00
Shpuld Shpludson
e75ac9ddbc Merge branch 'mastoapi-externalprofile' into 'develop'
Replace `/api/externalprofile/show.json` with a MastoAPI equialent

See merge request pleroma/pleroma-fe!938
2019-09-06 04:13:21 +00:00
Shpuld Shpludson
702dc6963c Merge branch 'password-reset' into 'develop'
Password reset page

Closes #213

See merge request pleroma/pleroma-fe!884
2019-09-05 11:23:28 +00:00
Eugenij
8ee5abb1a5 Password reset page 2019-09-05 11:23:28 +00:00
HJ
c89703a359 Merge branch '655' into 'develop'
Fix "User avatar not updating immediately when switching user profile"

Closes #655

See merge request pleroma/pleroma-fe!940
2019-09-04 16:55:07 +00:00
taehoon
d194431642 add a comment 2019-09-04 11:24:24 -04:00
taehoon
cdbb8ca8b9 force img updating immediately 2019-09-04 11:24:24 -04:00
HJ
a1aada2454 Merge branch 'patch-2' into 'develop'
Fixed "sequimiento" to "seguimiento". Spanish translation.

See merge request pleroma/pleroma-fe!939
2019-09-03 21:16:11 +00:00
Echedey López Romero
d1244e4896 Fixed "sequimiento" to "seguimiento". 2019-09-03 17:51:50 +00:00
rinpatch
457290e81e Replace /api/externalprofile/show.json with a MastoAPI equialent
`/api/v1/accounts/:id` supports remote nicknames since pleroma!1622
2019-09-03 19:59:28 +03:00
HJ
49159e6db3 Merge branch 'mastoapi-follow-reqs' into 'develop'
Use mastodon api in follow requests

See merge request pleroma/pleroma-fe!937
2019-09-03 10:58:17 +00:00
rinpatch
8e3d6f5c28 Use mastodon api in follow requests 2019-09-03 13:50:26 +03:00
Shpuld Shpludson
6238fe3633 Merge branch '652' into 'develop'
Fix "TypeError: Cannot set property 'pinned' of undefined"

Closes #652

See merge request pleroma/pleroma-fe!936
2019-09-03 04:48:24 +00:00
Shpuld Shpludson
c43a5ab992 Merge branch 'patch-1' into 'develop'
Some corrections to the spanish translation

See merge request pleroma/pleroma-fe!929
2019-09-03 04:11:16 +00:00
Shpuld Shpludson
fbfedf0084 Merge branch 'fix/attachment-css' into 'develop'
Make image orientation consistent on FF, fix videos w/ modal

See merge request pleroma/pleroma-fe!926
2019-09-03 04:09:56 +00:00
Echedey López Romero
66e9f17c58 "Optional" in lowercase. 2019-09-02 11:41:30 +00:00
Echedey López Romero
4f82ea0fea Update es.json 2019-09-01 21:57:07 +00:00
taehoon
daf7d4e661 fix pin/unpin status logic 2019-09-01 13:07:43 -04:00
taehoon
13b80b5c7c rename a mutation 2019-09-01 13:07:43 -04:00
HJ
9825a857f3 Merge branch 'docs' into 'develop'
Documentation

See merge request pleroma/pleroma-fe!718
2019-08-31 19:44:44 +00:00
Henry Jameson
9e3891de61 Merge remote-tracking branch 'upstream/docs' into docs
* upstream/docs:
  Apply suggestion to docs/HACKING.md
  Apply suggestion to docs/CONFIGURATION.md
2019-08-31 22:39:56 +03:00
Henry Jameson
2dfba76772 update 2019-08-31 22:39:26 +03:00
Henry Jameson
18ec13d796 Merge remote-tracking branch 'upstream/develop' into docs
* upstream/develop: (193 commits)
  fix user avatar fallback logic
  remove dead code
  make bio textarea resizable vertically only
  remove dead code
  remove dead code
  fix crazy watch logic in conversation
  show three dot button only if needed
  hide mute conversation button to guests
  update keyBy
  generate idObj at timeline level
  fix pin showing logic in conversation
  Show a message when JS is disabled
  Initialize chat only if user is logged in and it wasn't initialized before
  i18n/Update Japanese
  i18n/Update pedantic Japanese
  sync profile tab state with location query
  refactor TabSwitcher
  use better name of controlled prop
  fix potential bug to render active tab in controlled way
  remove unused param
  ...
2019-08-31 22:38:02 +03:00
Shpuld Shpludson
018a650166 Merge branch 'remove-dead-code' into 'develop'
Remove dead code

See merge request pleroma/pleroma-fe!927
2019-08-29 17:16:57 +00:00
Shpuld Shpludson
814ba88f1c Merge branch 'fix-user-avatar-fallback' into 'develop'
Fix broken user avatar fallback logic

See merge request pleroma/pleroma-fe!933
2019-08-29 17:10:18 +00:00
taehoon
9476fbba5a fix user avatar fallback logic 2019-08-28 14:02:04 -04:00
taehoon
c01d2543d5 remove dead code 2019-08-28 13:06:57 -04:00
Echedey López Romero
a15810afc8 Corrected "Media Proxy" translation. 2019-08-27 19:07:07 +00:00
Echedey López Romero
50bf9e633b Update es.json 2019-08-26 21:37:39 +00:00
HJ
8c465719cc Merge branch '650' into 'develop'
Make bio textarea resizable vertically only

Closes #650

See merge request pleroma/pleroma-fe!928
2019-08-26 21:18:11 +00:00
taehoon
e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04:00
HJ
8e33934e50 Merge branch 'remove-dead-code' into 'develop'
Remove dead code

See merge request pleroma/pleroma-fe!925
2019-08-26 18:34:56 +00:00
taehoon
a0712270aa remove dead code 2019-08-26 14:29:40 -04:00
Shpuld Shpuldson
15c4088a68 Make image orientation consistent on FF, fix videos w/ modal 2019-08-26 14:08:30 +03:00
taehoon
7b5cdab7cd remove dead code 2019-08-25 16:58:13 -04:00
Shpuld Shpludson
0e21c3cdd9 Merge branch '646' into 'develop'
Fix "Making hundreds of needless api requests in profile page"

Closes #646

See merge request pleroma/pleroma-fe!923
2019-08-25 20:03:06 +00:00
taehoon
9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04:00
Shpuld Shpludson
d7647be812 Merge branch '645' into 'develop'
Show "Mute Conversation" menu item and three dot button to users and only if needed

Closes #645

See merge request pleroma/pleroma-fe!922
2019-08-21 04:56:38 +00:00
taehoon
65579796ed show three dot button only if needed 2019-08-20 17:00:28 -04:00
taehoon
92a0c475f7 hide mute conversation button to guests 2019-08-20 16:55:42 -04:00
Shpuld Shpludson
6504d8ca0f Merge branch '640' into 'develop'
Fix "Mixed pin markers from multiple users"

Closes #640

See merge request pleroma/pleroma-fe!919
2019-08-18 08:24:56 +00:00
taehoon
4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00