Commit Graph

1524 Commits

Author SHA1 Message Date
Henry Jameson ca19025187 Added support for async following including delayed confirmation if we followed
user or not
2018-12-04 12:50:29 +03:00
Henry 480f617c09 Merge branch 'dev_vald_fe/be' into 'develop'
added tooltip

See merge request pleroma/pleroma-fe!391
2018-12-03 19:22:39 +00:00
ValD c142f7b7b6 addressed PR comments 2018-12-04 00:45:31 +05:30
ValD c40bda7c2a added tooltip 2018-12-04 00:45:31 +05:30
lambda b851b8dd02 Merge branch 'fix-vimium' into 'develop'
fixes vimium not giving retweet button a hint

Closes #166

See merge request pleroma/pleroma-fe!385
2018-12-03 17:56:21 +00:00
lambda 9e78eddf2a Merge branch 'subject-line-entry-auto' into 'develop'
Added option to auto-hide subject field when it's empty.

Closes #174

See merge request pleroma/pleroma-fe!388
2018-12-03 14:55:43 +00:00
lambda ea28aa62f0 Merge branch 'ss-read' into 'develop'
Server-side read marking

See merge request pleroma/pleroma-fe!386
2018-12-03 14:47:27 +00:00
lambda b33aa46d6e Merge branch 'fix-user-profile-glitches' into 'develop'
User timeline improvements

Closes #186 and #120

See merge request pleroma/pleroma-fe!390
2018-12-03 10:11:32 +00:00
Henry Jameson ccb1682379 Add userId property to timelines so that we don't overwrite user timeline meant
for another user
2018-12-03 09:29:33 +03:00
Henry Jameson b34097a5c1 Added option to auto-hide subject field when it's empty. 2018-12-03 06:47:35 +03:00
Henry Jameson b555d617e4 removes hacks from notifications storage, adds api call to let server update
is_seen attribute
2018-12-02 13:36:11 +03:00
Henry Jameson 8174248b98 fixes vimium not giving retweet button a hint 2018-12-02 13:05:18 +03:00
lambda e15b9bddbb Merge branch 'file-type-service-fix' into 'develop'
Modify filetype service to accept more generic mimetypes

See merge request pleroma/pleroma-fe!381
2018-12-01 08:35:51 +00:00
lambda ff60a9e631 Merge branch 'fix/user-search-profile-link' into 'develop'
Fix user search profile link

See merge request pleroma/pleroma-fe!382
2018-11-30 19:51:50 +00:00
lambda fdd8cb619a Merge branch 'logout_on_password_change' into 'develop'
Logout user on password change

Closes #185

See merge request pleroma/pleroma-fe!384
2018-11-30 19:49:48 +00:00
lambda 7d12a65b3b Merge branch 'fix/switch-to-timeline-on-mobile' into 'develop'
Switch to timeline view on mobile when clicking relevant actions

See merge request pleroma/pleroma-fe!383
2018-11-30 19:49:09 +00:00
raeno 59b84c2a06 Do not use underscore at the beginning of the method 2018-11-30 18:53:59 +04:00
raeno 0c3cd05965 Logout user on password change 2018-11-30 17:30:55 +04:00
Maxim Filippov bee6a0273b Route user to the correct profile URL 2018-11-28 19:24:50 +03:00
Maxim Filippov 21b600d5e1 Typo 2018-11-28 19:24:19 +03:00
rinpatch cddb173089 Fix filetype detection 2018-11-27 18:44:49 +03:00
Henry 91272dc555 Merge branch 'feature/scope_preferences' into 'develop'
Make visibility copying and subject copying configurable

Closes #135

See merge request pleroma/pleroma-fe!353
2018-11-26 01:50:54 +00:00
Henry Jameson b948234aec whoops 2018-11-26 04:44:54 +03:00
Henry Jameson 2dbc5f757d whoops 2018-11-26 04:42:25 +03:00
Henry Jameson e06717fd0d Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop:
  DM timeline: stream new statuses
  update-japanese-translation
  Add actual user search.
  incorporate most translation changes from MR 368
  update french translation
  Always show dm panel.
  Add direct message tab.
  api service url
  On logout switch to public timeline.
  Put oauth text into description.
  Display OAuth login on login form button.
  Add login form back in.
  Linting.
  Re-activate registration, use oauth password flow to fetch token.
  Fix typo.
  Remove gonsole.logg :DD
  Fix linting.
  Move login to oauth.
2018-11-26 04:38:44 +03:00
Henry Jameson 0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop: (36 commits)
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Count spoiler text in the character count. Fixes #135.
  Added Irish (Gaeilge) Language
  Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
  simplify code
  adapt to destructive change of api
  Adds Occitan locale
  Updated italian translation
  Update oc.json
  Update oc.json
  Update of the oc.json file Actualizacion del fichièr oc.json
  Sort messages object by language code so that it's easier from the UI to browse them.
  explicitly set collapseMessageWithSubject to undefined
  Fall back to instance settings consistently
  ...
2018-11-26 04:33:41 +03:00
Henry f1a23f2b6e Merge branch 'update-japanese-translation' into 'develop'
Update Japanese translation

See merge request pleroma/pleroma-fe!378
2018-11-25 22:53:21 +00:00
eal 2d48292683 Switch to settings when touching settings 2018-11-25 19:18:16 +02:00
eal 668087a29e Switch to timeline on nav panel actions 2018-11-25 19:00:24 +02:00
lambda 47403a055d Merge branch 'fix/dm-timeline-streaming' into 'develop'
DM timeline: stream new statuses

Closes #170

See merge request pleroma/pleroma-fe!379
2018-11-25 16:30:02 +00:00
eal 3ed05693de DM timeline: stream new statuses 2018-11-25 18:11:57 +02:00
lambda 3263aa323c Merge branch 'feature/user-search' into 'develop'
Add actual user search.

See merge request pleroma/pleroma-fe!376
2018-11-16 18:14:16 +00:00
Hakaba Hitoyo 7044bf2bd7 update-japanese-translation 2018-11-15 11:39:08 +09:00
Roger Braun c34eebff6c Add actual user search. 2018-11-14 20:31:06 +01:00
kaniini 609ad40736 Merge branch 'french-translation' into 'develop'
French translation update

See merge request pleroma/pleroma-fe!375
2018-11-14 15:48:37 +00:00
William Pitcock 1ad642c598 incorporate most translation changes from MR 368 2018-11-14 15:43:27 +00:00
William Pitcock d0a4152f3c update french translation 2018-11-14 15:36:55 +00:00
lambda be6ebc176b Merge branch 'dm-tab' into 'develop'
Direct Message tab

See merge request pleroma/pleroma-fe!374
2018-11-14 10:28:54 +00:00
Roger Braun c7d469249e Always show dm panel. 2018-11-13 22:30:00 +01:00
Roger Braun b37a0f4f23 Add direct message tab. 2018-11-13 20:34:56 +01:00
Roger Braun 7f13cbc493 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tab 2018-11-13 20:21:04 +01:00
Roger Braun ffb9d4faf5 api service url 2018-11-13 20:20:46 +01:00
lambda 11f8a4f312 Merge branch 'oauth' into 'develop'
Move login to oauth.

See merge request pleroma/pleroma-fe!367
2018-11-13 18:42:07 +00:00
Roger Braun e9b68b8c97 remove deploy stage 2018-11-13 14:16:02 +01:00
Roger Braun ee29bca60a remove deploy stage 2018-11-13 14:14:48 +01:00
lambda be8a4a9745 Merge branch 'patch-1' into 'develop'
[i18] Correction Occitan file

See merge request pleroma/pleroma-fe!369
2018-11-13 12:54:04 +00:00
lambda 2a61f2b24c Merge branch 'i18n/irish' into 'develop'
Added Irish (Gaeilge) Language

See merge request pleroma/pleroma-fe!370
2018-11-13 06:59:46 +00:00
lambda c1f518882e Merge branch 'develop' into 'develop'
updated and completed German translation

See merge request pleroma/pleroma-fe!373
2018-11-13 06:59:11 +00:00
Vinzenz Vietzke ae927f8628 updated and completed German translation 2018-11-12 22:39:55 +01:00
lambda 70e01c6ec3 Merge branch 'develop' into 'develop'
Added Chinese Language

See merge request pleroma/pleroma-fe!372
2018-11-10 10:17:40 +00:00