mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-28 23:21:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4967 commits 5 branches 147 tags 265 MiB
Commit graph

59 commits

Author SHA1 Message Date
kibigo!
45c44989c8 Forking glitch theme 2017-11-17 19:29:16 -08:00
David Yip
2a386ad88d
Add trailing comma in mapStateToProps 
Consistency, eslint, etc.
 2017-11-17 00:24:22 -06:00
David Yip
392945f9a3 Throw layout, isWide, navbarUnder back into mapStateToProps. 
This gets wide view, auto layout, and navbar-under-mobile working again.
 2017-11-17 00:11:01 -06:00
Surinna Curtis
35fbdc36f9 Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
unarist
49a285ce15 Show confirmation dialog on leaving WebUI while composing (#5616) 
* Show confirmation dialog on leaving WebUI while composing

Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost.

So this prevents it by showing confirmation dialog from `onbeforeunload` event.

* Fix message and comments
 2017-11-09 14:34:41 +01:00
Nolan Lawson
b254e6ca5f Refactor initial state: "me" (#5563) 
* Refactor initial state: "me"

* remove "me" from reducers/meta.js
 2017-10-31 11:27:48 +09:00
David Yip
42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 2017-10-25 16:01:20 -05:00
Matthew Walsh
a76b024228 Changes to match other timelines in 2.0 2017-10-22 18:45:35 -07:00
Matthew Walsh
3db80f75a6 Added a timeline for Direct statuses 
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL
 2017-10-22 18:35:14 -07:00
David Yip
6a2b1ba91e Another tabs-vs-spaces fix, but with ~feeling~ 2017-10-12 09:36:26 -05:00
David Yip
fe1c20cfb9 Fix tabs-vs-spaces issue pointed out by eslint. 2017-10-12 09:23:06 -05:00
kibigo!
8d6b9ba494 Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
Eugen Rochko
476e79b8e3 Fully disable hotkeys when input element is focused (#5324) 
Because alt+n is a way to enter some kinda letter on some keyboard
 2017-10-11 16:31:07 +02:00
Eugen Rochko
b3d7ad958f Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309) 
AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea
 2017-10-11 01:01:17 +02:00
Eugen Rochko
7db0f8dcb2 Implement hotkeys for web UI (#5164) 
* Fix #2102 - Implement hotkeys

Hotkeys on status list:

- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back

* Add navigational hotkeys

The key g followed by:

- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users

* Add hotkey for focusing search, make escape un-focus compose/search

* Fix focusing notifications column, fix hotkeys in compose textarea
 2017-10-06 01:07:59 +02:00
Eugen Rochko
ebb8c89207 Upgrade to React 16 (#5119) 
* Upgrade to React 16.0.0

* Disable some uncritical tests while chai-enzyme remains incompatible
 2017-09-30 04:29:56 +02:00
Ondřej Hruška
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 2017-09-28 09:18:35 +02:00
Ondřej Hruška
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream 2017-09-28 09:12:17 +02:00
Eugen Rochko
034fab39ab Make dropdowns render into portal, expand animation (#5018) 
* Make dropdowns render into portal, expand animation

* Improve actions modal style
 2017-09-22 04:59:17 +02:00
abcang
60944d5dca Fix height cache (#4909) 2017-09-13 10:24:33 +02:00
David Yip
67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
 2017-09-09 23:56:21 -05:00
David Yip
14e1fb8d36 Add missing import (patch by @MightyPork) 2017-09-09 14:28:20 -05:00
David Yip
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
voidSatisfaction
85c7c42098 Add Pinned toot column (#4817) 
* Add Pinned_toot_section

* Fix add frozen_string_literal

* Fix delete no need controller and tests

* Fix replace query strings to axios params

* Fix change value to accountId and disabling more button
 2017-09-07 09:58:11 +02:00
Yamagishi Kazutoshi
2305f7c391 Use system's default font on non web UI pages (#4553) 
* Use system's default font on non web UI pages

* Remove import for Redirect
 2017-09-01 16:13:31 +02:00
Akihiko Odaki
9958eba356 Do not scroll the columns area due to redirection (#4541) 
Commit 9d1f8b9d6a scrolls the columns area
when the route changes since the user is likely to want to see the
rightmost column in such cases.

However, redirection is automatic and does not indicate users' intension.
Do not scroll the columns area due to one.
 2017-08-29 14:16:21 +02:00
Yamagishi Kazutoshi
fbe1115114 Remove eslint-disable comments (#4681) 
Do not reject console.error and console.warn with ESLint rules.
 2017-08-24 12:15:36 +02:00
Ondřej Hruška
7a1ca8b0df Merge remote-tracking branch 'upstream/master' 2017-08-07 22:43:52 +02:00
Sorin Davidoi
8eb6d171e6 feat: Cache status height to avoid expensive renders (#4439) 
* feat: Cache status height to avoid expensive renders

* feat: Escape content and emojify in reducers

* fix(css): Remove backface-visibility: hidden from .scrollable

* fix(statuses): Avoid creating DOMParses inside a loop
 2017-08-07 20:32:03 +02:00
kibigo!
8150689b48 Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Sorin Davidoi
3e01a7e677 fix(web_push_notification): Do not hard reload tab (#4380) 
* fix(web_push_notification): Do not hard reload tab

* fix(web_push_notification_worker): Guard against null subscription

* refactor: Incorporate pull request feedback
 2017-07-28 05:06:01 +02:00
Ondřej Hruška
9b74a12045 Adjust margins for mobile with navbar-under 2017-07-22 20:41:21 +02:00
Ondřej Hruška
74a0cc6a11 Added settings toggle to move the navbar at the bottom in mobile view (#93) 2017-07-22 19:51:34 +02:00
beatrix-bitrot
984d2d4cb6 Merge that good fresh upstream shit 2017-07-22 01:16:53 +00:00
Sorin Davidoi
c1bc5e14eb feat(compose): More space on mobile devices (#4282) 
* feat(compose): More space on mobile devices

* feat(compose): Hide navigation when typing on mobile devices

* fix(compose): Make animation faster

* fix(navigation_bar): Remove hardcoded title

* fix(compose): Prevent accidental bluring

* fix(compose): Increase max-height to 600px
 2017-07-21 01:38:24 +02:00
kibigo!
79d898ae0a Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
unarist
ce3a371eee Fix initial loading of pinned Notifications column (#4126) 2017-07-09 13:04:30 +02:00
unarist
46f5d3a2e9 Fix first loading of notifications when the column is pinned (#4114) 2017-07-08 17:22:24 +02:00
Sorin Davidoi
348d6f5e75 Lazy load components (#3879) 
* feat: Lazy-load routes

* feat: Lazy-load modals

* feat: Lazy-load columns

* refactor: Simplify Bundle API

* feat: Optimize bundles

* feat: Prevent flashing the waiting state

* feat: Preload commonly used bundles

* feat: Lazy load Compose reducers

* feat: Lazy load Notifications reducer

* refactor: Move all dynamic imports into one file

* fix: Minor bugs

* fix: Manually hydrate the lazy-loaded reducers

* refactor: Move all dynamic imports to async-components

* fix: Loading modal style

* refactor: Avoid converting the raw state for each lazy hydration

* refactor: Remove unused component

* refactor: Maintain modal name

* fix: Add as=script to preload link

* chore: Fix lint error

* fix(components/bundle): Check if timestamp is set when computing elapsed

* fix: Load compose reducers for the onboarding modal
 2017-07-08 00:06:02 +02:00
Damien Erambert
18d3fa953b Add a setting allowing the use of system's default font in Web UI (#4033) 
* add a system_font_ui setting on the server

* Plug the system_font_ui on the front-end

* add EN/FR locales for the new setting

* put Roboto after all other fonts

* remove trailing whitespace so CodeClimate is happy

* fix user_spec.rb

* correctly write user_spect this time

* slightly better way of adding the classes

* add comments to the system-font stack for clarification

* use .system-font for the class instead

* don't use multiple lines for comments

* remove trailing whitespace

* use the classnames module for consistency

* use `mastodon-font-sans-serif` instead of Roboto directly
 2017-07-06 22:39:56 +02:00
kibigo!
595c6de32c Added App Setttings Modal 2017-06-28 22:00:54 -07:00
beatrix-bitrot
ddafde942c Merge remote-tracking branch 'upstream/master' 2017-06-27 20:46:13 +00:00
Eugen Rochko
12e7c81dd8 Turn report screen into a modal (#3965) 2017-06-27 18:07:21 +02:00
kibigo!
da05cde721 Better settings handling with localSettings (new!) 2017-06-24 19:56:37 -07:00
kibigo!
ddba5d3b8c Use Redux store to keep track of layout 2017-06-24 18:30:30 -07:00
Surinna Curtis
ceb545c080 Pass in correct "singleColumn" prop value when auto-columns is not used. 2017-06-24 15:29:46 -05:00
Surinna Curtis
a70468aa56 Support overriding media queries for deciding between single-column/multi-column layouts with a class 2017-06-24 15:29:46 -05:00
Yamagishi Kazutoshi
c1a8e3d1eb Use Class and Property Decorators (#3730) 
ref https://tc39.github.io/proposal-decorators/
 2017-06-23 19:36:54 +02:00
Yamagishi Kazutoshi
eff9416469 Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
Sorin Davidoi
8f03fdce7f Upgrade React Router (#3677) 
* chore(yarn): Remove react-router

* chore(yarn): Remove react-router-scroll

* chore(yarn): Remove history

* chore(yarn): Add react-router-dom

* chore: Remove usages of react-router-scroll

* refactor: Upgrade to react-router-web

* refactor: Use fork of react-router-scroll

This reverts commit 2ddea9a6c8d39fc64b7d0b587f3fbda7a45a7fa2.

* fix: Issues mentions in the PR feedback
 2017-06-20 20:40:03 +02:00