about summary refs log tree commit diff
AgeCommit message (Expand)Author
2019-03-16Merge pull request #962 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-16Fix compilation after emoji-picker changeThibaut Girka
2019-03-16[Glitch] fix: update to emoji-mart 2.10.0Nolan Lawson
2019-03-16[Glitch] Fix scrollbar styles on compose textarea, small bugsEugen Rochko
2019-03-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-16Weblate translations (2019-03-16) (#10294)Eugen Rochko
2019-03-16Avoid race condition when streaming deleted statuses (#10280)ThibG
2019-03-16fix: update to emoji-mart 2.10.0 (#10281)Nolan Lawson
2019-03-16Fix scrollbar styles on compose textarea, small bugs (#10292)Eugen Rochko
2019-03-16Merge pull request #961 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-16Fix settings/flavoursThibaut Girka
2019-03-16[Glitch] Add relationship manager UIEugen Rochko
2019-03-16Fix relationships controller/view wrt. glitch-soc theming engineThibaut Girka
2019-03-16Do not try to parse gif files as CSS or JSThibaut Girka
2019-03-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-16Do not use @babel/preset-env to compile node_modules (#10289)Yamagishi Kazutoshi
2019-03-16perf: remove stats.json generation in webpack (#10290)Nolan Lawson
2019-03-16Add relationship manager UI (#10268)Eugen Rochko
2019-03-16perf: remove zopfli to speed up webpack (#10288)Nolan Lawson
2019-03-16Add specs for action log helper (#9605)ysksn
2019-03-15Bump webpacker from 3.5.5 to 4.0.2 (#10277)Yamagishi Kazutoshi
2019-03-15Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279)dependabot[bot]
2019-03-15Bump oj from 3.7.9 to 3.7.10 (#10278)dependabot[bot]
2019-03-15Fix detailed poll validation errors not being returned in the API (#10261)Eugen Rochko
2019-03-15Show disappointed elephant if web UI crashes (#10275)Eugen Rochko
2019-03-15Fix maxed-out invites not showing up as expired in UI (#10274)Eugen Rochko
2019-03-15Fix language detection of non-latin alphabets even at few characters (#10276)Eugen Rochko
2019-03-15Add `visibility` param to reblog REST API (#9851)Eugen Rochko
2019-03-15Upgrade yargs to v12.0 (#9862)Yamagishi Kazutoshi
2019-03-15Add a preferences API so apps can share basic behaviours (#10109)Eugen Rochko
2019-03-14Merge pull request #960 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-14I18n: Update Czech translation (#10272)Aditoo17
2019-03-14Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-14Migrate existing `open_registrations` setting to the new `registrations_mode`...ThibG
2019-03-14[Glitch] Admission-based registrations modeEugen Rochko
2019-03-14[Glitch] Improve invites list with click-to-copy inputsEugen Rochko
2019-03-14Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-14Fix error in AdminMailer#new_pending_account (#10264)Eugen Rochko
2019-03-14Fix wrong method used in PollExpirationNotifyWorker (#10265)Eugen Rochko
2019-03-14Admission-based registrations mode (#10250)Eugen Rochko
2019-03-14Improve invites list with click-to-copy inputs (#10259)Eugen Rochko
2019-03-14Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)Eugen Rochko
2019-03-14[Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257)dependabot[bot]
2019-03-13Merge pull request #958 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-13[Glitch] Add UI for enabling/disabling poll notificationsThibG
2019-03-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-13Add UI for enabling/disabling poll notifications (#10255)ThibG
2019-03-13Merge pull request #957 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-13[Glitch] Add muted style for polls in web UIEugen Rochko
2019-03-13[Glitch] Fix public timeline page not paginating correctlyEugen Rochko