tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,780 Commits 10 Branches 0 Tags
076f0a0eb67f77a10326376bba70bcd66a4065f2
Commit Graph
510 Commits
Author SHA1 Message Date
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
 2018-10-22 17:51:38 +02:00
Eugen RochkoandGitHub eb1b9903a6 Redesign direct messages column (#9022) 2018-10-20 02:23:58 +02:00
Eugen RochkoandGitHub a38a452481 Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
takayamakiandEugen Rochko bebe8ec887 fix: initial state of PrivacyDropdown is should not be null (#9008) 2018-10-19 00:00:19 +02:00
ThibGandEugen Rochko 007f7690fa Fix fav/boosts hotkeys not working on detailed statuses (#9006) 2018-10-18 19:52:00 +02:00
ThibGandEugen Rochko adb06baef6 Handle global hotkeys even when no element has focus (#8998) 
This fixes hotkeys not working when pressing the column
“back” button, for instance.
 2018-10-17 16:56:16 +02:00
Eugen RochkoandGitHub 9d4541c612 Display customized mascot in web UI and fix admin form for it (#8964) 
Follow-up to #8766
 2018-10-12 04:04:08 +02:00
Eugen RochkoandGitHub 87fdd139b8 Do not push DMs into the home feed (#8940) 
* Do not push DMs into the home feed

* Show DMs column after sending a DM, if DMs column is not already shown
 2018-10-11 01:31:03 +02:00
Thibaut Girka b368d3c15d Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 15:34:53 +02:00
mayaehandEugen Rochko 770e337497 Fixed error occurrence when pinning the DM column. (#8922) 2018-10-08 14:43:38 +02:00
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
Eugen RochkoandGitHub 774ac47373 Add conversations API (#8832) 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
 2018-10-07 23:44:58 +02:00
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
Eugen RochkoandYamagishi Kazutoshi 28401962ca Change documentation URL (#8898) 
* Change documentation URL

* Fix hardcoded documentation URL in locales
 2018-10-06 14:33:36 +09:00
Thibaut Girka 98bb6815a7 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 21:48:25 +02:00
ThibGandEugen Rochko 42aecb4c13 Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893) 
* Add a confirmation dialog when hitting reply and the compose box isn't empty

Fixes #878

* Performance improvement
 2018-10-05 18:44:44 +02:00
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
 2018-10-01 12:43:20 +02:00
Eugen RochkoandGitHub 3d7f68c273 Revert Font Awesome 5 upgrade (#8810) 
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)"

This reverts commit 3f9ec3de82.

* Revert "Migrate to font-awesome 5.0. (#8799)"

This reverts commit 8bae14591b.

* Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)"

This reverts commit b9c727a945.

* Revert "Update the icon name changed by the Font Awesome 5. (#8776)"

This reverts commit 17af4d27da.

* Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)"

This reverts commit 4b794e134d.
 2018-09-28 02:11:14 +02:00
mayaehandEugen Rochko 3f9ec3de82 Fix some icon names changed by the Font Awesome 5. (#8796) 2018-09-27 20:36:36 +02:00
Colin DeanandEugen Rochko 330e320b40 Adds follow action timestamp to notification (#8756) 
Fixes #8755
 2018-09-27 17:11:06 +02:00
Naoki KosakaandEugen Rochko 8bae14591b Migrate to font-awesome 5.0. (#8799) 2018-09-27 17:08:56 +02:00
thebossandYamagishi Kazutoshi b9c727a945 Fix some icons names, unavailable in fontawesome5 (free license). (#8792) 
- pencil => pencil-alt
- sliders => sliders-h

related: #8484 #8776
 2018-09-26 22:48:21 +09:00
rhoioandYamagishi Kazutoshi c6e765f81e remove meta label in settings column (#8704) 2018-09-25 22:59:19 +09:00
mayaehandEugen Rochko 17af4d27da Update the icon name changed by the Font Awesome 5. (#8776) 2018-09-25 15:52:12 +02:00
ふぁぼ原andEugen Rochko f7a6f9489d Add a new preference to always hide all media (#8569) 2018-09-25 05:09:35 +02:00
Maciek BaronandEugen Rochko 4b794e134d Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484) 
* Migrate to newer version of Font Awesome

* Add bot icon to bot avatars
 2018-09-25 05:08:55 +02:00
ThibGandEugen Rochko 05f90e3695 Adjust beforeUnload conditions (#8746) 
Fixes #8701
 2018-09-21 18:54:17 +02:00
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
 2018-09-19 21:46:01 +02:00
Eugen RochkoandGitHub f4d549d300 Redesign forms, verify link ownership with rel="me" (#8703) 
* Verify link ownership with rel="me"

* Add explanation about verification to UI

* Perform link verifications

* Add click-to-copy widget for verification HTML

* Redesign edit profile page

* Redesign forms

* Improve responsive design of settings pages

* Restore landing page sign-up form

* Fix typo

* Support <link> tags, add spec

* Fix links not being verified on first discovery and passive updates
 2018-09-18 16:45:58 +02:00
ThibGandEugen Rochko f8b54d229f Fix “Toots” tab highlighting for replies and media timelines (#8715) 2018-09-18 03:57:13 +02:00
Yamagishi KazutoshiandEugen Rochko 0ddbccf7e6 Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
luzpazandEugen Rochko 40dd19be37 Misc. typos (#8694) 
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
 2018-09-14 00:53:09 +02:00
ThibGandEugen Rochko 4959ead07c Fix media description in various media modals (#8678) 2018-09-13 20:31:59 +02:00
ThibGandEugen Rochko 09a87b2cdb Auto-focus emoji picker's search field (#8688) 
Fixes #6056
 2018-09-13 20:31:11 +02:00
ThibGandEugen Rochko 661a89ea74 Autofocus comment textarea in report modal (#8689) 2018-09-13 15:27:29 +02:00
rhoioandEugen Rochko 7b7c26063e Highlight active tab in action bar (#8673) 
* NavLinks with activeclass instead of Link in actionbar to highlight active tab

* highlight border-bottom in action bar consistent to public view
 2018-09-13 01:50:41 +02:00
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
 2018-09-03 14:33:06 +02:00
Frederic HembergerandEugen Rochko 7c12c7b124 Add aria-label to floatingActionButton (#8574) 2018-09-02 15:51:06 +02:00
M SomervilleandEugen Rochko a060beee72 Skip VS15 (Emoji textual presentation). (#8553) 
Mastodon converts all Emoji to images, whether they have a VS15 after
them or not, but leaves the VS15 in the string, which is displayed as
a black box in Safari.
 2018-09-01 19:42:02 +02:00
Thibaut Girka a74a7d5fe3 Merge branch 'master' into glitch-soc/merge-upstream 2018-09-01 17:23:46 +02:00
trwnhandEugen Rochko 6a147f8377 Fix the display of missing lists (#8523) 
* Fix the display of missing lists

See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions.

* import ColumnBackButton

missed the import with the first commit
 2018-09-01 03:36:36 +02:00
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
 2018-08-31 19:10:57 +02:00
takayamakiandEugen Rochko f5c052b5e6 refactor: getting-started__wrapper should contained in getting-started (#8532) 2018-08-31 03:43:02 +02:00
Thibaut Girka c24491a8df Merge branch 'master' into glitch-soc/merge-upstream 2018-08-29 13:57:56 +02:00
Jakub MendykandEugen Rochko ceed1ebe5b Fix followers/follows layout issues from #8418 (#8505) 
* Add alwaysShowScrollbar prop to ScrollableList

* Fix followers/follows layout issues from #8418
 2018-08-29 01:19:58 +02:00
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
 2018-08-27 18:09:28 +02:00
M SomervilleandEugen Rochko 81697997a3 Include MOV in upload button tooltip. (#8480) 2018-08-27 13:05:27 +02:00
Marcin MikołajczakandEugen Rochko b534249a8d Add more hotkeys to legend (#8469) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-08-26 20:22:16 +02:00
Thibaut Girka be20eb4b2f Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 18:21:33 +02:00
Eugen RochkoandGitHub a791bac153 Add aria-label to notifications (#8460) 
Fix #8192
 2018-08-26 17:53:26 +02:00