lambadalambda
dbad99cb4f
Merge branch 'feature/follow-notifications' into 'develop'
...
Add follow notifications.
See merge request !92
2017-08-10 12:34:02 -04:00
lambadalambda
3c2073bc8e
Merge branch 'fix/user-card-visual-buggery' into 'develop'
...
User card content visual bugfixes
See merge request !91
2017-08-10 12:29:05 -04:00
eal
701112f043
Add follow notifications.
2017-08-10 19:17:40 +03:00
Shpuld Shpuldson
acf3fd5d91
Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service.
2017-08-02 22:09:40 +03:00
Roger Braun
9c5f001fd2
Add back relative numbering.
2017-07-29 19:10:09 +02:00
Roger Braun
32e20b2e02
Only run through replies once.
2017-07-29 18:53:49 +02:00
Roger Braun
9e61ab577b
Revert "Throttle getReplies so it isn't called that often."
...
This reverts commit 86773579ed
2017-07-28 15:52:05 +02:00
Roger Braun
86773579ed
Throttle getReplies so it isn't called that often.
2017-07-28 11:20:54 +02:00
Roger Braun
da3b604d9d
Fix too long words in profile.
2017-07-27 15:54:34 +02:00
Shpuld Shpuldson
f81d1b0eea
Fix long names overflowing and messing everything (now just overflowing parts not drawn), fix non-square avatars not drawn as squares.
2017-06-23 17:43:34 +03:00
Shpuld Shpuldson
b284689313
Hotfix for JS error in auto completion in firefox.
2017-06-23 16:49:11 +03:00
lambadalambda
937705ccb0
Merge branch 'feature/registration' into 'develop'
...
Add a registration form.
See merge request !76
2017-06-21 12:22:28 -04:00
Shpuld Shpuldson
c1f1599f2f
Another minor consistency fix.
2017-06-21 17:32:41 +03:00
Shpuld Shpuldson
97bb03a00c
Fix consistency in font families between chromium and ff
2017-06-21 17:19:56 +03:00
Shpuld Shpuldson
bf84a87821
Make buttons stand out with some shading.
2017-06-21 17:15:45 +03:00
Shpuld Shpuldson
1a5ee95ee4
Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled.
2017-06-20 10:37:51 +03:00
Shpuld Shpuldson
bfbc94d697
Move customizable terms-of-service into its separate .html file.
2017-06-19 16:35:35 +03:00
Shpuld Shpuldson
95605c32f1
Automatic square cropping for avatar upload, preview of the new avatar.
2017-06-19 12:26:33 +03:00
Shpuld Shpuldson
3785a863cb
Update branch and fix conflicts.
2017-06-19 11:32:40 +03:00
Roger Braun
7d93546d98
Loop videos.
2017-06-18 19:17:14 +02:00
Shpuld Shpuldson
5dc22e9273
Clicking autocomplete will return focus to text area, make the autocomplete box disappear after clicking on a name.
2017-06-16 10:26:54 +03:00
Shpuld Shpuldson
b24b891c1c
Clean up styling a bit.
2017-06-16 10:15:10 +03:00
Shpuld Shpuldson
81d262af42
Fancier visuals for autocomplete list, with small avatar previews and all that.
2017-06-16 01:13:54 +03:00
Shpuld Shpuldson
d0d95c59aa
fix lint
2017-06-15 23:26:16 +03:00
Shpuld Shpuldson
e0e8965c08
update branch and fix merge conflicts
2017-06-15 23:25:19 +03:00
Shpuld Shpuldson
7d46e3965d
Fix meta-enter hotkey on osx
2017-06-15 22:21:14 +03:00
Roger Braun
bbb9a9c93c
Fetch user from timeline.
2017-06-12 17:07:10 +02:00
Roger Braun
5328aca1ef
Use userId in timeline.
2017-06-12 16:34:41 +02:00
Roger Braun
bda0a76c89
Clear timeline on user change.
2017-06-12 16:30:56 +02:00
Roger Braun
2e7029b670
Display user timeline
2017-06-12 16:20:02 +02:00
Roger Braun
090148ef60
Start fetching user timelines.
2017-06-12 16:00:46 +02:00
Roger Braun
85cf036acd
Fix race condition in color calculation.
2017-06-12 15:59:54 +02:00
Roger Braun
0effef236a
Small cleanup.
2017-06-07 18:15:15 +02:00
Shpuld Shpuldson
dcd7d52eb5
lint fix
2017-06-07 18:13:24 +03:00
Shpuld Shpuldson
f915ae174d
Add floating status-previews on reply-link mouseover in conversations and make them optional in the settings, fix a small visual inconsistency in muted statuses while editing the file already..
2017-06-07 17:58:24 +03:00
Roger Braun
9af18e014d
Re-use conversation property.
2017-06-05 12:15:30 +02:00
Shpuld Shpuldson
64a7db1d8b
Change replies element flex to cover more width if needed.
2017-06-05 12:03:32 +03:00
Shpuld Shpuldson
12000536aa
remove commented lines, make linter happy
2017-06-05 00:02:14 +03:00
Shpuld Shpuldson
4fabeda3ec
Add list of replies under the name/links in conversation statuses, clicking them will highlight the statuses and scroll you to them, expanding a status will scroll you to that status once the conversation has opened.
2017-06-04 23:58:15 +03:00
Shpuld Shpuldson
bac1d3bd57
Move user-finder into navbar and hide it behind a toggle button, update fontello icons with user-plus and menu.
2017-06-03 23:42:54 +03:00
Shpuld Shpuldson
67452923a5
Hotfix for firefox to prevent loading on every scroll event.
2017-06-03 19:53:23 +03:00
Shpuld Shpuldson
65646c5a12
Add an option to initiate fetching older statuses automatically when scrolled 750 pixels or less from the bottom.
2017-06-03 18:51:55 +03:00
Roger Braun
e901e064de
Key notifications so the open reply windows won't switch places.
2017-06-02 17:04:59 +02:00
Shpuld Shpuldson
24b7d7d9d4
Add mouseover tooltips for names in notif headings and timeline repeats, make the timeline repeat name into a link to the repeater profile and use the word 'repeat' instead of 'retweet'.
2017-06-02 13:05:03 +03:00
lambadalambda
b92be6a7ef
Merge branch 'feature/status-improvement-cleanup' into 'develop'
...
Status improvements and cleanup
See merge request !83
2017-06-01 11:50:00 -04:00
lambadalambda
934bbd16f1
Merge branch 'feature/autoresize-post-status-form' into 'develop'
...
Make text input grow to a minimum height of 3 lines on focus
See merge request !82
2017-06-01 11:25:12 -04:00
Shpuld Shpuldson
c149330e50
Fix bugginess with heading links overlapping icons on the right.
2017-06-01 17:50:09 +03:00
Shpuld Shpuldson
52e6b470be
Revert some of those mobile optimizations, breaks mention notifs.
2017-06-01 17:43:37 +03:00
Shpuld Shpuldson
d063607b9d
Mobile optimizations.
2017-06-01 17:35:00 +03:00
Shpuld Shpuldson
807c0d1464
Remove silly opacity from timestamp, make unmute icon line up with the rest better.
2017-06-01 01:11:57 +03:00
Shpuld Shpuldson
ea8a700796
Move a bunch of status-related styles from App to status component, alter status header layout for better user experience hopefully, make status actions placing more consistent, adjust margins.
2017-06-01 01:02:04 +03:00
Shpuld Shpuldson
b6b0a221c6
please the linter
2017-05-31 17:43:43 +03:00
Shpuld Shpuldson
7447f7c64d
Set minimum height of 3 lines for textarea on focus, make it reset on post.
2017-05-31 17:36:22 +03:00
lambadalambda
9723d7285d
Merge branch 'feature/notification-improvements' into 'develop'
...
Feature/notification improvements
See merge request !79
2017-05-31 08:16:43 -04:00
Shpuld Shpuldson
5465791372
eslint fix
2017-05-31 14:11:07 +03:00
Shpuld Shpuldson
e704e1daaf
Make post-status-form automatically resize to fit the input.
2017-05-31 14:02:54 +03:00
Shpuld Shpuldson
1b79ae09e0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/notification-improvements
2017-05-31 11:58:32 +03:00
Shpuld Shpuldson
5ad4d043e7
Enable reply/rt/fav for mention notifications by using a barebones status in place of plain notification content.
2017-05-31 11:47:18 +03:00
Shpuld Shpuldson
e621be1428
Cut notification header length from 3 lines to 1.
2017-05-30 00:24:08 +03:00
Roger Braun
d389d3a763
Copy cool retweet look.
2017-05-22 13:50:10 +02:00
Roger Braun
76624c9e4b
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
2017-05-12 18:54:33 +02:00
Roger Braun
2ec7069b3c
Add user finder.
2017-05-12 18:54:12 +02:00
Roger Braun
48725ff9d0
Make linter happy.
2017-04-24 20:34:36 +02:00
Roger Braun
32d1d2178a
Make linter happy.
2017-04-24 20:34:06 +02:00
Roger Braun
0c41adccff
Remove tributejs
...
Alternative autocompletion is in the works and this one has injection problems.
2017-04-24 20:30:09 +02:00
Shpuld Shpuldson
143aa3b990
Started captcha and better avatar control, improved login form to fit register link better.
2017-04-21 18:52:42 +03:00
Shpuld Shpuldson
b3b6d43dcc
Add ToS field into registration form (still need to make it fetch it somewhere.) Make the register form look more polished.
2017-04-17 13:57:02 +03:00
Shpuld Shpuldson
88309b446f
Adjust attachment preview margins.
2017-04-17 11:42:33 +03:00
Shpuld Shpuldson
a3a9d8edd1
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/post-form-improvement
2017-04-17 11:21:40 +03:00
Shpuld Shpuldson
6b75874136
Move attachments below buttons to prevent the buttons from shifting after uploading.
2017-04-17 11:18:06 +03:00
Roger Braun
ce896d393b
Fix linting.
2017-04-17 10:12:30 +02:00
Shpuld Shpuldson
ca8755a6f3
Make X icon parent position: relative; to prevent it from floating on its own.
2017-04-17 10:45:12 +03:00
Roger Braun
37c10be5e2
Add basic avatar changing.
2017-04-16 13:44:11 +02:00
Roger Braun
4228cfc342
Add email field to registration.
2017-04-16 11:02:03 +02:00
Roger Braun
a766e886f5
Add a registration form.
2017-04-15 18:29:46 +02:00
Roger Braun
6d7fcb057d
Add missing route-link end tags.
2017-04-14 22:08:08 +02:00
Shpuld Shpuldson
ea184f33b0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/reply-navigation
2017-04-14 16:11:09 +03:00
Shpuld Shpuldson
c708ebb5d2
Fix statusoid == undefined bug that prevented conversation opening in new tabs.
2017-04-14 15:58:34 +03:00
lambadalambda
dcced2d2e1
Merge branch 'feature/sidepanel-independent-scrolling' into 'develop'
...
Sidepanel independent scrolling
See merge request !72
2017-04-14 07:50:45 -04:00
Shpuld Shpuldson
e64905d88b
Change attachments margin to not cause the element to overflow.
2017-04-14 13:43:53 +03:00
Shpuld Shpuldson
69ef9101d4
Fix login screen, (remove one duplicate line from user card css).
2017-04-13 17:57:20 +03:00
Shpuld Shpuldson
ff9142d7ab
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/sidepanel-independent-scrolling
2017-04-13 16:32:15 +03:00
Shpuld Shpuldson
83205b8c0e
Make sidepanel scroll independently from timeline, allows for seeing notifications and posting new statuses even when scrolled deep down.
2017-04-13 16:17:57 +03:00
lambadalambda
7a948ba3a5
Merge branch 'feature/reply-navigation' into 'develop'
...
Reply navigation (up only)
See merge request !70
2017-04-12 13:14:43 -04:00
Shpuld Shpuldson
d8a01454dc
another lint fix
2017-04-12 19:10:38 +03:00
Shpuld Shpuldson
c989170321
lint fixes
2017-04-12 19:07:55 +03:00
Shpuld Shpuldson
3f477986cf
Removed smooth scrolling, does not work in other browsers than FF
2017-04-12 18:47:47 +03:00
Shpuld Shpuldson
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
wakarimasen
66b59f2752
Fix daily average on accounts younger than a day
2017-04-11 11:47:19 +02:00
Roger Braun
cd959d9df8
Remove completely empty words.
2017-04-09 22:15:49 +02:00
Roger Braun
1ea19dcf1d
Take unmuting out of expandable condition.
2017-04-09 16:39:19 +02:00
Roger Braun
a53555254a
Add word-based muting to settings / statuses.
2017-04-09 15:53:23 +02:00
lambadalambda
f3ca011fbe
Add chrome picture stretching fix back in.
2017-04-09 08:26:30 -04:00
Shpuld Shpuldson
05dfd96571
Revert nsfw image sizing, give attachments max-height to reduce scrolling
2017-04-09 14:28:21 +03:00
Shpuld Shpuldson
39a6867557
Make muted notifications take much less space (handy for bot spam).
2017-03-30 15:11:32 +03:00
Roger Braun
44923afbee
Make linter happy.
2017-03-15 17:14:51 +01:00
Roger Braun
5249b1d23a
Add basic mention completion.
2017-03-15 17:08:17 +01:00
Shpuld Shpuldson
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
Shpuld Shpuldson
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
shpuld
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
shpuld
21111878be
Give link attachments a rounded border, give images and links base03 border.
2017-03-10 23:28:55 +02:00
wakarimasen
fe5082023d
Add a daily post average to the user card
2017-03-10 21:37:13 +01:00
lambadalambda
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
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
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
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
bd7a05dee1
Fix red border not appearing on the last notification.
2017-03-09 19:57:20 +02: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
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
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
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
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
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
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
shpuld
a4ebf44f24
Fix overlapping styles in timeline and notifications that screwed up user-card.
2017-03-06 23:51:39 +02: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
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
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
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
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
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
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
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
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
Roger Braun
9763009d86
Merge branch 'feature/mutes' into develop
2017-02-20 18:06:01 +01:00
Roger Braun
9c1093b6ca
Grab mutes from server on patched servers.
2017-02-20 18:01:45 +01:00
hakui
b29a094e38
set top and bottom padding on the bars to be equal because it was too top-heavy
2017-02-20 09:28:50 -06:00
Roger Braun
2933dc30a5
Only display 10 notifications at a time, 20 is too much.
2017-02-19 13:37:21 +01:00
Roger Braun
56e036b4de
Add special case for mastodon user links.
...
They have a span embedded in the link, so let's look at the parent, too.
2017-02-19 13:25:30 +01:00
Roger Braun
04c4ad9a65
Open clicked links the statusnet_html in a new window.
2017-02-19 12:58:25 +01:00
Roger Braun
73f46bfba6
Merge branch 'clearnotifs' into develop
2017-02-19 12:28:36 +01:00
Roger Braun
df3ffdd905
Follow style guide ( https://github.com/feross/standard )
2017-02-19 12:19:47 +01:00
Roger Braun
5f74ae8de5
Revert "removed break-line for links because it didn't seem to make sense"
...
This reverts commit 2f4d811079
2017-02-19 12:13:56 +01:00
shpuld
2639427236
Ctrl-enter posts status
2017-02-19 01:41:51 +02:00
hakui
af91346328
changed to if-else to save on one line
2017-02-18 17:38:56 -06:00
hakui
14237cff77
clears notif number from title when marking as read
2017-02-18 17:33:00 -06:00
lambadalambda
6f98543b79
Merge branch 'link-wraparound-styling' into 'develop'
...
(practicing the new branch thing) url styling
See merge request !18
2017-02-18 15:03:30 -05:00
