Commit graph

559 commits

Author SHA1 Message Date
Shpuld Shpuldson e0e8965c08 update branch and fix merge conflicts 2017-06-15 23:25:19 +03:00
Shpuld Shpuldson 7d46e3965d Fix meta-enter hotkey on osx 2017-06-15 22:21:14 +03:00
Roger Braun b562337695 Update vue. 2017-06-13 15:01:32 +02:00
Roger Braun e663420260 Fix notification deletion. 2017-06-13 12:01:47 +02:00
Roger Braun 48a6d2e987 Don't use too advanced features. 2017-06-12 17:35:04 +02:00
Roger Braun bbb9a9c93c Fetch user from timeline. 2017-06-12 17:07:10 +02:00
Roger Braun 5328aca1ef Use userId in timeline. 2017-06-12 16:34:41 +02:00
Roger Braun bda0a76c89 Clear timeline on user change. 2017-06-12 16:30:56 +02:00
Roger Braun 2e7029b670 Display user timeline 2017-06-12 16:20:02 +02:00
Roger Braun 090148ef60 Start fetching user timelines. 2017-06-12 16:00:46 +02:00
Roger Braun 85cf036acd Fix race condition in color calculation. 2017-06-12 15:59:54 +02:00
lambadalambda fc341aa40d Merge branch 'feature/reply-previews' into 'develop'
Reply previews in conversations

See merge request !89
2017-06-07 12:18:55 -04:00
Roger Braun 0effef236a Small cleanup. 2017-06-07 18:15:15 +02:00
Shpuld Shpuldson dcd7d52eb5 lint fix 2017-06-07 18:13:24 +03:00
Roger Braun 9982296866 Don't crash on unknown status deletion. 2017-06-07 17:03:14 +02:00
Shpuld Shpuldson f915ae174d Add floating status-previews on reply-link mouseover in conversations and make them optional in the settings, fix a small visual inconsistency in muted statuses while editing the file already.. 2017-06-07 17:58:24 +03:00
Roger Braun 72de959221 Remove notifications for deleted messages. 2017-06-06 15:54:08 +02:00
lambadalambda 449a466ef2 Merge branch 'feature/two-way-reply-navigation' into 'develop'
Feature/two way reply navigation

See merge request !88
2017-06-05 06:19:41 -04:00
Roger Braun 9af18e014d Re-use conversation property. 2017-06-05 12:15:30 +02:00
Shpuld Shpuldson 64a7db1d8b Change replies element flex to cover more width if needed. 2017-06-05 12:03:32 +03:00
Shpuld Shpuldson 12000536aa remove commented lines, make linter happy 2017-06-05 00:02:14 +03:00
Shpuld Shpuldson 4fabeda3ec Add list of replies under the name/links in conversation statuses, clicking them will highlight the statuses and scroll you to them, expanding a status will scroll you to that status once the conversation has opened. 2017-06-04 23:58:15 +03:00
lambadalambda a4493f05d3 Merge branch 'feature/toggleable-user-finder-navbar' into 'develop'
Feature/toggleable user finder navbar

See merge request !87
2017-06-04 04:19:51 -04:00
Shpuld Shpuldson d82fa5516b remove whitespace 2017-06-03 23:52:23 +03:00
Shpuld Shpuldson bac1d3bd57 Move user-finder into navbar and hide it behind a toggle button, update fontello icons with user-plus and menu. 2017-06-03 23:42:54 +03:00
Shpuld Shpuldson c0b08d508c Merge branch 'feature/autoloading-when-scrolled-to-bottom' into 'develop'
Hotfix for firefox to prevent loading on every scroll event.

See merge request !86
2017-06-03 12:59:05 -04:00
Shpuld Shpuldson 67452923a5 Hotfix for firefox to prevent loading on every scroll event. 2017-06-03 19:53:23 +03:00
lambadalambda dcf030470d Merge branch 'feature/autoloading-when-scrolled-to-bottom' into 'develop'
Automatic loading/infinite scrolling

See merge request !85
2017-06-03 12:30:51 -04:00
Shpuld Shpuldson 65646c5a12 Add an option to initiate fetching older statuses automatically when scrolled 750 pixels or less from the bottom. 2017-06-03 18:51:55 +03:00
Roger Braun e901e064de Key notifications so the open reply windows won't switch places. 2017-06-02 17:04:59 +02:00
lambadalambda db234bc293 Merge branch 'feature/tooltips-for-notifications-repeats' into 'develop'
User name tooltips for notifications and repeats

See merge request !84
2017-06-02 06:34:10 -04:00
Shpuld Shpuldson 24b7d7d9d4 Add mouseover tooltips for names in notif headings and timeline repeats, make the timeline repeat name into a link to the repeater profile and use the word 'repeat' instead of 'retweet'. 2017-06-02 13:05:03 +03:00
lambadalambda b92be6a7ef Merge branch 'feature/status-improvement-cleanup' into 'develop'
Status improvements and cleanup

See merge request !83
2017-06-01 11:50:00 -04:00
lambadalambda 934bbd16f1 Merge branch 'feature/autoresize-post-status-form' into 'develop'
Make text input grow to a minimum height of 3 lines on focus

See merge request !82
2017-06-01 11:25:12 -04:00
Shpuld Shpuldson c149330e50 Fix bugginess with heading links overlapping icons on the right. 2017-06-01 17:50:09 +03:00
Shpuld Shpuldson 52e6b470be Revert some of those mobile optimizations, breaks mention notifs. 2017-06-01 17:43:37 +03:00
Shpuld Shpuldson d063607b9d Mobile optimizations. 2017-06-01 17:35:00 +03:00
Shpuld Shpuldson 807c0d1464 Remove silly opacity from timestamp, make unmute icon line up with the rest better. 2017-06-01 01:11:57 +03:00
Shpuld Shpuldson ea8a700796 Move a bunch of status-related styles from App to status component, alter status header layout for better user experience hopefully, make status actions placing more consistent, adjust margins. 2017-06-01 01:02:04 +03:00
Shpuld Shpuldson b6b0a221c6 please the linter 2017-05-31 17:43:43 +03:00
Shpuld Shpuldson 7447f7c64d Set minimum height of 3 lines for textarea on focus, make it reset on post. 2017-05-31 17:36:22 +03:00
lambadalambda 9723d7285d Merge branch 'feature/notification-improvements' into 'develop'
Feature/notification improvements

See merge request !79
2017-05-31 08:16:43 -04:00
lambadalambda bf7190bfca Merge branch 'feature/custom-timestamps' into 'develop'
Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago'

See merge request !80
2017-05-31 08:03:10 -04:00
lambadalambda d44d88da1c Merge branch 'feature/autoresize-post-status-form' into 'develop'
Make post-status-form textarea automatically resize to fit the input.

See merge request !81
2017-05-31 08:02:31 -04:00
Shpuld Shpuldson 5465791372 eslint fix 2017-05-31 14:11:07 +03:00
Shpuld Shpuldson e704e1daaf Make post-status-form automatically resize to fit the input. 2017-05-31 14:02:54 +03:00
Shpuld Shpuldson 3a1ae3a30e Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' 2017-05-31 12:45:03 +03:00
Shpuld Shpuldson 960577ca28 Revert main.js to what it was in develop 2017-05-31 12:07:21 +03:00
Shpuld Shpuldson 1b79ae09e0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/notification-improvements 2017-05-31 11:58:32 +03:00
Shpuld Shpuldson 5ad4d043e7 Enable reply/rt/fav for mention notifications by using a barebones status in place of plain notification content. 2017-05-31 11:47:18 +03:00