Commit Graph

183 Commits

Author SHA1 Message Date
Henry Jameson
a806d43f05 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop: (60 commits)
  whoops
  whoops
  DM timeline: stream new statuses
  update-japanese-translation
  Add actual user search.
  incorporate most translation changes from MR 368
  update french translation
  Always show dm panel.
  Add direct message tab.
  api service url
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  On logout switch to public timeline.
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Put oauth text into description.
  Display OAuth login on login form button.
  ...
2018-11-26 05:21:58 +03:00
Henry Jameson
0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop: (36 commits)
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Count spoiler text in the character count. Fixes #135.
  Added Irish (Gaeilge) Language
  Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
  simplify code
  adapt to destructive change of api
  Adds Occitan locale
  Updated italian translation
  Update oc.json
  Update oc.json
  Update of the oc.json file Actualizacion del fichièr oc.json
  Sort messages object by language code so that it's easier from the UI to browse them.
  explicitly set collapseMessageWithSubject to undefined
  Fall back to instance settings consistently
  ...
2018-11-26 04:33:41 +03:00
Henry Jameson
9a9dc47fc5 better preview, collateral fixes 2018-11-26 03:19:04 +03:00
Henry Jameson
d7eec4c30d more styles 2018-11-26 00:23:07 +03:00
Henry Jameson
707441ffe6 more fonts 2018-11-25 22:06:49 +03:00
Henry Jameson
2f1070deb6 collateral fixes 2018-11-25 17:42:41 +03:00
Henry Jameson
621ab806e6 more default shadows, replaced original shadows with generated ones. maybe gotta
update fallbacks...
2018-11-21 21:23:07 +03:00
scarlett
d6ad08050a Fall back to instance settings consistently 2018-10-21 18:04:23 +01:00
Henry Jameson
96804d42f0 Some themeing is working!! 2018-10-07 19:59:22 +03:00
Henry Jameson
d5e82625d3 lint fix 2018-09-25 15:21:47 +03:00
Henry Jameson
ef968d8e1e now it actually works 2018-09-25 15:16:26 +03:00
shpuld
77e8933b2e Fix mistakes 2018-08-31 16:13:43 +03:00
shpuld
384c80e238 Change styles a bit, make pre-formatted blocks not overflow but scroll 2018-08-31 16:04:52 +03:00
shpuld
f07e6b271c Add styles for h1/2/3/4/5 tags in status html 2018-08-31 15:11:27 +03:00
Ekaterina Vaartis
d2640d4bb5 Add titles to source/expand buttons 2018-08-27 12:55:46 +03:00
Ekaterina Vaartis
14c1704ea1 Add titles to post visibility icons 2018-08-27 12:55:46 +03:00
scarlett
54ac0dfefd Preserve subject in replies. 2018-08-26 01:50:11 +01:00
scarlett
52ce86ed57 Don't use nsfw clickthrough if the post is collapsed by default. 2018-08-26 00:21:54 +01:00
scarlett
d50440d802 When a post with a subject is collapsed, hide its attachments. 2018-08-25 20:33:44 +01:00
scarlett
da96294866 Don't hide replies when inConversation. 2018-08-24 21:46:45 +01:00
scarlett
60b115320f Fix indentation 2018-08-24 20:19:22 +01:00
scarlett
50b3bd22e6 Remove old implementation of isReply. 2018-08-24 20:08:49 +01:00
scarlett
296ab54301 Add settings for changing the visibility of replies in the timeline. 2018-08-24 20:04:26 +01:00
ensra
3ec8e43a97 Rename expandCW to collapseMessageWithSubject.
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
ensra
671db023da fix indent 2018-08-20 03:08:39 +01:00
ensra
1121f32c48 Add support for configurable CW clickthrough. 2018-08-20 02:59:06 +01: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
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
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
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
Toromino
895ef525d2 Update status.vue 2018-08-09 16:47:08 +00:00
eal
876f7633fe Use serverside html rendering in usernames and bios if available. 2018-08-09 12:52:34 +03:00
Toromino
e60fde233b Update status.vue 2018-08-08 14:39:22 +00:00
dtluna
5cfc247c6b Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
This reverts merge request !301
2018-08-06 09:08:50 +00:00
dtluna
da36cd11e8 Hide all status actions if not logged in 2018-08-06 11:57:27 +03:00
Henry Jameson
3d72c2b964 fixed lint 2018-08-05 05:44:02 +03:00
Henry Jameson
b04a9d1229 cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling 2018-08-05 05:41:37 +03:00
Henry Jameson
6a81aa2745 added ability to pick the style of highlighting 2018-08-05 05:18:04 +03:00
lambda
17f6eb18e7 Revert "Merge branch 'cw-clickthrough' into 'develop'"
This reverts merge request !291
2018-07-12 07:20:39 +00:00
Henry Jameson
8ccebbe156 both bugs fixed. it's reactive and no more conflicting cards 2018-07-06 20:12:09 +03:00
Henry Jameson
fa8c221f3a moved style generator into separate file. notifications are highlighted too now. 2018-07-06 20:12:09 +03:00
Henry Jameson
f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Henry Jameson
148e691199 initial vers 2018-07-06 20:12:09 +03:00
Vivian Lim
158342fc39 Fix lint warnings 2018-06-29 00:10:17 -07:00
Vivian Lim
b0cf050797 Add configuration option to enable click-through content warnings 2018-06-28 23:39:55 -07:00
Vivian Lim
ab86e87e85 Also hide attachments behind clickthrough. 2018-06-28 23:39:01 -07:00
Vivian Lim
65edcaf4b9 Differentiate content warning block if it is on lightbg 2018-06-28 23:39:01 -07:00
Vivian Lim
b3e122d31f Carry forward content warnings in replies 2018-06-28 23:39:01 -07:00
Vivian Lim
0554cac113 Add click-to-show content warnings on posts 2018-06-28 23:39:01 -07:00