Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1738 commits 59 branches 16 tags 15 MiB
Commit graph

1738 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini
9982376f9a Merge branch 'feature/theme-export-import' into 'develop' 
Theme import & export

Closes #119

See merge request pleroma/pleroma-fe!290
 2018-08-20 00:03:35 +00:00
kaniini
65dfceae59 Merge branch 'fixes-and-tweaks' into 'develop' 
Fixes and tweaks

See merge request pleroma/pleroma-fe!307
 2018-08-20 00:02:59 +00:00
kaniini
702dfcec10 Merge branch 'develop' into 'fixes-and-tweaks' 
# Conflicts:
#   src/i18n/messages.js
 2018-08-19 23:59:15 +00:00
kaniini
d6b3394b79 Merge branch 'user_settings_tabs' into 'develop' 
Add tabs to user settings

See merge request pleroma/pleroma-fe!308
 2018-08-19 23:40:31 +00:00
Foxhkron
56ddeec8f3
Merge upstream 2018-08-19 01:23:03 +02:00
kaniini
5c3f6aebb9 Merge branch 'feature/default-scope' into 'develop' 
Feature/default scope

See merge request pleroma/pleroma-fe!309
 2018-08-18 17:09:37 +00:00
William Pitcock
fe06beae18 fix lint issues 2018-08-18 17:06:07 +00:00
William Pitcock
61d40f40ae allow default visibility scope to be configured 2018-08-18 17:06:06 +00:00
Henry Jameson
99f849bd8c Revert "storing entire config instead of each separate thing of it, so that future" 
This reverts commit 18117c3bfa.

b/c something else uses same field but i want to fix that in another MR
 2018-08-18 13:56:45 +03:00
Henry Jameson
0b6f9c62a1 fix 2018-08-18 13:41:23 +03:00
Henry Jameson
23a1000298 fix post search query to have id +1 because search is exclusive 2018-08-16 18:13:31 +03:00
Henry Jameson
cc473df314 changed the only surviving and important test to accommodate for new notifications flow. 2018-08-16 14:46:05 +03:00
Henry Jameson
3afe65352b removed notification-relevant test because the functionality they are testing do 
not exist anymore. Gotta write more tho...
 2018-08-16 14:07:06 +03:00
Henry Jameson
6454837ea4 Merge remote-tracking branch 'upstream/develop' into notifications 
* upstream/develop: (26 commits)
  Update status.vue
  Update retweet_button.js
  Update retweet_button.vue
  Use serverside html rendering in usernames and bios if available.
  Update status.vue
  Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
  Hide all status actions if not logged in
  hopefully, fix linter
  Fixes broken custom emoji in autocomplete when proxying to remote BE
  Made it so that unfocused tab doesn't autostream posts when scrolled to the top
  Remove trailing whitespace
  Textarea is now focused when replying
  the missing piece for invites system
  Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are
  fixed lint
  cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
  added ability to pick the style of highlighting
  post-rebase fix, backported d7d787b84c
  notifs fix
  maybe i should actually add myself to contributors list?
  ...
 2018-08-16 13:59:01 +03:00
Henry Jameson
decc209fdc fix lint 2018-08-16 13:57:16 +03:00
Henry Jameson
693eb4b717 cleanup, updated broken favorites look + localization strings 2018-08-16 13:41:45 +03:00
Henry Jameson
e8f7491003 fixed favoriting from notification column 2018-08-16 13:20:29 +03:00
Henry Jameson
ef04a78634 added workaround for broken favorites 2018-08-16 13:12:31 +03:00
Henry Jameson
627e227076 fixes hella ton of annoyances with file upload display 2018-08-15 14:53:40 +03:00
Henry Jameson
3fa9d90712 using custom ascend value as suggested here: 
https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
 2018-08-15 14:08:47 +03:00
Henry Jameson
f2b996cd46 disable hinting because it breaks alignment on some icons (namely - locks) 2018-08-15 13:59:22 +03:00
Henry Jameson
d94b77b863 fix for timeago being ass when post has replies. added hover colors for 
clickable icons on the right side. Reverted line-height to its original value
 2018-08-15 13:02:39 +03:00
Henry Jameson
0e5b74e3dd Configurable video looping, option to not to loop silent videos. Updated 
localization strings.
 2018-08-15 12:51:21 +03:00
Sebastian Huebner
45478d4bed
i18n/messages.js: changed Folgende back to Follower 2018-08-15 10:29:19 +02:00
Sebastian Huebner
2b61be5271 Merge branch 'feature/update-de-translation' of git.pleroma.social:pleroma/pleroma-fe into feature/update-de-translation 2018-08-15 10:28:39 +02:00
Henry Jameson
d2ec70c323 added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click 2018-08-15 11:20:40 +03:00
Sebastian Huebner
1dddce5624 updated german translation 2018-08-15 10:18:16 +02:00
Henry Jameson
87eee191b8 Made pausing TL updating configurable. Added styles for disabled checkboxes. 
Shuffled settings a bit b/c all the settings are in "Attachments" section
depsite the fact not all of them are attachments-related.
 2018-08-13 17:07:45 +03:00
Henry Jameson
18117c3bfa storing entire config instead of each separate thing of it, so that future 
options won't be lost during reloads because developer forgot to update that
list of settings to be persisted
 2018-08-13 16:17:00 +03:00
Henry Jameson
d417cb35bb fix potential stretched spurdo 2018-08-13 15:36:10 +03:00
Henry Jameson
4d112b70fd fixed custom emoji in nickname. changed icons on right side to be more 
streamlined. adjusted CSS so that all text in header of post is on same
baseline and all icons/images are middle-aligned.
 2018-08-13 14:46:28 +03:00
Henry Jameson
ef515056b5 missing files and a plug for bad favs 2018-08-13 13:17:10 +03:00
lambda
ce88f351f7 Merge branch 'invites' into 'develop' 
FE part of invites system

See merge request pleroma/pleroma-fe!297
 2018-08-12 16:15:27 +00:00
lambda
25be51e2c1 Merge branch 'feature/accountHighlight' into 'develop' 
Account highlight

See merge request pleroma/pleroma-fe!285
 2018-08-12 16:14:35 +00:00
Henry
27adde9887 Merge branch 'develop' into 'feature/accountHighlight' 
# Conflicts:
#   src/components/user_card_content/user_card_content.vue
 2018-08-12 12:05:08 +00:00
Henry Jameson
d085cc8584 undo test condition 2018-08-12 14:15:09 +03:00
Henry Jameson
63650aec29 Added support for qvitter api fetching of notifications 2018-08-12 14:14:34 +03:00
lambda
db6ff4824a Merge branch 'feature/focus_reply_form' into 'develop' 
Focus textarea when clicking "reply"

See merge request pleroma/pleroma-fe!298
 2018-08-12 10:48:08 +00:00
lambda
a64fbe661f Merge branch 'fixSelectOptionStyling' into 'develop' 
Fixes selects having unreadable text on some browsers/OSes.

Closes #123

See merge request pleroma/pleroma-fe!296
 2018-08-12 10:47:19 +00:00
lambda
e21f78e519 Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop' 
Made it so that unfocused tab doesn't autostream posts when scrolled to the top

See merge request pleroma/pleroma-fe!299
 2018-08-12 10:45:36 +00:00
lambda
eeddceee6b Merge branch 'fixRelativeEmojis' into 'develop' 
Fixes broken custom emoji in autocomplete when proxying to remote BE

See merge request pleroma/pleroma-fe!300
 2018-08-12 10:44:39 +00:00
lambda
01c5bae594 Merge branch 'feature/emoji-in-profiles' into 'develop' 
Use serverside html rendering in usernames and bios if available.

See merge request pleroma/pleroma-fe!304
 2018-08-12 10:40:57 +00:00
lambda
fba757f595 Merge branch 'fix/remove-retweet-button-on-private-and-direct-posts' into 'develop' 
Do not show retweet button if post is followers-only or a DM

See merge request pleroma/pleroma-fe!303
 2018-08-12 10:32:40 +00:00
Hakaba Hitoyo
d1b3d7e90f debug 2018-08-11 14:54:30 +09:00
Hakaba Hitoyo
e2dae87772 update 2018-08-11 14:50:40 +09:00
Hakaba Hitoyo
b7d1bb39e0 update 2018-08-11 14:35:04 +09:00
Hakaba Hitoyo
23cfec4332 Update messages.js 2018-08-10 07:04:25 +00:00
Toromino
895ef525d2 Update status.vue 2018-08-09 16:47:08 +00:00
Toromino
01652fc252 Update retweet_button.js 2018-08-09 16:46:18 +00:00
Toromino
316692ee85 Update retweet_button.vue 2018-08-09 16:45:52 +00:00