d8a01454dc
another lint fix
2017-04-12 19:10:38 +03:00
c989170321
lint fixes
2017-04-12 19:07:55 +03:00
3f477986cf
Removed smooth scrolling, does not work in other browsers than FF
2017-04-12 18:47:47 +03:00
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
7ee87c7618
Merge branch 'feature/filtering' into 'develop'
...
Feature/filtering
See merge request !68
2017-04-09 16:21:54 -04:00
cd959d9df8
Remove completely empty words.
2017-04-09 22:15:49 +02:00
40b607bdea
Set state to loaded if it crashes while loading.
2017-04-09 22:15:35 +02:00
1ea19dcf1d
Take unmuting out of expandable condition.
2017-04-09 16:39:19 +02:00
e531c78079
Only persist state after we loaded one.
2017-04-09 16:30:21 +02:00
a53555254a
Add word-based muting to settings / statuses.
2017-04-09 15:53:23 +02:00
f3ca011fbe
Add chrome picture stretching fix back in.
2017-04-09 08:26:30 -04:00
d8387accd3
Merge branch 'fix/attachment-sizing' into 'develop'
...
Fix/attachment sizing
See merge request !67
2017-04-09 07:50:02 -04:00
05dfd96571
Revert nsfw image sizing, give attachments max-height to reduce scrolling
2017-04-09 14:28:21 +03:00
39a6867557
Make muted notifications take much less space (handy for bot spam).
2017-03-30 15:11:32 +03:00
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
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
6aa4ab0d2b
Merge branch 'fix/consistency-for-attachment-borders' into 'develop'
...
Give link attachments a rounded border, give images and links base03 border.
See merge request !64
2017-03-10 20:31:21 -05:00
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
21111878be
Give link attachments a rounded border, give images and links base03 border.
2017-03-10 23:28:55 +02:00
fe5082023d
Add a daily post average to the user card
2017-03-10 21:37:13 +01:00
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
5516b6f07a
Merge branch 'fix/conversation-heading-border' into 'develop'
...
Separate conversation heading and posts with a border.
See merge request !62
2017-03-10 09:57:56 -05:00
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
33f72ab2c2
Merge branch 'wakarimasen/pleroma-fe-develop' into 'develop'
...
Wakarimasen/pleroma fe develop
See merge request !55
2017-03-10 07:12:04 -05:00
896de016ad
Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop
2017-03-10 12:38:47 +01:00
bfbbb52767
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
2017-03-10 11:12:23 +01:00
daa70909ab
Fix localforage warning.
2017-03-10 11:11:49 +01:00
380adc6966
Merge branch 'feature/separate-reply-form-from-inside-status' into 'develop'
...
Make reply window not part of the inner status.
See merge request !60
2017-03-10 01:44:13 -05:00
3bb5f86d0d
Use conditional class for reply icon color.
2017-03-10 00:49:22 +02:00
6f450fe7b0
base01 -> base00, base02 -> base01
2017-03-10 00:45:16 +02:00
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
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
11e41d5ea9
Merge branch 'fix/mentions-timeline' into 'develop'
...
Fix/mentions timeline
See merge request !58
2017-03-09 12:59:53 -05:00
bd7a05dee1
Fix red border not appearing on the last notification.
2017-03-09 19:57:20 +02:00
d669c37f13
Remove unused fetchMentions()
2017-03-09 18:21:42 +01:00
bfd530aaea
Let timeline component fetch mentions
2017-03-09 18:20:16 +01:00
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
0ce747d2c3
Merge branch 'feature/borders-pleasing-to-the-eye' into 'develop'
...
Feature/borders pleasing to the eye
See merge request !56
2017-03-09 07:43:59 -05:00
e064d2da4d
Use one error variable for all timelines
2017-03-09 13:38:32 +01:00
00531ad9df
lint fix
2017-03-09 12:48:43 +02:00
d99b9bdac1
Merged with changes in develop & fixed conflicts.
2017-03-09 12:45:12 +02:00
2f52669380
Merge branch 'develop' into wakarimasen/pleroma-fe-develop
2017-03-09 09:19:40 +01:00
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
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
e808df0285
Merge branch 'cleanups' into 'develop'
...
Cleanups
See merge request !54
2017-03-09 03:02:55 -05:00
2a29c89672
Merge branch 'xj9/pleroma-fe-feature/even-better-nsfw-image-loading' into develop
2017-03-09 09:01:35 +01:00
b11c1f57a9
Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading
2017-03-09 09:00:09 +01:00
d954909134
Add linter.
2017-03-09 08:58:17 +01:00
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
d94cd15467
fix cursor style
2017-03-08 22:38:14 -07:00
Shpuld Shpuldson