Commit graph

2874 commits

Author SHA1 Message Date
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
Eugenij 8ee5abb1a5 Password reset page 2019-09-05 11:23:28 +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
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
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
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
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
taehoon e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04: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
taehoon 9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04: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
taehoon 4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00
taehoon 1146119d6a generate idObj at timeline level 2019-08-17 14:33:32 -04:00
taehoon 4b444708f2 fix pin showing logic in conversation 2019-08-17 14:33:32 -04:00
Sergey Suprunenko d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +00:00
Shpuld Shpludson 58713e342d Merge branch 'eu-translate' into 'develop'
add Basque translate

See merge request pleroma/pleroma-fe!900
2019-08-17 08:16:45 +00:00
Shpuld Shpludson 84c3403143 Merge branch 'es-translate' into 'develop'
[i18n] Spanish corrections

See merge request pleroma/pleroma-fe!904
2019-08-17 08:15:06 +00:00
Shpuld Shpludson aef97bc9bc Merge branch 'update-nb' into 'develop'
Update norwegian bokmål translation

See merge request pleroma/pleroma-fe!906
2019-08-17 08:14:47 +00:00
Hakaba Hitoyo 091fb5573c i18n/Update Japanese 2019-08-17 08:14:17 +00:00
Hakaba Hitoyo fc68c3907d i18n/Update pedantic Japanese 2019-08-17 08:14:00 +00:00
Shpuld Shpludson e8fad7a460 Merge branch 'telugu-translation' into 'develop'
i18n: Translated to Telugu (44.3%)

See merge request pleroma/pleroma-fe!913
2019-08-17 08:13:29 +00:00
taehoon 7dfcabb543 sync profile tab state with location query 2019-08-15 13:25:38 -04:00
taehoon e8c22fbfa3 refactor TabSwitcher 2019-08-15 13:25:38 -04:00
taehoon 6e51774ccb use better name of controlled prop 2019-08-15 13:25:38 -04:00
taehoon eafd53f994 fix potential bug to render active tab in controlled way 2019-08-15 13:25:38 -04:00
taehoon 9dd9ba0205 remove unused param 2019-08-15 13:25:38 -04:00
taehoon df3e80b7c3 use key prop instead of dataset to identify active tab 2019-08-15 13:25:38 -04:00
taehoon cd14566a34 remove useless index param of onSwitch 2019-08-15 13:25:38 -04:00
taehoon 539913673f reset error state when load new profile 2019-08-15 13:25:38 -04:00
taehoon 2e0603bdca clear timelines only if load user not viewed previously 2019-08-15 13:25:38 -04:00
Hakaba Hitoyo dd340bb9e3 Fix/Fix links to external users in Who to follow page 2019-08-15 17:19:49 +00:00
taehoon 9229f28edb rel also accepts list, update rel detection logic 2019-08-13 13:11:37 -04:00
taehoon 5aa2c44487 use hashtag class detection as fallback 2019-08-12 15:22:39 -04:00
taehoon 5e99bad417 detect hashtag using rel instead of class 2019-08-12 14:48:11 -04:00