Commit graph

981 commits

Author SHA1 Message Date
shpuld
e13c8c3fd2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme 2017-11-17 02:17:47 +02:00
shpuld
44073e72fd Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency. 2017-11-17 02:17:36 +02:00
lambda
86e685ac34 Merge branch 'fix/timeline-softlock' into 'develop'
Fix timeline softlock when switching from a loading timeline

See merge request pleroma/pleroma-fe!164
2017-11-16 13:56:48 +00:00
eal
0b0d206295 Fix timeline softlock when switching from a loading timeline 2017-11-16 15:50:26 +02:00
Shpuld Shpludson
b1ddaf9198 Merge branch 'feature/update-de-translation' into 'develop'
Updated german translation

See merge request pleroma/pleroma-fe!163
2017-11-15 09:49:27 +00:00
Sebastian Huebner
a9829b8735
updated german translation 2017-11-15 10:36:59 +01:00
Shpuld Shpludson
dff1153d1c Merge branch 'fix/user-view-without-posts' into 'develop'
Use state object for user view instead of timeline.

See merge request pleroma/pleroma-fe!161
2017-11-14 16:34:32 +00:00
Shpuld Shpludson
429ec1ceab Update README.md with a more modern picture. 2017-11-14 16:25:51 +00:00
eal
07057043d9 Use state object for user view instead of timeline.
Also fetch user if not in the state already.
2017-11-14 18:08:03 +02:00
Shpuld Shpludson
ff63be4afd Merge branch 'fix/user-finder-leading-@' into 'develop'
Remove leading @ in user search.

Closes pleroma#71

See merge request pleroma/pleroma-fe!160
2017-11-14 15:21:35 +00:00
eal
a5d05bcb10 Remove leading @ in user search. 2017-11-14 17:03:42 +02:00
Shpuld Shpludson
f9c701a702 Merge branch 'fix/hotfix-for-reply-navigation' into 'develop'
Unbreak reply navigation

See merge request pleroma/pleroma-fe!159
2017-11-14 07:01:22 +00:00
shpuld
dc4755f2ff Make goto-check use the correct property to make it work again 2017-11-14 08:55:21 +02:00
shpuld
ed84c6acc0 First version with naive color extrapolation. 2017-11-14 01:37:49 +02:00
lambda
55c4818084 Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'
Better handling of taller posts

Closes #40

See merge request pleroma/pleroma-fe!158
2017-11-13 18:17:50 +00:00
lambda
024b9ca724 Merge branch 'feature/in-reply-to-preview-on-timeline' into 'develop'
In-reply-to previews for posts on timeline

See merge request pleroma/pleroma-fe!157
2017-11-13 18:17:34 +00:00
shpuld
a169abcec2 Give tall notifications either a scrollbar (mentions), or just cap them and use a cool hider (fav/rt). 2017-11-13 19:23:43 +02:00
shpuld
e19a617de1 Add a scrollbar for tall spammy posts. 2017-11-13 18:39:27 +02:00
shpuld
ab1d1b3dd0 Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading. 2017-11-13 16:33:54 +02:00
lambda
8fdedb4c79 Merge branch 'french-update' into 'develop'
Update french translation.

See merge request pleroma/pleroma-fe!146
2017-11-13 12:23:41 +00:00
lambda
9681f58949 Update messages.js 2017-11-13 12:20:26 +00:00
lambda
7403c6c3dc Merge branch 'fix/replace-sidepanel-scroll-js-with-css' into 'develop'
Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue.

See merge request pleroma/pleroma-fe!156
2017-11-13 10:57:33 +00:00
Shpuld Shpludson
03190ab124 Merge branch 'fix/persisted-stream-setting' into 'develop'
Persist streaming setting between sessions.

See merge request pleroma/pleroma-fe!155
2017-11-13 10:07:25 +00:00
shpuld
4cc73cfe21 Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue. 2017-11-13 12:00:08 +02:00
eal
29e32416bc Persist streaming setting between sessions. 2017-11-13 11:44:28 +02:00
lambda
c3b401167d Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'
CSS fixes

Closes #39

See merge request pleroma/pleroma-fe!154
2017-11-13 09:34:16 +00:00
lambda
d7e4279c59 Merge branch 'fix/sidepanel-gap-consistency-fix' into 'develop'
Fix sidepanel gap

See merge request pleroma/pleroma-fe!148
2017-11-13 09:11:50 +00:00
lambda
d6478068f8 Merge branch 'feature/streaming-posts' into 'develop'
Streaming posts

See merge request pleroma/pleroma-fe!151
2017-11-13 09:10:44 +00:00
shpuld
bac092d953 Make oembeds behave properly, hide empty html attachments, hide overflowing timeline background. 2017-11-13 11:08:34 +02:00
Shpuld Shpludson
f74ad6d3e1 Merge branch 'fix-css-notif-button' into 'develop'
Fix white line below buttons in notifications

See merge request pleroma/pleroma-fe!153
2017-11-13 06:32:40 +00:00
Henry Jameson
764331c80b fix white line below buttons in notifications 2017-11-13 08:28:21 +03:00
Shpuld Shpludson
0584272cf1 Merge branch 'web-notifs' into 'develop'
Web Notifications

See merge request pleroma/pleroma-fe!149
2017-11-12 23:28:41 +00:00
shpuld
46f23b7de7 Add an option to automatically show new posts when scrolled to the top, also add fade-in animation for posts. 2017-11-13 01:06:48 +02:00
Shpuld Shpludson
c7f5f3f595 Merge branch 'css-fixes-and-updates' into 'develop'
Css fixes and updates

See merge request pleroma/pleroma-fe!150
2017-11-12 22:41:31 +00:00
Henry Jameson
c18aace3da imo this looks ugly, compared to general timeline appearance 2017-11-13 01:28:08 +03:00
Henry Jameson
46765d5c1a some fixes towards how conversations appear 2017-11-13 01:26:43 +03:00
Henry Jameson
6a44d1c9ac small shadows + show placeholder for empty panel body 2017-11-13 01:08:06 +03:00
Henry Jameson
ec55d49b88 kiinteät venytetyt tunteet 2017-11-13 00:57:41 +03:00
Henry Jameson
cbab830d8a fixes fullscreen video having borders and border-radius in firefox 2017-11-13 00:50:18 +03:00
shpuld
c682a4b007 Don't add notification on self mention, (and fix that pesky pleroma vs gs delete bug) 2017-11-12 23:15:47 +02:00
Henry Jameson
4cf580ee31 moved notification asking from page load to login event. Added image in
notifications support (doesn't work for native KDE notifications for me tho)
2017-11-13 00:11:55 +03:00
Henry Jameson
3dc375f442 initial implementation for desktop notifications 2017-11-12 23:34:08 +03:00
shpuld
8745fd4bdf please the linter 2017-11-12 20:42:26 +02:00
shpuld
07dc195234 Add a hack to a hack to make it look much less hacky. 2017-11-12 20:24:20 +02:00
Shpuld Shpludson
5813541006 Merge branch 'develop' into 'develop'
Adds Portuguese translation

See merge request pleroma/pleroma-fe!147
2017-11-11 07:17:49 +00:00
Aka
1390513de0 Adds Portuguese translation 2017-11-11 01:21:49 -03:00
Roger Braun
b19fe6e004 Update french translation. 2017-11-10 10:52:10 +01:00
lambda
399bd6f25c Merge branch 'fix/dont-show-block-when-logged-out' into 'develop'
Check if logged-in when rendering the block button.

See merge request pleroma/pleroma-fe!145
2017-11-09 10:01:54 +00:00
shpuld
72806b4a99 Check if logged-in when rendering the block button. 2017-11-09 10:33:10 +02:00
Shpuld Shpludson
56a0665b2f Merge branch 'fix/pleromabe-is-other-user' into 'develop'
Fix isOtherUser on pleroma-be

See merge request pleroma/pleroma-fe!137
2017-11-09 08:23:19 +00:00