me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4318 commits 2 branches 0 tags 429 MiB
Commit graph

25 commits

Author SHA1 Message Date
Ondřej Hruška
3398d0e84c Revert "Merge pull request #149 from glitch-soc/mojon-suggest" 
This reverts commit b14d2a5ae6, reversing
changes made to 41832d083e.
 2017-09-28 08:55:53 +02:00
Ondřej Hruška
4ac158f1d3 Emoji and Hashtag autocomplete 2017-09-20 20:21:09 +02:00
David Yip
da3f22ee7d 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
Eugen Rochko
0e5c8372e7 Add protocol handler. Handle follow intents (#4511) 
* Add protocol handler. Handle follow intents

* Add share intent

* Improve code in intents controller

* Adjust share form CSS
 2017-08-14 04:53:31 +02:00
kibigo!
2cdee6ae8a Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Yamagishi Kazutoshi
5be327104f Disable sensitive button when with content warnings (#4460) 2017-07-31 05:06:56 +02:00
Yamagishi Kazutoshi
fc9f793f2e Change to sensitive when adding content warning from web UI (#4456) 2017-07-30 16:27:57 +02:00
beatrix-bitrot
8deb2072ef Merge that good fresh upstream shit 2017-07-22 01:16:53 +00:00
Sorin Davidoi
324d98b5a8 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
Ondřej Hruška
713938f266 Updated from tootsuite 2017-07-17 20:03:57 +02:00
Sorin Davidoi
36d42f83f3 fix(emojis): Handle multipoint emojis (e.g. country flags) (#4221) 2017-07-17 10:57:45 +02:00
kibigo!
f48f42598f Merge upstream (#81) 2017-07-15 14:33:15 -07:00
Eugen Rochko
5138dde794 Fix #4149, fix #1199 - Store emojis as unicode (#4189) 
- Use unicode when selecting emoji through picker
- Convert shortcodes to unicode when storing text input server-side
- Do not convert shortcodes in JS anymore
 2017-07-14 19:47:53 +02:00
kibigo!
bcc30c8697 Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
Sorin Davidoi
1a5ae3019d refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
Yamagishi Kazutoshi
865f5170a8 Add setting a always mark media as sensitive (#4136) 2017-07-10 14:00:32 +02:00
Sorin Davidoi
4264c62111 refactor: Make all reducers sync (#4125) 2017-07-09 12:16:08 +02:00
Sorin Davidoi
40b32ffb12 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
Surinna Curtis
fd67e58c82 replies to local-only toots default to local-only, and fix some regex bugs 2017-07-06 22:30:51 -05:00
Surinna Curtis
c076162192 satisfy eslint 2017-07-04 21:33:53 -07:00
Surinna Curtis
910cd440db reset advanced options when appropriate 2017-07-04 21:33:53 -07:00
Surinna Curtis
3f7c0b66f4 Local-only option and dropdown all working 2017-07-04 21:33:53 -07:00
Yamagishi Kazutoshi
539dbaa049 Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
Yamagishi Kazutoshi
e4ed0b155c Improve eslint rules (#3147) 
* Add semi to ESLint rules

* Add padded-blocks to ESLint rules

* Add comma-dangle to ESLint rules

* add config/webpack and storyboard

* add streaming/

* yarn test:lint -- --fix
 2017-05-20 17:31:47 +02:00
Eugen Rochko
ef2af79a48 Replace sprockets/browserify with Webpack (#2617) 
* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add Procfile.dev for running rails, webpack and streaming API at the same time
 2017-05-03 02:04:16 +02:00
Renamed from app/assets/javascripts/components/reducers/compose.jsx (Browse further)