sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2479 commits 3 branches 15 tags 109 MiB
Commit graph

2479 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shpuld Shpludson a284a267ce Merge branch 'develop' into 'develop' 
Fixing typos and badly translated strings (Portuguese)

See merge request pleroma/pleroma-fe!676
 2019-03-21 15:37:05 +00:00
Shpuld Shpludson 57cd6f8018 Merge branch 'feature/version-info' into 'develop' 
Added new tab to display versions of BE/FE

Closes #397

See merge request pleroma/pleroma-fe!671
 2019-03-21 15:25:59 +00:00
HJ 0659d2fd3a Merge branch 'patch-1' into 'develop' 
Make select tag use --inputText as text color

See merge request pleroma/pleroma-fe!693
 2019-03-20 13:12:51 +00:00
Marcin Mikołajczak 4ace0866da Make select tag use --inputText as text color 2019-03-20 11:52:58 +00:00
HJ 96f9eab700 Merge branch 'mastoapi/emojis' into 'develop' 
MastoAPI: emoji support

See merge request pleroma/pleroma-fe!659
 2019-03-17 14:08:01 +00:00
Henry Jameson 4cdfd5fb86 post-merge fixes 2019-03-17 14:41:05 +02:00
Henry Jameson 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
HJ 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
lambda 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
lambda 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
HJ 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
William Pitcock f93d4a3754 after store: fix setting postFormats field 2019-03-14 21:35:45 +00:00
Henry Jameson 71c12fa3a5 fix user-card avatar falling into permament failed state 2019-03-14 23:07:28 +02:00
Henry Jameson 6420c93e98 fix flake id users not fetching correctly 2019-03-14 23:07:28 +02:00
Henry Jameson 885a3a77df fix console error 2019-03-14 18:50:51 +02:00
Edijs 3c5c09c74f Merge branch 'develop' into feature/version-info 2019-03-13 15:24:09 -07:00
lain 5318227c37 afterStoreSetup: Move log in and theme load to afterStoreSetup. 2019-03-13 13:29:34 +01: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
Henry Jameson 644eba87fe whoops 2019-03-12 22:14:41 +02:00
Henry Jameson 27cbe3ca65 レインせんぱいにサンキュー 2019-03-12 22:10:22 +02:00
Henry Jameson ce8b5fcd11 fix embedded relationship card parsing 2019-03-12 21:49:03 +02:00
Henry Jameson b9877a4323 actually use embedded relationship if it's present 2019-03-11 23:45:24 +02:00
Rond 03f1b95252 fixing typos and badly translated strings 2019-03-11 18:26:40 -03:00
Henry Jameson a6a162177b instead of filtering nulls, let's just not have them in the first place 2019-03-11 23:08:09 +02:00
dave 130fb7ae1e #434 - fix plain text issue 2019-03-11 16:48:27 -04:00
Henry Jameson 4efcda1b41 Added some tests 2019-03-11 22:41:08 +02: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
Edijs 9c60934786 Code refactoring 2019-03-10 18:13:01 -07:00
Edijs 8952761370 Version links to BE/FE 2019-03-10 18:06:51 -07:00
Henry Jameson 06d39b62a8 fixed tests, review fixes, now storing local users with downcase screen name for 
better compatibility
 2019-03-11 02:17:58 +02:00
Edijs 068c9724e4 Added new tab to display versions of BE/FE 2019-03-10 16:58:12 -07: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