30c0cafff1
Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis
...
* upstream/develop: (34 commits)
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
actually use embedded relationship if it's present
instead of filtering nulls, let's just not have them in the first place
#434 - fix plain text issue
Add floating post-status button on mobile
Update user settings icon to pencil
I18n: Update Czech translation
user_card.vue: Copy over .status-content img styling
...
2019-03-17 13:32:56 +02:00
7babbce522
[i18n] Update oc.json
2019-03-15 17:23:30 +00:00
6e60873a3d
Switch to mastoapi for user search
2019-03-15 11:03:11 -04:00
9364964b01
Merge branch 'mastoapi/user-stuff' into 'develop'
...
Transition to MastoAPI: user data
See merge request pleroma/pleroma-fe!655
2019-03-15 13:14:41 +00:00
92eb55c7bc
Merge branch 'bugfix/nodeinfo-post-formats' into 'develop'
...
after store: fix setting postFormats field
See merge request pleroma/pleroma-fe!683
2019-03-15 13:03:35 +00:00
c626f84336
Merge branch 'afterstore-refactor' into 'develop'
...
afterStoreSetup: Move log in and theme load to afterStoreSetup.
See merge request pleroma/pleroma-fe!680
2019-03-15 13:03:19 +00:00
ebc6a75d30
Merge branch 'issue-434-plain-text' into 'develop'
...
#434 - fix plain text issue
Closes #434
See merge request pleroma/pleroma-fe!675
2019-03-14 22:03:33 +00:00
f93d4a3754
after store: fix setting postFormats field
2019-03-14 21:35:45 +00:00
71c12fa3a5
fix user-card avatar falling into permament failed state
2019-03-14 23:07:28 +02:00
6420c93e98
fix flake id users not fetching correctly
2019-03-14 23:07:28 +02:00
0a86d39ba9
remove notifications from sidebar, make notifications appear on login only
2019-03-14 20:40:56 +02:00
885a3a77df
fix console error
2019-03-14 18:50:51 +02:00
f19284357e
make nav bar slide, move mobile post status to mobile nav
2019-03-14 17:46:04 +02:00
3c5c09c74f
Merge branch 'develop' into feature/version-info
2019-03-13 15:24:09 -07:00
5318227c37
afterStoreSetup: Move log in and theme load to afterStoreSetup.
2019-03-13 13:29:34 +01:00
9fd44e4a52
Merge branch 'afterstore-refactor' into 'develop'
...
Afterstore refactor
See merge request pleroma/pleroma-fe!679
2019-03-13 12:08:28 +00:00
48ac96cfc7
afterStoreSetup: Handle 404 cases.
2019-03-13 12:41:39 +01:00
446785ddce
afterStoreSetup: Emoji and nodeinfo refactor.
2019-03-13 12:26:40 +01:00
f535ccd925
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
2019-03-13 12:10:57 +01:00
c030e62254
afterStoreSetup: refactor.
2019-03-13 11:57:30 +01:00
1387dfb889
Load persistedStated with async/await.
2019-03-13 11:29:45 +01:00
7ce8fe9214
merge develop, add mobile nav component
2019-03-12 23:50:54 +02:00
644eba87fe
whoops
2019-03-12 22:14:41 +02:00
27cbe3ca65
レインせんぱいにサンキュー
2019-03-12 22:10:22 +02:00
ce8b5fcd11
fix embedded relationship card parsing
2019-03-12 21:49:03 +02:00
b9877a4323
actually use embedded relationship if it's present
2019-03-11 23:45:24 +02:00
03f1b95252
fixing typos and badly translated strings
2019-03-11 18:26:40 -03:00
a6a162177b
instead of filtering nulls, let's just not have them in the first place
2019-03-11 23:08:09 +02:00
130fb7ae1e
#434 - fix plain text issue
2019-03-11 16:48:27 -04:00
4efcda1b41
Added some tests
2019-03-11 22:41:08 +02:00
63d7c7bd80
#433 : persistency of status form
2019-03-11 16:24:37 -04:00
19015a4ae7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-11 13:41:55 -04:00
f397537642
Merge branch 'feature/mobile-improvements-2' into 'develop'
...
Add floating post-status button on mobile
See merge request pleroma/pleroma-fe!628
2019-03-11 16:51:37 +00:00
4a27c6d8d3
Add floating post-status button on mobile
2019-03-11 16:51:37 +00:00
bb1a4e11f8
Merge branch '382-update-user-settings-icon' into 'develop'
...
Update user settings icon to pencil
Closes #382
See merge request pleroma/pleroma-fe!602
2019-03-11 16:48:16 +00:00
d8e938bb5e
Update user settings icon to pencil
2019-03-11 11:52:49 -04:00
4f455eefe5
#433 : do not remove the reply dialog
2019-03-11 10:52:28 -04:00
f52a33f711
Merge branch 'develop' into 'develop'
...
Only connect to chat upon authenticating
Closes #403
See merge request pleroma/pleroma-fe!666
2019-03-11 14:43:40 +00:00
ed3bf6f027
Merge branch 'i18n-cs' into 'develop'
...
I18n: Update Czech translation
See merge request pleroma/pleroma-fe!651
2019-03-11 14:28:44 +00:00
3414fce53b
I18n: Update Czech translation
2019-03-11 14:28:44 +00:00
89d684af4e
Merge branch 'emoji-limit-profile' into 'develop'
...
user_card.vue: Set img.emoji to 32×32px
See merge request pleroma/pleroma-fe!665
2019-03-11 09:45:16 +00:00
d0e78df220
user_card.vue: Copy over .status-content img styling
2019-03-11 05:14:49 +01:00
9c60934786
Code refactoring
2019-03-10 18:13:01 -07:00
8952761370
Version links to BE/FE
2019-03-10 18:06:51 -07:00
06d39b62a8
fixed tests, review fixes, now storing local users with downcase screen name for
...
better compatibility
2019-03-11 02:17:58 +02:00
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
151e200983
Merge branch 'fix/timeline-gaps-when-loading-older-after-showing-new' into 'develop'
...
Fix gaps in timeline when loading older after pressing show new
See merge request pleroma/pleroma-fe!670
2019-03-10 21:11:26 +00:00
70d7ed3607
Make minId reset with minVisibleId to prevent gaps when showing new
2019-03-10 22:40:48 +02:00
e618c6ffb0
Only connect to chat when authenticating in the first place
...
To avoid duplication of the connection, the chat socket is destroyed
upon logging out.
2019-03-10 11:25:36 -07:00
4a5aef8883
basic user and status actions implemented
2019-03-10 19:15:07 +02:00
Henry Jameson