Commit Graph

2026 Commits

Author SHA1 Message Date
shpuld
960ed9540d Make use of template literals instead of string concat. 2017-02-25 14:34:05 +02:00
lambadalambda
bebd5c3328 Merge branch 'fix/improved-profile-background-color' into 'develop'
Make the profile background use a new calculated color using the theme

See merge request !33
2017-02-25 06:33:14 -05:00
shpuld
e9820326e3 Clean up whitespace 2017-02-25 13:19:37 +02:00
shpuld
536a7176df Make the profile background use a new calculated color using the theme 2017-02-25 13:13:08 +02:00
shpuld
142a8a1a76 Fix poor choice of colors for input/textarea borders, adjust login form padding. 2017-02-24 19:43:27 +02:00
shpuld
cac47f7128 Make user card buttons more light-theme friendly without compromising the dark ones. 2017-02-24 19:12:57 +02:00
shpuld
2bfd2190a0 Mark unread notifs with the red line, make read notifs base01 again, center the heading text and move the button to the right of the panel. 2017-02-24 18:53:53 +02:00
shpuld
9dfcf8a301 Align attachments with usercard, make buttons use theme colors, prettify login form, more border radii adjustment for consistency. 2017-02-24 17:32:41 +02:00
Hector A. Escobedo
c338940084 Fix syntax errors and hiding logic.
This has been tested.
2017-02-22 19:31:49 -05:00
Hector A. Escobedo
a7db72d7a7 Add setting to toggle NSFW hiding. 2017-02-22 18:39:56 -05:00
Roger Braun
b939f70d17 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-23 00:26:52 +01:00
Roger Braun
74931dece7 Revert "Show actual status in notifications when mentioned."
This reverts commit 0e1ab69c33.
2017-02-23 00:26:37 +01:00
lambadalambda
854faf905e Merge branch 'feature/user-card-improvements' into 'develop'
User card visual improvements

See merge request !29
2017-02-22 18:09:54 -05:00
Roger Braun
7c0f3ea666 Add setting to hide all attachments. 2017-02-23 00:04:47 +01:00
shpuld
9237f0b918 Removed unnecessary debug stuff 2017-02-23 00:39:41 +02:00
Roger Braun
0e1ab69c33 Show actual status in notifications when mentioned. 2017-02-22 23:37:12 +01:00
shpuld
715bfb3dca Make gradient use the theme colors, adjust user interction elements, make profiles without bg use a darker gray solid color to not drown out white text. 2017-02-23 00:24:37 +02:00
Roger Braun
9778d4cfc0 More eslint fixes. 2017-02-22 22:43:40 +01:00
Roger Braun
5abf857705 Style fixes. 2017-02-22 22:33:28 +01:00
shpuld
ede4d77cfd Move profile picture to right side, make the names appear next to it, extend profile background pic further and fade it out with gradients, fix the crappy borders around the inline user card. 2017-02-22 23:08:14 +02:00
shpuld
ded2d54cca Merged existing changes from 'develop' 2017-02-22 15:04:28 +02:00
shpuld
6c385ae80a Make drag&drop work on more browsers/platforms, make the Upload button accept drops as well. 2017-02-22 14:53:05 +02:00
lambadalambda
935c0e09c6 Merge branch 'fix/dont_display_following_when_logged_out' into 'develop'
Hide Follow-button and 'Follows you' text when not logged in

Closes #14

See merge request !27
2017-02-22 05:11:18 -05:00
shpuld
874f976531 Hide Follow-button and 'Follows you' text when not logged in 2017-02-22 11:54:09 +02:00
Roger Braun
892b826df5 Small style adjustment, add meta-enter posting. 2017-02-21 21:48:48 +01:00
Roger Braun
34a593aa27 Merge branch 'develop' into feature/drag_and_drop_for_media_upload 2017-02-21 21:30:16 +01:00
Roger Braun
40fe40d96b Better attachment removal styling. 2017-02-21 15:24:35 +01:00
Roger Braun
137a7e643d Remove flex from general attachments. 2017-02-21 15:24:05 +01:00
shpuld
ca71722c1e Files dropped into post_status_form text box get sent to media_upload for attachment upload, media_upload reorganized a bit to allow reuse of existing code. 2017-02-21 15:13:19 +02:00
shpuld
3d69a91aba cleanup/better naming 2017-02-21 10:22:04 +02:00
shpuld
c244067787 Use a red border for expanded statuses 2017-02-21 10:19:42 +02:00
Roger Braun
9763009d86 Merge branch 'feature/mutes' into develop 2017-02-20 18:06:01 +01:00
Roger Braun
9c1093b6ca Grab mutes from server on patched servers. 2017-02-20 18:01:45 +01:00
hakui
b29a094e38 set top and bottom padding on the bars to be equal because it was too top-heavy 2017-02-20 09:28:50 -06:00
Roger Braun
2933dc30a5 Only display 10 notifications at a time, 20 is too much. 2017-02-19 13:37:21 +01:00
Roger Braun
56e036b4de Add special case for mastodon user links.
They have a span embedded in the link, so let's look at the parent, too.
2017-02-19 13:25:30 +01:00
Roger Braun
04c4ad9a65 Open clicked links the statusnet_html in a new window. 2017-02-19 12:58:25 +01:00
Roger Braun
73f46bfba6 Merge branch 'clearnotifs' into develop 2017-02-19 12:28:36 +01:00
Roger Braun
df3ffdd905 Follow style guide (https://github.com/feross/standard) 2017-02-19 12:19:47 +01:00
Roger Braun
5f74ae8de5 Revert "removed break-line for links because it didn't seem to make sense"
This reverts commit 2f4d811079.
2017-02-19 12:13:56 +01:00
shpuld
2639427236 Ctrl-enter posts status 2017-02-19 01:41:51 +02:00
hakui
af91346328 changed to if-else to save on one line 2017-02-18 17:38:56 -06:00
hakui
14237cff77 clears notif number from title when marking as read 2017-02-18 17:33:00 -06:00
lambadalambda
6f98543b79 Merge branch 'link-wraparound-styling' into 'develop'
(practicing the new branch thing) url styling

See merge request !18
2017-02-18 15:03:30 -05:00
lambadalambda
c2178819a0 Merge branch 'fix/prevent_follow_mute_button_deforming' into 'develop'
Fix follow/mute buttons from getting squished on mobile

See merge request !17
2017-02-18 15:02:31 -05:00
Roger Braun
963a0035e5 Make page title dynamic, better notification handling. 2017-02-18 20:44:41 +01:00
hakui
1ccc9dd629 wrap long urls while not breaking normal words. also practicing the new branch thing 2017-02-18 12:51:47 -06:00
shpuld
8a0197d682 Fix follow/mute buttons from getting squished on mobile 2017-02-18 19:58:16 +02:00
shpuld
15c82dea62 moved around classes in the user-info css 2017-02-18 15:49:27 +02:00
shpuld
e86b1d71ee Changed following-info to user-interactions and moved muting there, made everything in user-interactions look a bit neater 2017-02-18 15:48:27 +02:00
hakui
2f4d811079 removed break-line for links because it didn't seem to make sense 2017-02-18 03:10:02 -06:00
hakui
a4592445a3 making link thumbnails fit the whole box 2017-02-18 02:58:44 -06:00
hakui
0faaeb02f3 fixed line-height for text box 2017-02-18 01:54:54 -06:00
hakui
734597b43f hello world 2017-02-18 01:48:35 -06:00
Roger Braun
cd0925747d Show current theme in theme selector. 2017-02-17 18:21:02 +01:00
Roger Braun
cdc90f8edc One more fix. 2017-02-17 10:33:35 +01:00
Roger Braun
6c631016c6 One more small visual fix to oembeds. 2017-02-17 10:20:12 +01:00
Roger Braun
eb7156de0d Fix oembed attachments. 2017-02-17 10:16:29 +01:00
Roger Braun
0be2051588 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-16 22:27:10 +01:00
Roger Braun
52dd7c009f Add Settings page. 2017-02-16 22:25:29 +01:00
Roger Braun
5481cf00a3 Make user profiles visible inline. 2017-02-16 15:58:49 +01:00
Roger Braun
832bd3cdd2 Fetch Public and TWKN timelines when viewed. 2017-02-16 11:17:47 +01:00
Roger Braun
1d64b76211 Add basic configuration module, make it work for title and theme. 2017-02-14 22:21:23 +01:00
Roger Braun
340b21475d Make temporarily unmuted posts hideable again. 2017-02-14 21:47:37 +01:00
Roger Braun
4c12de262f Add muting to statuses. 2017-02-14 00:01:50 +01:00
Roger Braun
66ef9f1328 Add users muting. 2017-02-13 23:22:32 +01:00
Roger Braun
038798f3f4 Prefer local image if available. 2017-02-05 23:37:24 +01:00
Roger Braun
2269e815e1 Make status expandable into conversation. 2017-02-04 13:53:28 +01:00
Roger Braun
b420b5838c Use statusOrConversation component in timeline. 2017-02-04 13:53:16 +01:00
Roger Braun
800b051a16 Add statusOrConversation component. 2017-02-04 13:53:07 +01:00
Roger Braun
5ec4f1b047 Extract conversation and create conversation page. 2017-02-04 13:52:26 +01:00
Roger Braun
ea25708bf3 Set color on status instead of on timeline. 2017-02-04 13:51:44 +01:00
Roger Braun
5a518fa817 Break after user name in notifications. 2017-01-26 12:03:07 +01:00
Roger Braun
3be7a3ea85 Align style switcher. 2017-01-17 14:41:13 +01:00
Roger Braun
d644887d4c Add styleSwitcher. 2017-01-16 18:57:03 +01:00
Roger Braun
afd90b84d0 User card background css fix. 2017-01-16 17:46:22 +01:00
Roger Braun
4448f36f62 User profile css fix. 2017-01-15 16:26:37 +01:00
Roger Braun
6c5b5eb52b Border css fix. 2017-01-15 15:53:55 +01:00
Roger Braun
fc7e13e7bb Add styling with base16.
Solarized-dark for now.
2017-01-15 15:44:56 +01:00
lambadalambda
eac8fe0c33 Merge branch 'feature/follow' into 'develop'
Feature/follow

See merge request !11
2017-01-01 12:11:55 -05:00
Roger Braun
8f494b14f0 Add unfollowing. 2016-12-23 16:45:57 +01:00
Roger Braun
2088b3c4dd Add returned user to store after following. 2016-12-23 16:16:02 +01:00
Jiayi Zheng
d98f730921 Fixes currentUser rights 2016-12-19 17:03:02 +01:00
Jiayi Zheng
c24e44a8f2 Fixes user right check 2016-12-08 20:26:05 +01:00
Roger Braun
fc268c48bc Very basic user following. 2016-12-08 09:09:21 +01:00
Jiayi Zheng
1c75feae60 Move delete button for status into a component 2016-12-07 21:50:46 +01:00
Roger Braun
7b5a30db14 Work around hotlinking restrictions. 2016-12-07 09:34:48 +01:00
Roger Braun
026ab7c1df Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2016-12-05 20:49:58 +01:00
lambadalambda
be5fe03972 Merge branch 'feature/delete_status' into 'develop'
Implements feature status delete

Fixes issue #4

See merge request !6
2016-12-05 07:09:35 -05:00
lambadalambda
3c702feaca Merge branch 'fix/retweet_icon_style' into 'develop'
Fixes issue #2

See merge request !7
2016-12-05 06:51:47 -05:00
Jiayi Zheng
75fdc72e22 Implements feature status delete
Fixes issue #4
2016-12-04 18:30:00 +01:00
Jiayi Zheng
75caa21132 Fixes issue #2 2016-12-04 16:28:07 +01:00
Roger Braun
58ac8f51a2 Treat mentions more like a timeline. 2016-12-03 12:43:21 +01:00
Roger Braun
01951d1251 Rename nsfw image. 2016-12-02 14:42:01 +01:00
Roger Braun
187c4a7d57 CSS fixes. 2016-12-02 14:33:03 +01:00
Roger Braun
6e608dd2dd Add re-hiding of nsfw images. 2016-12-02 14:22:42 +01:00
Roger Braun
df51d08814 Fix long word breaking in notifications. 2016-12-02 01:54:04 +01:00
Roger Braun
0df3ca47a4 Add link to replied to users in status. 2016-12-01 18:05:04 +01:00
Roger Braun
fcccb9df68 Add basic user profiles. 2016-11-30 23:32:22 +01:00
Roger Braun
83a376a254 Extract user card from user content. 2016-11-30 22:27:19 +01:00
Roger Braun
aa4a9fb24f Get mentioning names from central state store. 2016-11-30 18:30:43 +01:00
Roger Braun
5badc930c9 Search through both name and screen_name. 2016-11-30 17:07:50 +01:00
Roger Braun
e1d6174689 Add basic username completion.
We need to get users into the store, though.
2016-11-30 13:39:17 +01:00
Roger Braun
bb1b3c3975 Remove Angular vestiges. 2016-11-28 21:07:48 +01:00
Roger Braun
b839ad95c5 Throw out retweets from conversations. 2016-11-28 18:01:23 +01:00
Roger Braun
cc00eb898f Switch from moment.js to vue-timeago.
Much smaller filesize for vendor.js, although we'll have to see if all
the intervals are ok.
2016-11-28 17:37:47 +01:00
Roger Braun
2f7e5c8770 Always show action buttons below user content. 2016-11-28 16:10:03 +01:00
Roger Braun
c9604eec9d Fetch conversation again on route change.
This might happen when you visit other convos via the notifications bar.
2016-11-28 13:36:19 +01:00
Roger Braun
1190b439b3 The heading is already bold. 2016-11-27 20:19:53 +01:00
Roger Braun
0cbd145a5a Add some icons to notifications. 2016-11-27 20:00:44 +01:00
Roger Braun
e8c85434b7 Add basic notification support. 2016-11-27 19:44:56 +01:00
Roger Braun
4228f49e7b Open external status links in new window. 2016-11-27 15:17:11 +01:00
Roger Braun
6c2941dba0 Basic mention support.
I still have to think about how to integrate them in the state system...
2016-11-26 21:09:41 +01:00
Roger Braun
8cd1c690ca Hide timeline if user isn't logged in. 2016-11-26 19:29:01 +01:00
Roger Braun
215e51f764 Move some interactions to the backendInteractor
The idea is that all interactions should move there, so components
don't have to pass around credentials all the time.
2016-11-26 18:57:08 +01:00
Roger Braun
b812adf0ba Move submitDisable into data.
It's not a prop, these are only for passing data, not for local data.
2016-11-26 12:38:33 +01:00
dtluna
cb940a8742 Merge branch 'develop' into 'feature/attachment-form-improvements'
# Conflicts:
#   src/components/attachment/attachment.js
2016-11-25 21:02:53 -05:00
dtluna
01edb7dbe4 Add remove attachment button 2016-11-26 05:00:06 +03:00
dtluna
6f0c73c30a Added previews for videos and audios 2016-11-26 03:19:25 +03:00
dtluna
4f8d476a2b Add fileTypeService 2016-11-25 20:21:25 +03:00
Roger Braun
1be1d7563c Greentext. 2016-11-25 17:34:59 +01:00
Roger Braun
b515586485 Show link to status source url. 2016-11-25 17:34:41 +01:00
Roger Braun
5986afbb20 Re-indent style. 2016-11-25 17:20:06 +01:00
Roger Braun
08393b8580 Fix word wrapping on Firefox.
Also, move some css around.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1136818 for the word
wrapping stuff.
2016-11-25 13:42:33 +01:00
dtluna
96b4997492 Disable the submit button while uploading attachment 2016-11-25 01:07:21 +03:00
Roger Braun
c8d25eab61 Image CSS fix for Firefox. 2016-11-24 20:49:30 +01:00
Roger Braun
b645f1d0ba Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2016-11-24 18:38:36 +01:00
Roger Braun
4f0155c5eb Timeline status adding fixes.
Don't show new statuses immediately if we already have something in there.
2016-11-24 18:31:18 +01:00
Roger Braun
2341a3692a Add link to conversation in status. 2016-11-24 18:19:01 +01:00
Roger Braun
e245074ef7 Add status / conversation component.
And wire it up.
2016-11-24 18:17:09 +01:00
Roger Braun
81c6f6e21f Remove example component. 2016-11-24 18:14:54 +01:00
dtluna
93be453037 Set cursor to hand when hovering over buttons 2016-11-23 01:58:25 +03:00
dtluna
3210283ae2 Add audio player 2016-11-22 21:45:18 +03:00
Roger Braun
2147807fa0 Add image height css back in.
Without it, Chrome stretches the image...
2016-11-22 15:44:45 +01:00
Roger Braun
7e17600ee9 Small css fix, don't parse html for now. 2016-11-18 00:43:36 +01:00
lambadalambda
a9d65a488f Merge branch 'feature/image-upload-improvements' into 'master'
Feature/image upload improvements

See merge request !2
2016-11-14 15:11:05 -05:00
Alexander Gitter
7d3a6e77e4 Show spinner while uploading file 2016-11-13 18:26:10 +01:00
Jiayi Zheng
53fed694df Refactor css
Apply different styles to reply, retweet and favorite buttons
2016-11-13 17:52:20 +01:00
Jiayi Zheng
11125abeeb Implement retweet action 2016-11-13 17:09:16 +01:00
Jiayi Zheng
242ae8e91b Add retweet button component
Expand API service for retweet
2016-11-13 16:42:56 +01:00
Roger Braun
c9ab70db8e Login form, post status form, status css fixes. 2016-11-12 21:31:41 +01:00
Roger Braun
f0f5d8c913 CSS fixes for attachments in status posts. 2016-11-12 21:05:01 +01:00
Roger Braun
4d6d916395 Some CSS fixes. 2016-11-12 20:57:54 +01:00
Roger Braun
66a936ea50 Add user links. 2016-11-07 16:42:29 +01:00
Roger Braun
f529c36a9c Force recreation of img node. 2016-11-07 16:23:54 +01:00
Roger Braun
d59f2985bd Attachment styling fixes. 2016-11-07 15:23:10 +01:00
Roger Braun
93eb6671c6 Linting fixes. 2016-11-07 15:04:27 +01:00
Roger Braun
d65112a625 Fix poststatusform attachment markup. 2016-11-07 15:04:02 +01:00
Roger Braun
cf972e968c Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe 2016-11-07 11:56:14 +01:00
Roger Braun
83e7add2c7 Add TWKN timeline. 2016-11-06 21:46:01 +01:00
Roger Braun
7fcd36e2c1 Don't show actions when not logged in. 2016-11-06 20:45:26 +01:00
Roger Braun
c9e235f889 Load timeline once on creation. 2016-11-06 20:11:00 +01:00
Roger Braun
521c815251 Add NavPanel. 2016-11-06 20:10:20 +01:00
Roger Braun
e21a60096c Add media upload to PostStatusForm. 2016-11-06 19:30:35 +01:00
Roger Braun
a73916dd7f Add MediaUpload component. 2016-11-06 19:28:37 +01:00
Roger Braun
e1103f04a4 Add fetching of older statuses. 2016-11-06 17:44:05 +01:00
Roger Braun
15800bab57 Add mp4 to attachments. 2016-11-06 17:43:31 +01:00
Roger Braun
acc439f266 Attachment CSS fixes. 2016-11-04 12:55:09 +01:00
Roger Braun
572aceb7e7 Hide after posting. 2016-11-03 17:35:49 +01:00
Roger Braun
9ff8bf4c14 Make mention strings work. 2016-11-03 17:17:32 +01:00
Roger Braun
7e2c52b12c Add replies. 2016-11-03 16:59:27 +01:00
Roger Braun
78538da82f Track status lists by id. 2016-11-03 16:59:06 +01:00
Roger Braun
1ef6cac272 Attachment styling fixes. 2016-11-03 16:58:50 +01:00
Roger Braun
72877b5c06 CSS fixes. 2016-11-02 18:38:30 +01:00
Roger Braun
7980558461 Basic status posting. 2016-10-30 16:54:44 +01:00
Roger Braun
8630f91a13 Add favorite-button. 2016-10-30 16:12:35 +01:00
Roger Braun
a7ce51b4b0 Go to friends timeline on login. 2016-10-30 14:25:18 +01:00
Roger Braun
500b704c0f Fix up nsfw and some styling. 2016-10-29 01:38:41 +02:00
Roger Braun
5f69014575 Basic attachments, some retweet fixes. 2016-10-28 18:08:03 +02:00
Roger Braun
eab256a7e5 New status showing. 2016-10-28 15:40:13 +02:00
Roger Braun
534f2e8195 Basic statuses. 2016-10-28 15:19:42 +02:00
Roger Braun
7ce6bbcf30 Fix user panel bg image. 2016-10-28 14:26:23 +02:00
Roger Braun
51c0b6dfd3 Add LoginForm. 2016-10-27 18:02:41 +02:00
Roger Braun
a7ea9c5195 Add UserPanel. 2016-10-27 18:02:28 +02:00
Roger Braun
4c2764c747 . 2016-10-26 19:03:55 +02:00
Roger Braun
191c02af1e Basic skeleton 2016-10-26 16:46:32 +02:00