Commit graph

3569 commits

Author SHA1 Message Date
HJ
6afee3013f fix email highlight 2019-06-26 21:19:35 +00:00
Henry Jameson
277553094b formatting fix 2019-06-27 00:16:42 +03:00
Henry Jameson
c79c8f26c8 deletion update 2019-06-27 00:15:27 +03:00
Henry Jameson
185a4d8ab2 DOCUMENTATION 2019-06-27 00:10:51 +03:00
Henry Jameson
27b898f5c9 More configuration 2019-06-26 23:44:05 +03:00
Henry Jameson
926285685b HACKERMAN 2 2019-06-26 23:16:06 +03:00
HJ
69d3b8b20e Merge branch 'docs-settings' into 'docs'
Documentations: Add docs for settings.

See merge request pleroma/pleroma-fe!851
2019-06-26 12:24:30 +00:00
HJ
3354aea356 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:51:38 +00:00
HJ
0fc04893af Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:48:25 +00:00
HJ
624277c406 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:48 +00:00
HJ
afb8ef1983 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:31 +00:00
HJ
c95a3f0a1a Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:30 +00:00
HJ
c6a29b48eb Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:26 +00:00
HJ
0892c13c2c Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:19 +00:00
HJ
0b4c6127c5 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:16 +00:00
HJ
b02a92e9f6 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:13 +00:00
HJ
221db9f210 Merge branch 'fix-emoji-input' into 'develop'
fix all known problems with clicks on autocomplete emojis

See merge request pleroma/pleroma-fe!857
2019-06-25 21:38:45 +00:00
Henry Jameson
82464b3a7e review 2019-06-26 00:34:09 +03:00
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
lain
7dfd50c7c8 Apply suggestion to docs/USER_GUIDE.md 2019-06-24 22:07:03 +00:00
lain
bd8e1c9e23 Apply suggestion to docs/USER_GUIDE.md 2019-06-24 22:06:19 +00:00
lain
9bc7b19500 Apply suggestion to docs/USER_GUIDE.md 2019-06-24 22:06:02 +00:00
Henry Jameson
3fb165b0c8 H A C K E R M A N 2019-06-25 00:51:13 +03: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
lain
0ba0f8f1f1 Documentations: Add docs for settings. 2019-06-21 12:47:54 +02: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