about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-05-16Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menuThibG
[Glitch] Feature: Direct message from menu
2018-05-16Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-colorThibG
Fix mastodon-light background color of the composer textarea when posting
2018-05-16[Glitch] Reword the direct message warningThibaut Girka
Port 53c2164e9c8e2538de386a526a97db187ecae470 to glitch-soc
2018-05-16[Glitch] Feature: Direct message from StatusesThibaut Girka
Port 904a2479dd2085dfc94f33746ad6f7a755e72609 to glitch-soc
2018-05-16[Glitch] Fix issues with sending direct messages from user profileThibaut Girka
Port 4fd71accd419fb79cc75e0ebf30df374d174ebf5 to glitch-soc
2018-05-16[Glitch] Feature: Direct message from menuThibaut Girka
Port d1f34151aee564bb1e60ee48107797681c869a81 to glitch-soc
2018-05-16Fix mastodon-light background color of the composer textarea when postingThibaut Girka
2018-05-15Merge pull request #483 from ThibG/glitch-soc/fixes/modalThibG
Fix modals testing for props.noEsc (fixes #482)
2018-05-15Fix modals testing for props.noEsc (fixes #482)Thibaut Girka
2018-05-14Merge pull request #476 from ThibG/fixes/update-scssDavid Yip
Change local settings SCSS to be more consistent with modals
2018-05-14Change local settings SCSS to be more consistent with modalsThibaut Girka
2018-05-14Merge pull request #481 from ThibG/glitch-soc/mergeDavid Yip
Merge upstream changes
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-14Disallow async function in service worker (#7482)Akihiko Odaki
offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6 uses uglify-js 2.8.29, which is not compatible with async function.
2018-05-14Revert index change on statuses for api/v1/accounts account_id statuses (#7484)Akihiko Odaki
2018-05-14Bump version to 2.4.0rc3Eugen Rochko
2018-05-14Limit environment variables to expose to webpack (#7480)Akihiko Odaki
2018-05-14Bump version to 2.4.0rc2Eugen Rochko
2018-05-14Add Slovene language (#7475)Yamagishi Kazutoshi
2018-05-14Call media.present? because media may be nil (#7474)abcang
2018-05-14Improve index on statuses for api/v1/accounts account_id statuses (#7476)Akihiko Odaki
Queries with the combination of account_id, id, and visibility can be categorized in three types: 1. Querying for public and unlisted to enumerate statuses visible to anyone. 2. Querying for public, unlisted, and private to enumerate statuses visible to follower. 3. Querying for direct to enumerate own direct statuses. 1 and 2 is covered by the index with condition 'visibility IN (0, 1, 2)'. It would bring better performance in case that there are many direct statuses. The index with condition 'visibility = 3' is just for 3. It would be much faster to query direct statuses thanks to this query. The total size of those two indexes are expected to be smaller than the deleted one because they are partial and does not have to cover all the table.
2018-05-13Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-themebeatrix
Port Sylvhem's mastodon-light to glitch flavour
2018-05-13Fix 404 for GET /api/v1/push/subscription (#7472)Eugen Rochko
My bad...
2018-05-13Add GET /api/v1/push/subscription REST API (#7471)Eugen Rochko
* Add Api::V1::Push::SubscriptionsController#show * Add to routes
2018-05-13Fix nil error in StatusFilter (#7470)Eugen Rochko
Fix #7462
2018-05-13Test if navigator.storage is present before using it (#7460)Akihiko Odaki
2018-05-13Open video modal on public UI (#7469)Yamagishi Kazutoshi
2018-05-13Update http_parser.rb to head version (#7467)Yamagishi Kazutoshi
2018-05-12Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escapeThibG
Fix glitch-style bio fields incorrect HTML escaping in public profiles
2018-05-12Fix glitch-style bio fields incorrect HTML escaping in public profilesThibaut Girka
2018-05-12Improvements to toots display in admin view (#7452)ThibG
* Distinguish boosts from original statuses in the admin panel (fixes #7449) * Show the “show more” button in admin view to make CWs clearer (fixes #7451) * Make content warnings swag
2018-05-12Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)ThibG
When an ActivityPub Announce is processed and the boosted toot is not known, fetch it on behalf of one of the booster's followers. This is to allow fetching self-boosts of previously-unknown private toots. If fetching on behalf of a user fails, try fetching it anonymously: the selected follower of a boosting user may be banned by the boosted toot's author.
2018-05-12Combine similar components into one on public UI (#7458)Yamagishi Kazutoshi
2018-05-12Downgrade doorkeeper to version 4.2.6 (#7456)Yamagishi Kazutoshi
ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060
2018-05-11Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyupThibG
Fix root modal's keyup handling (Fixes #478)
2018-05-11Fix root modal's keyup handling (Fixes #478)Thibaut Girka
2018-05-11Merge pull request #477 from ThibG/glitch-soc/mergeThibG
Merge upstream changes
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
2018-05-11Merge pull request #475 from ThibG/fixes/update-scssThibG
Update SCSS from upstream
2018-05-11Merge pull request #474 from ThibG/glitch-soc/fixes/html-ified-tooltipThibG
[Glitch] Use plaintext value for field value tooltips in web UI
2018-05-11[Glitch] Fix contact info styling on landing pageThibaut Girka
2018-05-11Update SCSS for tablesThibaut Girka
2018-05-11Update SCSS for statuses public viewThibaut Girka
2018-05-11[Glitch] Adjust RTL styles for landing pageThibaut Girka
Port 8bf3e750ab1d4f4ffa7063b088870d7a82ad548c to glitch-soc
2018-05-11Update forms SCSS from upstreamThibaut Girka
2018-05-11Update SCSS to match “Show card modal on public pages”Thibaut Girka
2018-05-11Update SCSS for about/landing pageThibaut Girka
2018-05-11Update admin page SCSS from upstreamThibaut Girka
2018-05-11Update session activation time (fixes #5605) (#7408)ThibG
2018-05-11Change wording of the “undo” media upload button (fixes #6857) (#7417)ThibG