Commit Graph

2449 Commits

Author SHA1 Message Date
dave 97a3f9c0f5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-14 14:24:23 -04:00
dave 52326e6551 #436: remove clear & dismiss UI updates 2019-03-14 11:57:24 -04:00
dave 06fda27511 #436: update unit testing 2019-03-14 08:06:40 -04:00
dave e5e1d4c643 #436: fix notification order, follow type link issue, duplicate key 2019-03-14 07:55:39 -04:00
dave 93a2510ede #436: update is_local 2019-03-13 15:43:48 -04:00
dave 78951964fb #436: update entity_normalizer 2019-03-13 15:34:45 -04:00
dave 2f7d890ad2 #436: add dismiss button, disable is_seen part 2019-03-13 14:08:03 -04:00
lambda 9fd44e4a52 Merge branch 'afterstore-refactor' into 'develop'
Afterstore refactor

See merge request pleroma/pleroma-fe!679
2019-03-13 12:08:28 +00:00
lain 48ac96cfc7 afterStoreSetup: Handle 404 cases. 2019-03-13 12:41:39 +01:00
lain 446785ddce afterStoreSetup: Emoji and nodeinfo refactor. 2019-03-13 12:26:40 +01:00
lain f535ccd925 afterStoreSetup: refactor TOS and panel fetching, handle 404s. 2019-03-13 12:10:57 +01:00
lain c030e62254 afterStoreSetup: refactor. 2019-03-13 11:57:30 +01:00
lain 1387dfb889 Load persistedStated with async/await. 2019-03-13 11:29:45 +01:00
dave cd9a7dd488 #436: integrate mastoAPI notifications 2019-03-12 17:16:57 -04:00
Shpuld Shpludson 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
Shpuld Shpludson 4a27c6d8d3 Add floating post-status button on mobile 2019-03-11 16:51:37 +00:00
Shpuld Shpludson 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
taehoon d8e938bb5e Update user settings icon to pencil 2019-03-11 11:52:49 -04:00
lambda 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
lambda 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
Lorem Ipsum 3414fce53b I18n: Update Czech translation 2019-03-11 14:28:44 +00:00
HJ 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
Haelwenn (lanodan) Monnier d0e78df220
user_card.vue: Copy over .status-content img styling 2019-03-11 05:14:49 +01:00
Shpuld Shpludson 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
shpuld 70d7ed3607 Make minId reset with minVisibleId to prevent gaps when showing new 2019-03-10 22:40:48 +02:00
slice 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
Shpuld Shpludson 841648676c Merge branch 'issue-432-dot-key' into 'develop'
#432 - prevent post status form textarea keydown event propagation

Closes #432

See merge request pleroma/pleroma-fe!658
2019-03-10 15:29:44 +00:00
slice a67881b096
Check for websocket token before connecting to chat
Closes #403. Previously, a socket to the chat channel would be opened if
chat is enabled, regardless if the user is logged in or not. This patch
only allows a connection to be opened if a wsToken (websocket token) is
present, which prevents websocket errors from unauthenticated users.
2019-03-10 01:54:26 -08:00
Haelwenn (lanodan) Monnier 07a46f7736
user_card.vue: Set img.emoji to 32×32px
Related to https://git.pleroma.social/pleroma/pleroma/merge_requests/792
2019-03-10 01:56:51 +01:00
dave 3468c0fd04 #432 - prevent post status form textarea keydown event propagation 2019-03-08 13:53:46 -05:00
Shpuld Shpludson 09736691ea Merge branch '420-redo-user-card-content' into 'develop'
Re-do UserCardContent Component CSS

Closes #420

See merge request pleroma/pleroma-fe!642
2019-03-07 16:38:45 +00:00
Shpuld Shpludson 82cd1252b5 Merge branch '415-timeline' into 'develop'
Fix timeline updating bug when scrolled down

Closes #415

See merge request pleroma/pleroma-fe!644
2019-03-07 16:34:43 +00:00
Shpuld Shpludson 09b0f6dd87 Merge branch 'issue-392-other-user-stale-data' into 'develop'
#392: stale data served to new user account

Closes #392

See merge request pleroma/pleroma-fe!625
2019-03-07 16:33:22 +00:00
Shpuld Shpludson e3b3ef156b Merge branch 'fix/remove-posts-immediately-by-blocking-someone' into 'develop'
#330 Remove posts immediately by blocking someone

See merge request pleroma/pleroma-fe!589
2019-03-07 16:07:01 +00:00
Shpuld Shpludson 2baff88e3f Merge branch 'fix/gallery-css' into 'develop'
Fix gallery style - move hide button to top right

Closes #335

See merge request pleroma/pleroma-fe!579
2019-03-07 16:03:32 +00:00
Shpuld Shpludson bf1fa52e5e Merge branch 'fix/post-content-type' into 'develop'
#327: Load post status content type from instance config

Closes #327

See merge request pleroma/pleroma-fe!641
2019-03-07 16:03:06 +00:00
Shpuld Shpludson c44f0a9bde Merge branch 'fix/fetch-activities-by-last-id' into 'develop'
#406 Fetch activities by last id

See merge request pleroma/pleroma-fe!621
2019-03-07 05:06:43 +00:00
Edijs 292cdfb24b Merge content types translations 2019-03-06 20:13:04 -08:00
Shpuld Shpludson 423e1b3b12 Merge branch 'i18n-cs' into 'develop'
I18n: Add Czech translation

See merge request pleroma/pleroma-fe!627
2019-03-06 20:23:46 +00:00
Shpuld Shpludson de46ede8fd Merge branch 'issue-346-auto-post' into 'develop'
#346: Hyperlink is not included

Closes #346

See merge request pleroma/pleroma-fe!626
2019-03-06 20:22:12 +00:00
taehoon aca3b37134 Use a cross browser safe solution to get scroll top 2019-03-06 12:10:29 -05:00
Shpuld Shpludson 830f3762ef Merge branch 'emoji-limit' into 'develop'
compatibility with upcoming changes

See merge request pleroma/pleroma-fe!643
2019-03-06 05:11:07 +00:00
taehoon 5f51fe897d Revert modifier class notation 2019-03-05 21:52:04 -05:00
taehoon 37acb51df4 Update classname 2019-03-05 21:48:07 -05:00
taehoon 7cb13df8ad Update tests 2019-03-05 14:13:22 -05:00
taehoon 7bceabb5bd Rename UserCardContent to UserCard 2019-03-05 14:01:49 -05:00
taehoon baf603a506 Update block class name of BasicUserCard component 2019-03-05 13:56:40 -05:00
taehoon 43c52cb950 Update modifier class notation 2019-03-05 13:25:31 -05:00
Henry Jameson 68b2d9ef56 compatibility with upcoming changes 2019-03-05 20:15:18 +02:00
taehoon e0a66b989d Re-do UserCardContent css 2019-03-05 10:46:03 -05:00