Commit graph

726 commits

Author SHA1 Message Date
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
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
Shpuld Shpuldson e621be1428 Cut notification header length from 3 lines to 1. 2017-05-30 00:24:08 +03:00
Roger Braun d389d3a763 Copy cool retweet look. 2017-05-22 13:50:10 +02:00
Roger Braun 76624c9e4b Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-05-12 18:54:33 +02:00
Roger Braun 2ec7069b3c Add user finder. 2017-05-12 18:54:12 +02:00
Roger Braun 48725ff9d0 Make linter happy. 2017-04-24 20:34:36 +02:00
Roger Braun 32d1d2178a Make linter happy. 2017-04-24 20:34:06 +02:00
Roger Braun 3fdc420990 Merge branch 'develop' into feature/hash-routed 2017-04-24 20:31:08 +02:00
Roger Braun 0c41adccff Remove tributejs
Alternative autocompletion is in the works and this one has injection problems.
2017-04-24 20:30:09 +02:00
Shpuld Shpuldson c2db700544 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/hash-routed 2017-04-21 19:15:54 +03:00
Shpuld Shpuldson 143aa3b990 Started captcha and better avatar control, improved login form to fit register link better. 2017-04-21 18:52:42 +03:00
Shpuld Shpuldson b3b6d43dcc Add ToS field into registration form (still need to make it fetch it somewhere.) Make the register form look more polished. 2017-04-17 13:57:02 +03:00
Shpuld Shpuldson 88309b446f Adjust attachment preview margins. 2017-04-17 11:42:33 +03:00
Shpuld Shpuldson a3a9d8edd1 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/post-form-improvement 2017-04-17 11:21:40 +03:00
Shpuld Shpuldson 6b75874136 Move attachments below buttons to prevent the buttons from shifting after uploading. 2017-04-17 11:18:06 +03:00
Roger Braun ce896d393b Fix linting. 2017-04-17 10:12:30 +02:00
Shpuld Shpuldson ca8755a6f3 Make X icon parent position: relative; to prevent it from floating on its own. 2017-04-17 10:45:12 +03:00
Roger Braun dede7f7f2f Update existing currentusers if there is one. 2017-04-16 16:05:13 +02:00
Roger Braun 37c10be5e2 Add basic avatar changing. 2017-04-16 13:44:11 +02:00
Roger Braun 55edd6d8c2 Restore old media upload endpoint. 2017-04-16 11:15:06 +02:00
Roger Braun 4228cfc342 Add email field to registration. 2017-04-16 11:02:03 +02:00
Roger Braun a766e886f5 Add a registration form. 2017-04-15 18:29:46 +02:00
Roger Braun 6d7fcb057d Add missing route-link end tags. 2017-04-14 22:08:08 +02:00
Shpuld Shpuldson ea184f33b0 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/reply-navigation 2017-04-14 16:11:09 +03:00
Shpuld Shpuldson c708ebb5d2 Fix statusoid == undefined bug that prevented conversation opening in new tabs. 2017-04-14 15:58:34 +03:00
lambadalambda dcced2d2e1 Merge branch 'feature/sidepanel-independent-scrolling' into 'develop'
Sidepanel independent scrolling

See merge request !72
2017-04-14 07:50:45 -04:00
Shpuld Shpuldson e64905d88b Change attachments margin to not cause the element to overflow. 2017-04-14 13:43:53 +03:00
Shpuld Shpuldson 2efddaf874 Tweak values to minimize distracting artifacting when scrollbars are smaller or don't exist. 2017-04-13 23:36:16 +03:00
Shpuld Shpuldson 69ef9101d4 Fix login screen, (remove one duplicate line from user card css). 2017-04-13 17:57:20 +03:00
Shpuld Shpuldson f1764796e1 Fixed flex issue between 980 and 960 pixels width 2017-04-13 17:01:18 +03:00
Shpuld Shpuldson ff9142d7ab Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/sidepanel-independent-scrolling 2017-04-13 16:32:15 +03:00
Shpuld Shpuldson 83205b8c0e Make sidepanel scroll independently from timeline, allows for seeing notifications and posting new statuses even when scrolled deep down. 2017-04-13 16:17:57 +03:00
lambadalambda 7a948ba3a5 Merge branch 'feature/reply-navigation' into 'develop'
Reply navigation (up only)

See merge request !70
2017-04-12 13:14:43 -04:00
Shpuld Shpuldson d8a01454dc another lint fix 2017-04-12 19:10:38 +03:00
Shpuld Shpuldson c989170321 lint fixes 2017-04-12 19:07:55 +03:00
Shpuld Shpuldson 3f477986cf Removed smooth scrolling, does not work in other browsers than FF 2017-04-12 18:47:47 +03:00
Shpuld Shpuldson a675cfbb3e Goto-original-arrow button now sets conversation highlight/focus even when inline, setting focus now scrolls you to the focused post smoothly. Hide the arrow button when not expanded. 2017-04-12 18:25:19 +03:00
wakarimasen 66b59f2752 Fix daily average on accounts younger than a day 2017-04-11 11:47:19 +02:00
Roger Braun 36655002d0 Merge branch 'develop' into feature/hash-routed 2017-04-09 22:23:14 +02:00
Roger Braun cd959d9df8 Remove completely empty words. 2017-04-09 22:15:49 +02:00
Roger Braun 40b607bdea Set state to loaded if it crashes while loading. 2017-04-09 22:15:35 +02:00
Roger Braun 1ea19dcf1d Take unmuting out of expandable condition. 2017-04-09 16:39:19 +02:00
Roger Braun e531c78079 Only persist state after we loaded one. 2017-04-09 16:30:21 +02:00
Roger Braun a53555254a Add word-based muting to settings / statuses. 2017-04-09 15:53:23 +02:00
lambadalambda f3ca011fbe Add chrome picture stretching fix back in. 2017-04-09 08:26:30 -04:00
Shpuld Shpuldson 05dfd96571 Revert nsfw image sizing, give attachments max-height to reduce scrolling 2017-04-09 14:28:21 +03:00
Shpuld Shpuldson 39a6867557 Make muted notifications take much less space (handy for bot spam). 2017-03-30 15:11:32 +03:00
Roger Braun 44923afbee Make linter happy. 2017-03-15 17:14:51 +01:00
Roger Braun 5249b1d23a Add basic mention completion. 2017-03-15 17:08:17 +01:00
Roger Braun 024230c7f4 Basic word position and completion service. 2017-03-15 16:22:36 +01:00
Shpuld Shpuldson 0c7450252a Merge branch 'fix/small-buttons-chrome-tweak' into 'develop'
Fix the appearance of 'Read'/'Show new' buttons on Chrome

See merge request !65
2017-03-11 12:44:44 -05:00
Shpuld Shpuldson d427eaca90 Merge branch 'feature/daily-avg' into 'develop'
Add a daily post average to the user card

See merge request !63
2017-03-11 06:48:17 -05:00
shpuld 9061fa36ac Change the small buttons (Read and Show new) to look better on chrome and other non-firefox browsers. 2017-03-11 03:23:34 +02:00
shpuld 21111878be Give link attachments a rounded border, give images and links base03 border. 2017-03-10 23:28:55 +02:00
wakarimasen fe5082023d Add a daily post average to the user card 2017-03-10 21:37:13 +01:00
lambadalambda 9e42472679 Merge branch 'fix/make-nav-panel-not-so-bright' into 'develop'
Change the base16 colors used by the navpanel

See merge request !61
2017-03-10 09:58:05 -05:00
shpuld c1681d53ba Add a border to conversation heading to add distinction between it and a hilighted post. (TODO: add the same base03-border to all headings for consistency's sake if it looks alright?) 2017-03-10 15:26:36 +02:00
Roger Braun 112adcf8f8 Merge branch 'develop' into feature/hash-routed 2017-03-10 13:27:58 +01:00
wakarimasen 896de016ad Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop 2017-03-10 12:38:47 +01:00
shpuld 3bb5f86d0d Use conditional class for reply icon color. 2017-03-10 00:49:22 +02:00
shpuld 6f450fe7b0 base01 -> base00, base02 -> base01 2017-03-10 00:45:16 +02:00
shpuld df4dad1804 Separate reply form from inside status to make it resistant to hilighting, make the reply button light up when reply window is open. 2017-03-09 21:32:54 +02:00
Shpuld Shpuldson 2f0fcd14c9 Merge branch 'fix/no-border-on-last-notif' into 'develop'
Fix red border not appearing on the last notification.

See merge request !59
2017-03-09 13:04:10 -05:00
shpuld bd7a05dee1 Fix red border not appearing on the last notification. 2017-03-09 19:57:20 +02:00
wakarimasen d669c37f13 Remove unused fetchMentions() 2017-03-09 18:21:42 +01:00
wakarimasen bfd530aaea Let timeline component fetch mentions 2017-03-09 18:20:16 +01:00
Shpuld Shpuldson 7aa1f02e38 Merge branch 'feature/timeline-fetch-error' into 'develop'
Use one error variable for all timelines

See merge request !57
2017-03-09 08:06:59 -05:00
wakarimasen e064d2da4d Use one error variable for all timelines 2017-03-09 13:38:32 +01:00
shpuld 00531ad9df lint fix 2017-03-09 12:48:43 +02:00
shpuld d99b9bdac1 Merged with changes in develop & fixed conflicts. 2017-03-09 12:45:12 +02:00
Roger Braun 0eeccb87ce Merge branch 'develop' into feature/hash-routed 2017-03-09 10:33:21 +01:00
Roger Braun 2f52669380 Merge branch 'develop' into wakarimasen/pleroma-fe-develop 2017-03-09 09:19:40 +01:00
lambadalambda 64d71b75cf Merge branch 'feature/nav-panel-hover-state' into 'develop'
themeable hover states for nav-panel

See merge request !53
2017-03-09 03:10:31 -05:00
lambadalambda 7a5bed0684 Merge branch 'feature/animated-favorite-and-boost' into 'develop'
add a spin animation to favorite and boost actions

See merge request !52
2017-03-09 03:08:59 -05:00
lambadalambda e808df0285 Merge branch 'cleanups' into 'develop'
Cleanups

See merge request !54
2017-03-09 03:02:55 -05:00
Roger Braun b11c1f57a9 Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading 2017-03-09 09:00:09 +01:00
Roger Braun 08297ea83e Remove redirect on login
This is to enable this workflow:

1. Open conversation in new tab
2. Login
3. Interact with the conversation

We can add this again once we have persistent logins.
2017-03-09 08:51:33 +01:00
xj9 d94cd15467 fix cursor style 2017-03-08 22:38:14 -07:00
xj9 aff432a572 themeable hover states for nav-panel 2017-03-08 22:36:03 -07:00
xj9 459fdaf10f add a spin animation to favorite and boost actions 2017-03-08 21:45:40 -07:00
xj9 502757da28 improvements on fature/better-nsfw-image-loading
- loading indicator
- avoid hitting the cache if we already know the image was loaded
- more responsive toggle
2017-03-08 20:23:10 -07:00
Shpuld Shpuldson ba4f7ef3ef Merge branch 'feature/failed-login-error' into 'develop'
Visual feedback on failed login

See merge request !49
2017-03-08 19:21:36 -05:00
shpuld 9511691c94 Make the error into a div instead of a button to get rid of the hover effects. 2017-03-09 02:21:23 +02:00
Shpuld Shpuldson aeda390da0 Merge branch 'feature/timeline-fetch-error' into 'develop'
Move rejection handler

See merge request !48
2017-03-08 19:03:06 -05:00
shpuld 507fe79050 Add base03 border to timeline bottom fetcher too. 2017-03-09 01:13:37 +02:00
shpuld 6c8fc99d5a Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses. 2017-03-09 01:09:23 +02:00
Roger Braun 0d39ed809b Add caching system to statuses. 2017-03-08 21:04:48 +01:00
wakarimasen 0810b2d51a Fix typo 2017-03-08 19:31:39 +01:00
wakarimasen ccc460bb5e Give more specific reason for failed login 2017-03-08 19:22:56 +01:00
wakarimasen c0e8111d64 Clear username and password field on failed login 2017-03-08 19:08:01 +01:00
wakarimasen a6b6fe95c0 Show visual feedback on login error, redirect on success 2017-03-08 18:28:41 +01:00
Roger Braun 5699872bb5 Use user cache in users module. 2017-03-08 18:04:53 +01:00
Roger Braun 480a1ba253 Use cache to quickly access users. 2017-03-08 17:59:12 +01:00
Roger Braun bde1241843 eslint fixes. 2017-03-08 17:58:49 +01:00
Roger Braun ccbfc64bfc Don't redirect after login. 2017-03-08 16:54:06 +01:00
wakarimasen 7d52258378 Move rejection handler 2017-03-07 21:38:55 +01:00
Shpuld Shpuldson d954db0221 Merge branch 'feature/timeline-fetch-error' into 'develop'
Visual feedback on failure to fetch new statuses

See merge request !47
2017-03-07 12:15:37 -05:00
lambadalambda 3a62ad3c4c Merge branch 'feature/more-visible-notifications' into 'develop'
Notifications inside a red circle and the red line more visible

See merge request !46
2017-03-07 11:27:46 -05:00
wakarimasen 086dd832d3 Visual feedback on failure to fetch new statuses 2017-03-07 17:27:12 +01:00
shpuld ae570ea0ff Put conversation 'Collapse' back on the same line with the rest of the heading.' 2017-03-07 16:00:45 +02:00
shpuld 58fdf9e70d Put the number of notifications inside a red circle (kinda like qvitter and everyone else does), make the red notification line slightly less transparent. 2017-03-07 15:55:00 +02:00
lambadalambda aa0d207c94 Merge branch 'fix/highlight-expanded-retweets' into 'develop'
Highlight original notice when expanding retweets

See merge request !43
2017-03-07 06:06:43 -05:00
Roger Braun e64a5beb35 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-03-07 08:44:53 +01:00
Roger Braun 5143ae7f72 Switch to localforage to use indexeddb by default. 2017-03-07 08:43:48 +01:00
shpuld a4ebf44f24 Fix overlapping styles in timeline and notifications that screwed up user-card. 2017-03-06 23:51:39 +02:00
Roger Braun 990047725a Revert "Temporarily remove persistence."
This reverts commit 0bb1ec30d0.
2017-03-06 19:57:00 +01:00
Roger Braun 0bb1ec30d0 Temporarily remove persistence. 2017-03-06 19:55:08 +01:00
wakarimasen 9d56721533 Highlight original notice when expanding retweets 2017-03-06 16:21:11 +01:00
shpuld 31c0a2dfef Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading 2017-03-06 14:51:01 +02:00
Roger Braun 51160f0fdb Style fixes. 2017-03-05 20:36:22 +01:00
shpuld e19bfb9a22 Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else. 2017-03-05 19:00:35 +02:00
wakarimasen 42ae57dace Remove unused import 2017-03-05 16:49:45 +01:00
wakarimasen 289326855c Add focused prop to status 2017-03-05 16:31:01 +01:00
wakarimasen c921662036 Add inConversation prop to status 2017-03-05 14:34:14 +01:00
wakarimasen 22e8258a56 Highlight current notice in conversation-page, add backlinks 2017-03-05 11:56:28 +01:00
wakarimasen 6bcbed38d0 Add option to only hide attachments on timeline 2017-03-04 21:25:59 +01:00
xj9 9107facaca issue #1 - better nsfw image loading
preload the image when it is toggled, but wait to replace it until
it has loaded.
2017-03-02 20:01:19 -07:00
Roger Braun a4c58aab13 Unify notice timelines to make changes easier. 2017-03-01 20:36:37 +01:00
lambadalambda 51294082e0 Merge branch 'fix/improved-profile-background-color' into 'develop'
Make use of template literals instead of string concat.

See merge request !34
2017-03-01 11:14:18 -05:00
shpuld 4d1183cc1f Fix the very visible padding offset in unread notification caused by the border. 2017-02-27 19:21:40 +02:00
shpuld 8c43b3f505 Remove newlines from template literal. 2017-02-26 22:42:22 +02:00
shpuld 015bf78dd9 Heading text floats left, initial attempt at load more in the right side of the heading. 2017-02-26 22:36:54 +02:00
Roger Braun 290180a987 Merge branch 'develop' into feature/hash-routed 2017-02-26 11:39:42 +01:00
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
lambadalambda e2ba7d9037 Merge branch 'fix/various-style-fixes-all-over-the-place' into 'develop'
Fix/various style fixes all over the place

See merge request !32
2017-02-25 06:32:19 -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
lambadalambda 614cbb556a Remove old commented style. 2017-02-24 16:50:32 -05: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
shpuld e0e507348c Give buttons cursor: pointer; Make border radii more consistent by not using em everywhere. 2017-02-24 10:17:41 +02:00
Roger Braun 2b2061b03f Switch to lz-string.
Pako was very slow in Chromium.
2017-02-23 19:11:22 +01:00
Roger Braun d030462d12 Indentation. 2017-02-23 01:54:22 +01: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
lambadalambda b9be4708e6 Merge branch 'feature/drag_and_drop_for_media_upload' into 'develop'
Proper handling of drag/drop for most platforms

See merge request !28
2017-02-22 16:31:59 -05:00
shpuld 1072cd6c02 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/user-card-improvements 2017-02-22 23:08:49 +02: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
Roger Braun ec5d8b9833 Set colors into config so they can be used for more dynamic styles. 2017-02-22 21:14:55 +01: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 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