b1217242fc
Merge pull request #125 from glitch-soc/data-column
...
Add data-column="..." to all columns
2017-09-30 15:02:21 -04:00
b9f7bc149b
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
69957ed10a
Fix the usages of Detect Passive Events ( #4749 )
2017-08-31 11:20:54 +02:00
7a1ca8b0df
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
b6bf04ece2
Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column
2017-08-06 21:27:47 +02:00
9d1f8b9d6a
Scroll columns area to right when children property is changed ( #4517 )
...
The feature to pin column could hide the rightmost column, which is
specified with children property of ColumnsArea.
The user is likely to see the column when the property changed, so scroll
the area in such cases.
2017-08-04 18:57:46 +02:00
6ff084dbbb
Improved notifications cleaning UI with set operations ( #109 )
...
* added notification cleaning drawer
* bugfix
* fully implemented set operations for notif cleaning
* i18n for notif cleaning drawer & improved logic slightly. Also added a confirm dialog
* - notif dismiss "overlay" now shoves the notif aside to avoid overlap
- added focus ring to header buttons
- removed notif overlay entirely from DOM if mode is disabled
* removed comment
* CSS tuning - inconsistent division lines fix
2017-07-30 12:36:28 -04:00
ebf5a06084
fix(column): Use passive wheel listener ( #4348 )
...
* chore(yarn): Install detect-passive-events
* fix(column): Use passive listener
2017-07-25 01:05:51 +02:00
c1a8e3d1eb
Use Class and Property Decorators ( #3730 )
...
ref https://tc39.github.io/proposal-decorators/
2017-06-23 19:36:54 +02:00
8ee2eb5d2e
Allow mounting arbitrary columns ( #3207 )
...
* Allow mounting arbitrary columns
* Refactor column headers, allow pinning/unpinning and moving columns around
* Collapse animation
* Re-introduce scroll to top
* Save column settings properly, do not display pin options in
single-column view, do not display collapse icon if there is
nothing to collapse
* Fix one instance of public timeline being closed closing the stream
Fix back buttons inconsistently sending you back to / even if history exists
* Getting started displays links to columns that are not mounted
2017-06-04 01:39:38 +02:00
beatrix