Shpuld Shpuldson
f897c656fc
Also disable select on buttons
2017-11-02 16:27:34 +02:00
Shpuld Shpuldson
10bc83018c
Deregister scroll listener properly, only fetch more if timeline is visible.
2017-11-02 16:26:17 +02:00
Shpuld Shpuldson
226f435a17
Add user-select: none to i elements.
2017-11-02 11:27:52 +02:00
eal
ba9b04a8ba
Use the API endpoint for emoji completion.
2017-10-19 23:39:21 +03:00
eal
447ec91176
Actually actually fix image url.
2017-09-19 22:58:15 +03:00
eal
f4b1319eff
Actually fix image url.
2017-09-19 22:54:54 +03:00
eal
70d66c48ad
Fix image url.
2017-09-19 22:50:08 +03:00
eal
2162ef20b0
Add emoji completion.
2017-09-19 22:43:20 +03:00
eal
c96a7b582b
Remove another cache file.
2017-09-17 14:42:04 +03:00
eal
59f07c0704
Remove cache file.
2017-09-17 14:37:48 +03:00
eal
9abfcb34ef
Add tag timeline view.
2017-09-17 14:26:35 +03:00
lambadalambda
3eaaa4c16d
Merge branch 'fix/set-cookie' into 'develop'
...
Set cookies on fetch
See merge request !114
2017-09-13 04:47:23 -04:00
lambadalambda
7abcb13ec0
Merge branch 'feature/login-with-cookie' into 'develop'
...
Try logging in with the existing cookie.
See merge request !116
2017-09-13 04:47:03 -04:00
lambadalambda
c6b909570a
Merge branch 'fix/upload-buttons-clickable' into 'develop'
...
Fix hide and cancel buttons on chromium
See merge request !119
2017-09-13 04:46:24 -04:00
eal
5e6ffc0e45
Make user finder more pleasant.
2017-09-10 20:46:42 +03:00
eal
8a51bc6e22
Fix hide and cancel buttons on chromium
2017-09-10 13:33:02 +03:00
eal
298bf5cfca
Revert "Include cookie in every request"
...
This reverts commit 00589a9af1
.
Changing same-origin to the unsafer include did not fix the
bug it was supposed to.
2017-09-02 21:12:55 +03:00
Roger Braun
8b4f59e1f7
Try logging in with the existing cookie.
2017-09-02 19:50:02 +03:00
eal
00589a9af1
Include cookie in every request
2017-09-02 19:29:45 +03:00
eal
2b0811dddc
Make sure options exists every time on fetch()
2017-09-02 19:29:16 +03:00
eal
522110c0bc
Set cookies on fetch
2017-08-31 11:23:17 +03:00
eal
587cd7bcfa
Fix 'Statuses' being different color
2017-08-27 13:10:25 +03:00
eal
ad6d0a1f0c
Move the cog to avatar height
2017-08-25 14:59:55 +03:00
Shpuld Shpuldson
87b18da811
Merge branch 'fix/pleromabe-follow-notifs' into 'develop'
...
Add regex for follows from pleromabe
See merge request !109
2017-08-25 03:19:01 -04:00
eal
5bd6abc134
Add regex for follows from pleromabe
2017-08-24 21:53:31 +03:00
Shpuld Shpuldson
7061675e96
whoops lint
2017-08-24 16:25:26 +03:00
Shpuld Shpuldson
c6798864d4
Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments
2017-08-24 16:16:06 +03:00
Shpuld Shpuldson
bf61592b56
Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict.
2017-08-23 20:33:20 +03:00
Shpuld Shpuldson
2bc261afba
Merge branch 'feature/follow-lists' into 'develop'
...
Feature/follow lists
See merge request !106
2017-08-23 12:40:39 -04:00
eal
e1ec01dc3e
Appease linter.
2017-08-23 19:21:15 +03:00
eal
ccfc2e57d0
Add follower and following views
2017-08-23 19:14:06 +03:00
lambadalambda
5a1ad84092
Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop'
...
Add regex to check if you're the one being followed before adding notification.
See merge request !102
2017-08-22 06:18:41 -04:00
lambadalambda
e5d0965ff1
Merge branch 'fix/user-card-changes-and-fixes' into 'develop'
...
User card changes and fixes
See merge request !104
2017-08-22 06:13:10 -04:00
Shpuld Shpuldson
6ad5052044
Make pic bigger and remove border and add shadow, make screen name white again, make cog appear only in sidepanel.
2017-08-22 12:38:12 +03:00
Shpuld Shpuldson
2ef915c9f1
Don't allow posting again while previous hasn't returned
2017-08-22 11:43:03 +03:00
Shpuld Shpuldson
3d9d59915b
Add regex to check if you're the one being followed before adding notification.
2017-08-21 23:31:38 +03:00
eal
4291263cec
Add link to profile on usercard avatar and @handle
2017-08-21 23:14:05 +03:00
Shpuld Shpuldson
b5e5a8d1e3
Use _original profile pic instead of the 48x48 thumbnail in the user card content.
2017-08-21 16:45:45 +03:00
Shpuld Shpuldson
d3169b057c
Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts.
2017-08-21 15:35:14 +03:00
Shpuld Shpuldson
dbf2f1621e
Adjust the clickable area of notif avatar to not contain everything below it, adjust the status avatar to not have ghost border on top/right
2017-08-20 16:53:48 +03:00
Shpuld Shpuldson
42fb65e274
Add error message in post status form when failing to post and don't get rid of post/attachments when failing.
2017-08-20 13:16:41 +03:00
lambadalambda
fb3408d64f
Merge branch 'feature/profile-editing' into 'develop'
...
Feature/profile editing
See merge request !95
2017-08-19 03:32:44 -04:00
Shpuld Shpuldson
1136db24cc
Fix issue with trying to match() on undefined
2017-08-18 12:38:47 +03:00
Shpuld Shpuldson
052befa581
fix the very annoying thing where favs from pleromabe would not generate notifs when on GS
2017-08-18 12:26:07 +03:00
Shpuld Shpuldson
9503b8fa41
Remove the profile pic change from the old settings menu since it's in the new profile edit menu.
2017-08-18 12:00:59 +03:00
Shpuld Shpuldson
1526b4560c
Clean up to have much less redundant code.
2017-08-18 11:51:17 +03:00
Shpuld Shpuldson
2084c92dff
Force user profile timeline update when the user id changes (like when another user has been searched/found).
2017-08-16 16:40:09 +03:00
Shpuld Shpuldson
6d7d173e4d
Make linter happy.
2017-08-16 00:46:55 +03:00
Shpuld Shpuldson
c4920f2d86
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing
2017-08-16 00:15:00 +03:00
lambadalambda
dbad99cb4f
Merge branch 'feature/follow-notifications' into 'develop'
...
Add follow notifications.
See merge request !92
2017-08-10 12:34:02 -04:00
lambadalambda
3c2073bc8e
Merge branch 'fix/user-card-visual-buggery' into 'develop'
...
User card content visual bugfixes
See merge request !91
2017-08-10 12:29:05 -04:00
eal
701112f043
Add follow notifications.
2017-08-10 19:17:40 +03:00
Shpuld Shpuldson
acf3fd5d91
Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service.
2017-08-02 22:09:40 +03:00
Roger Braun
b1d9cbaebd
Add fetch polyfill.
2017-07-31 16:35:07 +02:00
Roger Braun
9c5f001fd2
Add back relative numbering.
2017-07-29 19:10:09 +02:00
Roger Braun
32e20b2e02
Only run through replies once.
2017-07-29 18:53:49 +02:00
Roger Braun
9e61ab577b
Revert "Throttle getReplies so it isn't called that often."
...
This reverts commit 86773579ed
.
2017-07-28 15:52:05 +02:00
Roger Braun
86773579ed
Throttle getReplies so it isn't called that often.
2017-07-28 11:20:54 +02:00
Roger Braun
da3b604d9d
Fix too long words in profile.
2017-07-27 15:54:34 +02:00
Roger Braun
7d59051fc5
Add logout button.
2017-07-02 12:25:34 +02:00
Shpuld Shpuldson
f81d1b0eea
Fix long names overflowing and messing everything (now just overflowing parts not drawn), fix non-square avatars not drawn as squares.
2017-06-23 17:43:34 +03:00
Shpuld Shpuldson
b284689313
Hotfix for JS error in auto completion in firefox.
2017-06-23 16:49:11 +03:00
lambadalambda
937705ccb0
Merge branch 'feature/registration' into 'develop'
...
Add a registration form.
See merge request !76
2017-06-21 12:22:28 -04:00
Shpuld Shpuldson
2d5fd21558
Make mobile panel switcher buttons obey the colors of the current style.
2017-06-21 17:43:59 +03:00
Shpuld Shpuldson
c1f1599f2f
Another minor consistency fix.
2017-06-21 17:32:41 +03:00
Shpuld Shpuldson
97bb03a00c
Fix consistency in font families between chromium and ff
2017-06-21 17:19:56 +03:00
Shpuld Shpuldson
bf84a87821
Make buttons stand out with some shading.
2017-06-21 17:15:45 +03:00
Shpuld Shpuldson
1a5ee95ee4
Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled.
2017-06-20 10:37:51 +03:00
Shpuld Shpuldson
bfbc94d697
Move customizable terms-of-service into its separate .html file.
2017-06-19 16:35:35 +03:00
Shpuld Shpuldson
95605c32f1
Automatic square cropping for avatar upload, preview of the new avatar.
2017-06-19 12:26:33 +03:00
Shpuld Shpuldson
3785a863cb
Update branch and fix conflicts.
2017-06-19 11:32:40 +03:00
Roger Braun
8e5d17a659
Use tags array in status if available.
2017-06-18 19:19:17 +02:00
Roger Braun
7d93546d98
Loop videos.
2017-06-18 19:17:14 +02:00
Shpuld Shpuldson
5dc22e9273
Clicking autocomplete will return focus to text area, make the autocomplete box disappear after clicking on a name.
2017-06-16 10:26:54 +03:00
Shpuld Shpuldson
b24b891c1c
Clean up styling a bit.
2017-06-16 10:15:10 +03:00
Shpuld Shpuldson
81d262af42
Fancier visuals for autocomplete list, with small avatar previews and all that.
2017-06-16 01:13:54 +03:00
Shpuld Shpuldson
d0d95c59aa
fix lint
2017-06-15 23:26:16 +03:00
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
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
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
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
67452923a5
Hotfix for firefox to prevent loading on every scroll event.
2017-06-03 19:53:23 +03: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
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
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