Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
590 commits 59 branches 16 tags 15 MiB
Commit graph

326 commits

Author SHA1 Message Date
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
lambadalambda
c2178819a0 Merge branch 'fix/prevent_follow_mute_button_deforming' into 'develop' 
Fix follow/mute buttons from getting squished on mobile

See merge request !17
 2017-02-18 15:02:31 -05:00
Roger Braun
963a0035e5 Make page title dynamic, better notification handling. 2017-02-18 20:44:41 +01:00
hakui
1ccc9dd629 wrap long urls while not breaking normal words. also practicing the new branch thing 2017-02-18 12:51:47 -06:00
shpuld
8a0197d682 Fix follow/mute buttons from getting squished on mobile 2017-02-18 19:58:16 +02:00
shpuld
15c82dea62 moved around classes in the user-info css 2017-02-18 15:49:27 +02:00
shpuld
e86b1d71ee Changed following-info to user-interactions and moved muting there, made everything in user-interactions look a bit neater 2017-02-18 15:48:27 +02:00
hakui
2f4d811079 removed break-line for links because it didn't seem to make sense 2017-02-18 03:10:02 -06:00
hakui
a4592445a3 making link thumbnails fit the whole box 2017-02-18 02:58:44 -06:00
hakui
0faaeb02f3 fixed line-height for text box 2017-02-18 01:54:54 -06:00
hakui
734597b43f hello world 2017-02-18 01:48:35 -06:00
Roger Braun
cd0925747d Show current theme in theme selector. 2017-02-17 18:21:02 +01:00
Roger Braun
cdc90f8edc One more fix. 2017-02-17 10:33:35 +01:00
Roger Braun
6c631016c6 One more small visual fix to oembeds. 2017-02-17 10:20:12 +01:00
Roger Braun
eb7156de0d Fix oembed attachments. 2017-02-17 10:16:29 +01:00
Roger Braun
0be2051588 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-16 22:27:10 +01:00
Roger Braun
52dd7c009f Add Settings page. 2017-02-16 22:25:29 +01:00
Roger Braun
5481cf00a3 Make user profiles visible inline. 2017-02-16 15:58:49 +01:00
Roger Braun
832bd3cdd2 Fetch Public and TWKN timelines when viewed. 2017-02-16 11:17:47 +01:00
Roger Braun
1d64b76211 Add basic configuration module, make it work for title and theme. 2017-02-14 22:21:23 +01:00
Roger Braun
340b21475d Make temporarily unmuted posts hideable again. 2017-02-14 21:47:37 +01:00
Roger Braun
4c12de262f Add muting to statuses. 2017-02-14 00:01:50 +01:00
Roger Braun
66ef9f1328 Add users muting. 2017-02-13 23:22:32 +01:00
Roger Braun
038798f3f4 Prefer local image if available. 2017-02-05 23:37:24 +01:00
Roger Braun
2269e815e1 Make status expandable into conversation. 2017-02-04 13:53:28 +01:00
Roger Braun
b420b5838c Use statusOrConversation component in timeline. 2017-02-04 13:53:16 +01:00
Roger Braun
800b051a16 Add statusOrConversation component. 2017-02-04 13:53:07 +01:00
Roger Braun
5ec4f1b047 Extract conversation and create conversation page. 2017-02-04 13:52:26 +01:00
Roger Braun
ea25708bf3 Set color on status instead of on timeline. 2017-02-04 13:51:44 +01:00
Roger Braun
5a518fa817 Break after user name in notifications. 2017-01-26 12:03:07 +01:00
Roger Braun
3be7a3ea85 Align style switcher. 2017-01-17 14:41:13 +01:00
Roger Braun
d644887d4c Add styleSwitcher. 2017-01-16 18:57:03 +01:00
Roger Braun
afd90b84d0 User card background css fix. 2017-01-16 17:46:22 +01:00
Roger Braun
4448f36f62 User profile css fix. 2017-01-15 16:26:37 +01:00
Roger Braun
6c5b5eb52b Border css fix. 2017-01-15 15:53:55 +01:00
Roger Braun
fc7e13e7bb Add styling with base16. 
Solarized-dark for now.
 2017-01-15 15:44:56 +01:00
lambadalambda
eac8fe0c33 Merge branch 'feature/follow' into 'develop' 
Feature/follow

See merge request !11
 2017-01-01 12:11:55 -05:00
Roger Braun
8f494b14f0 Add unfollowing. 2016-12-23 16:45:57 +01:00
Roger Braun
2088b3c4dd Add returned user to store after following. 2016-12-23 16:16:02 +01:00
Jiayi Zheng
d98f730921 Fixes currentUser rights 2016-12-19 17:03:02 +01:00
Jiayi Zheng
c24e44a8f2 Fixes user right check 2016-12-08 20:26:05 +01:00
Roger Braun
fc268c48bc Very basic user following. 2016-12-08 09:09:21 +01:00
Jiayi Zheng
1c75feae60 Move delete button for status into a component 2016-12-07 21:50:46 +01:00
Roger Braun
7b5a30db14 Work around hotlinking restrictions. 2016-12-07 09:34:48 +01:00
Roger Braun
026ab7c1df Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2016-12-05 20:49:58 +01:00
lambadalambda
be5fe03972 Merge branch 'feature/delete_status' into 'develop' 
Implements feature status delete

Fixes issue #4

See merge request !6
 2016-12-05 07:09:35 -05:00
lambadalambda
3c702feaca Merge branch 'fix/retweet_icon_style' into 'develop' 
Fixes issue #2

See merge request !7
 2016-12-05 06:51:47 -05:00
Jiayi Zheng
75fdc72e22 Implements feature status delete 
Fixes issue #4
 2016-12-04 18:30:00 +01:00
Jiayi Zheng
75caa21132 Fixes issue #2 2016-12-04 16:28:07 +01:00
Roger Braun
58ac8f51a2 Treat mentions more like a timeline. 2016-12-03 12:43:21 +01:00
Roger Braun
01951d1251 Rename nsfw image. 2016-12-02 14:42:01 +01:00
Roger Braun
187c4a7d57 CSS fixes. 2016-12-02 14:33:03 +01:00
Roger Braun
6e608dd2dd Add re-hiding of nsfw images. 2016-12-02 14:22:42 +01:00
Roger Braun
df51d08814 Fix long word breaking in notifications. 2016-12-02 01:54:04 +01:00
Roger Braun
0df3ca47a4 Add link to replied to users in status. 2016-12-01 18:05:04 +01:00
Roger Braun
fcccb9df68 Add basic user profiles. 2016-11-30 23:32:22 +01:00
Roger Braun
83a376a254 Extract user card from user content. 2016-11-30 22:27:19 +01:00