Commit graph

3222 commits

Author SHA1 Message Date
Henry Jameson
9dbafa4c78 lint fix 2019-06-25 21:39:33 +03:00
Henry Jameson
01bda605a7 fix all known problems with clicks on autocomplete emojis 2019-06-25 21:31:43 +03:00
Shpuld Shpludson
a6bcd56c9f Merge branch 'fix/gallery-margin-fix' into 'develop'
fix specificity that made attachments misalign

See merge request pleroma/pleroma-fe!855
2019-06-25 16:30:21 +00:00
Shpuld Shpludson
b059deb551 fix specificity that made attachments misalign 2019-06-25 16:30:21 +00:00
HJ
8d33832fe1 Merge branch 'clearer-user-profile-tabs' into 'develop'
Clearer user profile tabs when status is empty

See merge request pleroma/pleroma-fe!847
2019-06-25 06:32:08 +00:00
Wyatt Benno
f2d84ef233 Keep statuses always enabled 2019-06-25 10:27:41 +09:00
HJ
bb8e2b1933 Merge branch 'timeline-skip-fix' into 'develop'
timeline-skip-fix

See merge request pleroma/pleroma-fe!850
2019-06-24 22:08:09 +00:00
HJ
05aec11906 Merge branch '591' into 'develop'
Add resolve param to user search api request

Closes #591

See merge request pleroma/pleroma-fe!853
2019-06-24 17:31:54 +00:00
taehoon
1c03bd0ebc add resolve param to user search api request 2019-06-24 07:49:22 -04:00
Wyatt Benno
7a5d06a6cf change isPinned to noIdUpdate 2019-06-24 12:01:13 +09:00
Shpuld Shpludson
79d39356c4 Merge branch 'fix/not-all-polls-showing-up' into 'develop'
Fix: problems with polls state

See merge request pleroma/pleroma-fe!849
2019-06-22 14:01:36 +00:00
Shpuld Shpludson
947f69a953 Fix: problems with polls state 2019-06-22 14:01:36 +00:00
Shpuld Shpludson
c2b48c32a2 Merge branch 'fix/move-character-counter' into 'develop'
Move character counter into the input box

See merge request pleroma/pleroma-fe!848
2019-06-22 13:41:02 +00:00
Shpuld Shpludson
30a340955e Move character counter into the input box 2019-06-22 13:41:02 +00:00
HJ
5a8f3dddfd Merge branch 'fix-token-auth-login' into 'develop'
Fix broken token authentication

See merge request pleroma/pleroma-fe!846
2019-06-22 07:47:30 +00:00
Wyatt Benno
a1c50c3fc1 fix for #553 2019-06-21 10:31:00 +09:00
Wyatt Benno
308c4c9789 Make scss change for tab switcher only 2019-06-21 08:35:02 +09:00
taehoon
bd377148ad delete state.token instead of setting false 2019-06-20 11:48:31 -04:00
taehoon
8a32731e4d use clientSecret in login flow 2019-06-20 11:48:30 -04:00
taehoon
c23228f196 fix error breaking logout flow 2019-06-20 11:48:30 -04:00
taehoon
268e9ce504 make sure to clear old token when logout 2019-06-20 11:48:29 -04:00
Shpuld Shpludson
03a27c6d48 Merge branch 'fix/polls-to-module' into 'develop'
Move poll state handling to its own module

See merge request pleroma/pleroma-fe!845
2019-06-20 13:02:04 +00:00
Shpuld Shpludson
e5e9bb27f3 Move poll state handling to its own module 2019-06-20 13:02:04 +00:00
Shpuld Shpludson
eca533aab6 Merge branch 'fix/messed-up-long-polls' into 'develop'
Fix/messed up long polls

See merge request pleroma/pleroma-fe!843
2019-06-20 13:00:10 +00:00
Shpuld Shpludson
44a03922e6 Fix/messed up long polls 2019-06-20 13:00:10 +00:00
Wyatt Benno
066efd5b3c A small sass fix for #577 2019-06-20 16:15:49 +09:00
HJ
752ee9d70c Merge branch '584' into 'develop'
Fix "Status submission box overlap and alignment issues"

Closes #584

See merge request pleroma/pleroma-fe!835
2019-06-19 12:27:12 +00:00
taehoon
90fda1f245 reset margin property of form controls 2019-06-19 07:55:54 -04:00
HJ
c4fcdc7125 Merge branch 'mr-origin-740' into 'develop'
Update french translation

See merge request pleroma/pleroma-fe!829
2019-06-18 20:39:59 +00:00
Shpuld Shpludson
0cfa28a7de Merge branch 'feature/polls-attempt-2' into 'develop'
Feature/polls attempt 2

See merge request pleroma/pleroma-fe!826
2019-06-18 20:28:31 +00:00
lain
0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Dashie
57dbfc269c
Update translation with review comments 2019-06-18 22:14:02 +02:00
Dashie
64d7dd60cc
Update file with current en.json 2019-06-18 21:22:22 +02:00
Satak
3fcc4ba288
Update fr.json
added missing ,
2019-06-18 21:22:21 +02:00
Satak
ceffe72f6f
Update fr.json
stoped at line 134, more to do below
2019-06-18 21:22:15 +02:00
HJ
69eff65130 Merge branch 'refactor-emoji-input' into 'develop'
EmojiInput refactoring

Closes #565

See merge request pleroma/pleroma-fe!824
2019-06-18 19:17:37 +00:00
Henry Jameson
46e0122067 review 2019-06-18 22:13:03 +03:00
Henry Jameson
0032802f0a review 2019-06-18 21:30:35 +03:00
HJ
e5020d6936 Update emoji-input.js 2019-06-18 17:49:43 +00:00
Shpuld Shpludson
c0c012ccf9 Merge branch 'fix-user-search' into 'develop'
fix user search

See merge request pleroma/pleroma-fe!839
2019-06-18 16:32:11 +00:00
HJ
3cd4201ce4 Merge branch '573' into 'develop'
Apply font smoothing in webkit and firefox

Closes #573

See merge request pleroma/pleroma-fe!841
2019-06-18 16:31:33 +00:00
HJ
195057040c Merge branch 'fix/minor-fixes-console-warnings-stretching' into 'develop'
Misc fixes: Fix uploads stretching on chrome, fix warnings in console

See merge request pleroma/pleroma-fe!842
2019-06-18 16:31:20 +00:00
Shpuld Shpludson
76efbcbe92 Misc fixes: Fix uploads stretching on chrome, fix warnings in console 2019-06-18 16:31:20 +00:00
taehoon
2b5ac611c9 apply font smoothing in webkit and firefox 2019-06-17 23:34:20 -04:00
Henry Jameson
de03eda9f3 fix user search 2019-06-17 23:39:30 +03:00
HJ
ac46de3972 Merge branch 'mastoapi-login-and-config-fixes' into 'develop'
Mastoapi login and config fixes

See merge request pleroma/pleroma-fe!833
2019-06-17 20:17:58 +00:00
HJ
22a3351208 Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js 2019-06-17 20:12:11 +00:00
Henry Jameson
5f4a8dcc05 properly position the caret after replacement 2019-06-17 21:24:10 +03:00
HJ
8caf13bbce Apply suggestion to src/services/api/api.service.js 2019-06-17 08:20:02 +00:00
lain
8d2e63a8e4 Merge branch 'fix-mfa' into 'develop'
fix MFA crashing on user-settings page

See merge request pleroma/pleroma-fe!834
2019-06-17 07:33:39 +00:00