Commit graph

500 commits

Author SHA1 Message Date
Shpuld Shpuldson
e621be1428 Cut notification header length from 3 lines to 1. 2017-05-30 00:24:08 +03:00
Roger Braun
32d1d2178a Make linter happy. 2017-04-24 20:34:06 +02:00
Roger Braun
3fdc420990 Merge branch 'develop' into feature/hash-routed 2017-04-24 20:31:08 +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
c2db700544 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/hash-routed 2017-04-21 19:15:54 +03:00
lambadalambda
1f8d303863 Merge branch 'feature/post-form-improvement' into 'develop'
Polish up post-status form

See merge request 
2017-04-17 05:02:44 -04: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
Shpuld Shpuldson
6b777482b6 Merge branch 'fix/floating-attachment-remove-x' into 'develop'
Fix the floating 'remove attachment' icon on post status form.

See merge request 
2017-04-17 04:05:21 -04: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
lambadalambda
ceb2c814ae Merge branch 'fix/add-explicit-lang-to-html' into 'develop'
Fix / add explicit lang="en" to html

See merge request 
2017-04-15 06:39:42 -04:00
Roger Braun
6d7fcb057d Add missing route-link end tags. 2017-04-14 22:08:08 +02:00
Shpuld Shpuldson
dd66246913 Add lang="en" to html to potentially fix font fall-back issues on some language/font setups. 2017-04-14 20:08:37 +03:00
lambadalambda
2b4a677178 Merge branch 'feature/reply-navigation' into 'develop'
Reply navigation fix for opening conversations in new tab

See merge request 
2017-04-14 09:37:35 -04: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 
2017-04-14 07:50:45 -04:00
lambadalambda
7b8291c03c Merge branch 'fix/remove-ghost-scrolling-mobile' into 'develop'
Change attachments margin to not cause the element to overflow.

See merge request 
2017-04-14 07:50:27 -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
2efddaf874 Tweak values to minimize distracting artifacting when scrollbars are smaller or don't exist. 2017-04-13 23:36:16 +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
f1764796e1 Fixed flex issue between 980 and 960 pixels width 2017-04-13 17:01:18 +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
0379ad3ac2 Merge branch 'feature/custom-default-styles' into 'develop'
New default dark/light themes

See merge request 
2017-04-13 08:41:58 -04:00
Shpuld Shpuldson
3fb50205fb Updated README.md screenshot. 2017-04-13 08:31:57 -04:00
Shpuld Shpuldson
446de1c623 Potential new default dark and light themes added (base16-pleroma-dark, base16-pleroma-light). The new dark one set as the default. 2017-04-13 02:05:31 +03:00
lambadalambda
7a948ba3a5 Merge branch 'feature/reply-navigation' into 'develop'
Reply navigation (up only)

See merge request 
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
lambadalambda
9ed445fff0 Merge branch 'fix/daily-avg' into 'develop'
Fix daily average on accounts younger than a day

See merge request 
2017-04-11 06:03:02 -04:00
wakarimasen
66b59f2752 Fix daily average on accounts younger than a day 2017-04-11 11:47:19 +02:00
Roger Braun
36655002d0 Merge branch 'develop' into feature/hash-routed 2017-04-09 22:23:14 +02:00
lambadalambda
7ee87c7618 Merge branch 'feature/filtering' into 'develop'
Feature/filtering

See merge request 
2017-04-09 16:21:54 -04:00
Roger Braun
cd959d9df8 Remove completely empty words. 2017-04-09 22:15:49 +02:00
Roger Braun
40b607bdea Set state to loaded if it crashes while loading. 2017-04-09 22:15:35 +02:00
Roger Braun
1ea19dcf1d Take unmuting out of expandable condition. 2017-04-09 16:39:19 +02:00
Roger Braun
e531c78079 Only persist state after we loaded one. 2017-04-09 16:30:21 +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
d8387accd3 Merge branch 'fix/attachment-sizing' into 'develop'
Fix/attachment sizing

See merge request 
2017-04-09 07:50:02 -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
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 
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 
2017-03-11 06:48:17 -05:00
Shpuld Shpuldson
6aa4ab0d2b Merge branch 'fix/consistency-for-attachment-borders' into 'develop'
Give link attachments a rounded border, give images and links base03 border.

See merge request 
2017-03-10 20:31:21 -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