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