lambadalambda
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
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
Shpuld Shpuldson
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
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
Roger Braun
bfbbb52767
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
2017-03-10 11:12:23 +01:00
Roger Braun
daa70909ab
Fix localforage warning.
2017-03-10 11:11:49 +01:00
lambadalambda
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
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 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
