Commit graph

637 commits

Author SHA1 Message Date
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 Shpuldson
11e41d5ea9 Merge branch 'fix/mentions-timeline' into 'develop'
Fix/mentions timeline

See merge request !58
2017-03-09 12:59:53 -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
lambadalambda
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
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
2a29c89672 Merge branch 'xj9/pleroma-fe-feature/even-better-nsfw-image-loading' into develop 2017-03-09 09:01:35 +01: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
d954909134 Add linter. 2017-03-09 08:58:17 +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
lambadalambda
5997492795 Merge branch 'feature/performance' into 'develop'
Feature/performance

See merge request !50
2017-03-08 15:17:59 -05: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
lambadalambda
1057227be3 Merge branch 'fix/collapse-on-same-line' into 'develop'
Put conversation 'Collapse' back on the same line with the rest of the heading.'

See merge request !45
2017-03-07 10:15:41 -05: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 Shpuldson
34531de8c0 Merge branch 'fix/overlapping-styles-user-card' into 'develop'
Fix overlapping styles in timeline and notifications that screwed up user-card.

See merge request !44
2017-03-06 16:55:48 -05:00