Commit Graph

416 Commits

Author SHA1 Message Date
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
8d4d8b6b6c Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-22 10:32:59 +01:00
Roger Braun
aa3512205d Only save every minute. 2017-02-22 10:32:44 +01: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
Roger Braun
7661357cf6 Merge branch 'develop' into feature/hash-routed 2017-02-21 11:48:55 +01:00
Roger Braun
abc9f06d93 Use runtime only build. 2017-02-21 11:48:08 +01:00
Roger Braun
b98cfbfade Merge branch 'develop' into feature/hash-routed 2017-02-21 11:24:01 +01: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
5d8b2eb8b5 Merge branch 'develop' into feature/hash-routed 2017-02-20 18:58:18 +01:00
Roger Braun
73afa8e075 Save notifications again. 2017-02-20 18:54:30 +01:00
Roger Braun
6e388c0126 Compress saved state with zlib. 2017-02-20 18:54:09 +01:00
Roger Braun
ce6fb91501 Throttle saving data, once every 5 seconds is enough. 2017-02-20 18:38:18 +01:00
Roger Braun
ebf9fe6a98 Pull in persistence plugin, don't blow up on full storage. 2017-02-20 18:25:19 +01:00
Roger Braun
9763009d86 Merge branch 'feature/mutes' into develop 2017-02-20 18:06:01 +01:00
Roger Braun
8429de22e8 Remove notification persistence for now.
Seems to blow things up.
2017-02-20 18:02:50 +01:00
Roger Braun
9c1093b6ca Grab mutes from server on patched servers. 2017-02-20 18:01:45 +01:00
Roger Braun
3fd0d0d1cb Revert "Remove state persistence for now."
This reverts commit 9cf438f1b2.
2017-02-20 17:49:43 +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
shpuld
7e094a9880 Remove padding from timeline container and panel margins when in mobile mode 2017-02-20 12:46:20 +02:00
Roger Braun
9cf438f1b2 Remove state persistence for now.
Makes chrome really slow and adds problems with tab synchronization.
2017-02-19 14:25:31 +01: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
8fb0ec985a Fix button hover in Firefox. 2017-02-19 12:27:59 +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
6dbdd322aa Merge branch 'feature/top_bar_scrolls_to_top' into 'develop'
Feature/top bar scrolls to top

See merge request !19
2017-02-18 16:00:06 -05:00
shpuld
7b6719b96d @click on top nav makes window scroll to top 2017-02-18 22:55:16 +02:00
Roger Braun
b5d7a179c4 Reverse title and notification count. 2017-02-18 21:43:26 +01: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
209e8614b0 Don't add notifications twice + persiste them. 2017-02-18 20:56:03 +01:00
Roger Braun
963a0035e5 Make page title dynamic, better notification handling. 2017-02-18 20:44:41 +01:00
hakui
2aea6c4b09 increased leading for expanded view's header 2017-02-18 13:18:00 -06: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
Roger Braun
4e366f27a1 Use percentages for main view flex-basis. 2017-02-18 13:02:50 +01: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
9d0d1f7de1 Merge branch 'develop' into feature/hash-routed 2017-02-18 01:19:44 +01: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
2e874933a5 Navbar fixes. 2017-02-16 22:36:09 +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
34bc38f0bf Add settings page to app. 2017-02-16 22:25:41 +01:00
Roger Braun
52dd7c009f Add Settings page. 2017-02-16 22:25:29 +01:00
Roger Braun
f25ae61c5d Merge branch 'develop' into feature/hash-routed 2017-02-16 17:49:11 +01:00
Roger Braun
ce5b3d4c92 Add logo. 2017-02-16 17:44:36 +01:00
Roger Braun
a3b2be09b3 Add /cyb/ background by sonyam. 2017-02-16 16:59:06 +01:00
Roger Braun
5481cf00a3 Make user profiles visible inline. 2017-02-16 15:58:49 +01:00
Roger Braun
ae388d7927 Be strict about putting changes in mutations. 2017-02-16 14:23:59 +01:00
Roger Braun
e892fffda7 Correctly calculate the newStatusesCount.
Fixes a bug when viewing an updating twkn while logged in.
2017-02-16 12:51:24 +01:00
Roger Braun
832bd3cdd2 Fetch Public and TWKN timelines when viewed. 2017-02-16 11:17:47 +01:00
Roger Braun
370468bd6a Persist users. 2017-02-14 22:42:13 +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
f9b3f8df84 Add all_following endpoint. 2017-02-13 22:55:38 +01:00
Roger Braun
319af91a47 Merge branch 'develop' into feature/hash-routed 2017-02-05 23:37:56 +01:00
Roger Braun
038798f3f4 Prefer local image if available. 2017-02-05 23:37:24 +01:00
Roger Braun
670298cca1 Merge branch 'develop' into feature/hash-routed 2017-02-04 13:57: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
b98a6fe5bc Fix file uploads in Chrome. 2017-01-21 00:00:05 +01:00
Roger Braun
e81b3ea245 Fix style setting in Chrome. 2017-01-20 23:59:54 +01:00
Roger Braun
51473f0484 Fix file uploads in Chrome. 2017-01-20 23:58:58 +01:00
Roger Braun
1a5ec7484e Fix style setting in Chrome. 2017-01-20 23:39:38 +01:00
Roger Braun
c6f266302f Merge branch 'develop' into feature/hash-routed 2017-01-17 20:55:53 +01:00
Roger Braun
c7a375068d Basic mobile panel switcher. 2017-01-17 17:27:39 +01:00
Roger Braun
3be7a3ea85 Align style switcher. 2017-01-17 14:41:13 +01:00
Roger Braun
ef094764cb Fix avatar size. 2017-01-17 13:27:11 +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
b65a29aa07 Dynamic style setting. 2017-01-16 17:44:26 +01:00
Roger Braun
1687d7de2e Add some half-transparent border under main content. 2017-01-15 19:27:23 +01:00
Roger Braun
198eee82be Merge branch 'develop' into feature/hash-routed 2017-01-15 18:56:27 +01:00
Roger Braun
4448f36f62 User profile css fix. 2017-01-15 16:26:37 +01:00
Roger Braun
224fe580ca Merge branch 'develop' into feature/hash-routed 2017-01-15 15:59:28 +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
Roger Braun
929d4d75b4 Use hash routing. 2017-01-02 22:30:11 +01:00
Roger Braun
590782701d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-01-01 18:12:20 +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
c1d0b04105 Make minVisibleId actually dependent on visible statuses. 2017-01-01 18:10:25 +01: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
ed0d02b0ad Merge branch 'develop' into fix/refactoring_status_delete 2016-12-08 20:29:06 +01:00
Jiayi Zheng
c24e44a8f2 Fixes user right check 2016-12-08 20:26:05 +01:00
Roger Braun
7978ffeb1d Check all statuses in timeline for old retweets.
This will fix the problem of retweets showing up again and again.
2016-12-08 12:45:09 +01:00
Roger Braun
fc268c48bc Very basic user following. 2016-12-08 09:09:21 +01:00
Roger Braun
f18f87747f Also add retweeted users to user store. 2016-12-08 09:08:59 +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
Roger Braun
f7e9f17e4c Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2016-12-05 19:09:11 +01:00
Roger Braun
d0e91abe5a Remove wrong rights check. 2016-12-05 13:14:40 +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
917917596f Only add mentions to the mentions timeline once. 2016-12-03 12:48:37 +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
4c5d60ab85 Reactivity fixes for attachments. 2016-12-01 18:05:20 +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
dcb9a5fa17 Add friend list fetching. 2016-11-30 21:27:25 +01:00
Roger Braun
aa4a9fb24f Get mentioning names from central state store. 2016-11-30 18:30:43 +01:00
Roger Braun
25ecac846f Add users repository in users module. 2016-11-30 18:29:44 +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
9681bb7bfd Add noIdUpdate option for addNewStatuses action.
This fixes #11.
2016-11-28 21:25:36 +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
6fad01339c Add some cheap transition anymation. 2016-11-28 14:35:21 +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
e1c5030311 Add notification on mention. 2016-11-27 19:11:05 +01:00
Roger Braun
51988e75b6 Add repeat notifications. 2016-11-27 18:57:33 +01:00
Roger Braun
ff93d1edee Parse mastodon favorites. 2016-11-27 18:54:17 +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
56dc34977e remove apiService from users module 2016-11-26 19:12:09 +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
1d8c813135 Better handling of favorites. 2016-11-25 16:56:08 +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
ce0071d6e0 Remember positions on scroll. 2016-11-24 18:24:35 +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
18c11e405a Add status and conversation fetching to apiService. 2016-11-24 18:16:20 +01:00
Roger Braun
a5f523922c Make timelineless status adding possible. 2016-11-24 18:15:34 +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
fd4cd6d687 Prepare apiService for base url. 2016-11-22 15:45:40 +01: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
38749e6c4a Remove commented out old api service. 2016-11-22 15:15:43 +01:00
Roger Braun
362b6200c5 Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe 2016-11-22 11:29:52 +01:00
Roger Braun
281c71b191 Move addNewStatuses code around. 2016-11-21 16:33:08 +01:00
Roger Braun
05f9e68dab Fixes for deletion. 2016-11-19 13:08:44 +01:00
Roger Braun
47ddf8c3fb Small status reducer changes. 2016-11-19 12:39:10 +01:00
Roger Braun
de25c46670 addNewStatuses: mutation -> action
This is to add the current user.
2016-11-18 22:56:20 +01:00
Roger Braun
e7637e4196 Add first notification.
This adds a favorite notification.
2016-11-18 22:55:04 +01:00
Roger Braun
4cef86f2a8 Add status deletion.
Kind of wonky. Would be better if we used the AS endpoints.
2016-11-18 22:25:42 +01:00
Roger Braun
11dd084835 Merge branch 'status_reducer_rewrite' 2016-11-18 20:13:12 +01:00
Roger Braun
9171b382fe Complete rewrite of status adding code.
This now uses nearly only mutation, to take advantage
of vue's mutation tracking.
2016-11-18 19:48:02 +01:00
Roger Braun
8723c35d43 A bit more advanced status merging. 2016-11-18 16:05:04 +01:00
Roger Braun
7e17600ee9 Small css fix, don't parse html for now. 2016-11-18 00:43:36 +01:00
Roger Braun
4fcb60487c Do more mutation-y status reducing. 2016-11-17 18:31:26 +01:00
Roger Braun
d10a58f26a Some reducer changes for statuses. 2016-11-15 10:35:16 +01:00
Roger Braun
d4284686fa Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/retweet 2016-11-14 21:11:27 +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
Roger Braun
aeb8868b82 prepareStatus: created_at_parsed. 2016-11-13 22:54:49 +01:00
Roger Braun
59647798b9 prepareStatus: nsfw tag parsing. 2016-11-13 22:40:33 +01:00
Roger Braun
5888697c0d Better maxId calculation. 2016-11-13 22:19:14 +01: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