| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2021-07-07 | Merge branch 'glitch' | Starfall | |
| 2021-06-25 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-06-25 | Fix styling of boost button in media modal not reflecting ability to boost ↵ | Claire | |
| (#16387) | |||
| 2021-06-23 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-06-21 | Add authentication history (#16408) | Eugen Rochko | |
| 2021-06-08 | Merge branch 'glitch' | Starfall | |
| Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork | |||
| 2021-06-03 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-06-01 | Fix deprecated slash as division in SASS files (#16347) | Claire | |
| Fixes #16293 | |||
| 2021-06-01 | Add assets from Twemoji 13.1.0 (#16345) | Eugen Rochko | |
| * Add assets from Twemoji 13.1.0 * Update emoji-mart | |||
| 2021-05-22 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-05-19 | Remove duplicate CSS properties (#16278) | Zero King | |
| 2021-05-18 | Remove duplicate CSS property of margin (#16277) | Zero King | |
| 2021-05-17 | Merge branch 'glitch' | Starfall | |
| 2021-05-12 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-05-11 | Fix follow recommendations UI in advanced layout (#16215) | Claire | |
| 2021-05-11 | Fix dialog close button (#16219) | Mélanie Chauvel | |
| * Fix dialog close button being white on almost white * Make dialog close button slightly bigger | |||
| 2021-05-11 | Merge branch 'glitch' | Starfall | |
| 2021-05-07 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes. | |||
| 2021-05-07 | Add joined date to profiles in web UI (#16169) | Eugen Rochko | |
| 2021-05-05 | Add empty state message for follow recommendations in web UI (#16161) | Eugen Rochko | |
| 2021-04-20 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header. | |||
| 2021-04-19 | Change onboarding by replacing tutorial with follow recommendations in web ↵ | Eugen Rochko | |
| UI (#16060) | |||
| 2021-04-11 | Add system checks to dashboard in admin UI (#15989) | Eugen Rochko | |
| 2021-04-05 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-04-03 | Add system checks to dashboard in admin UI (#15989) | Eugen Rochko | |
| 2021-04-02 | Merge branch 'glitch' | Starfall | |
| 2021-04-02 | Merge commit '935e376078fa8716ea5475a45602301fd3d6b081' | Starfall | |
| 2021-03-31 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-03-24 | Add transition to media modal background (#15843) | Marcin Mikołajczak | |
| * Add transition to media modal background * use reduceMotion * Move background color transition into css Signed-off-by: marcin mikołajczak <me@mkljczk.pl> | |||
| 2021-03-24 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-03-19 | Fixing the hero widget (#15926) | Claire | |
| * Removing last-child padding conflicts with light theme in hero widget * Add missing background color to widget * Reset widget.scss to default * Hope this works Co-authored-by: koyu <me@koyu.space> | |||
| 2021-03-06 | Fix various CodeClimate warnings | Claire | |
| 2021-02-26 | Merge remote-tracking branch 'glitchsoc/main' into main | Starfall | |
| 2021-02-22 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-02-21 | Merge remote-tracking branch 'glitchsoc/main' into main | Starfall | |
| 2021-02-21 | Add server rules (#15769) | Eugen Rochko | |
| 2021-02-12 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes. | |||
| 2021-02-11 | Use custom mascot on static share page (#15687) | Jeong Arm | |
| * Use custom mascot on static share page * Use full_asset_url | |||
| 2021-02-11 | Add dropdown for boost privacy in boost confirmation modal (#15704) | Claire | |
| * Various dropdown code quality fixes * Prepare support for privacy selection in boost modal * Add dropdown for boost privacy in boost confirmation modal | |||
| 2021-01-07 | Merge remote-tracking branch 'glitchsoc/master' into main | Starfall | |
| 2021-01-06 | Merge branch 'master' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream. | |||
| 2021-01-05 | Fix getting-started footer in single column mode not being clickable in ↵ | Takeshi Umeda | |
| Safari (#15496) | |||
| 2020-12-30 | Fix logo button style more (#15458) | Takeshi Umeda | |
| 2020-12-26 | Fix logo button style (#15428) | Takeshi Umeda | |
| * Fix bell button rtl style * Remove size and style props from button component * Fix logo button style * Update jest snapshot | |||
| 2020-12-24 | Merge branch 'glitch' into main | Starfall | |
| 2020-12-23 | Fix media modal buttons not showing up on mobile (#15417) | ThibG | |
| Fixes #15374 When the pop-out player was introduced, it had tweaks for the mobile view, but it's now disabled in mobile mode and the styling was reused for modals, causing the footer to be hidden on mobile without a good reason. Co-authored-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2020-12-19 | Merge branch 'master' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version. | |||
| 2020-12-18 | Fix styling issue on /about when server admin has a long username (#15357) | ThibG | |
| Co-authored-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2020-12-18 | Fix styles for RTL languages and the light theme (#15356) | Eugen Rochko | |
| 2020-12-15 | Change notification permission handling (#15176) | ThibG | |
| * Change notification permission handling - allow changing individual alert settings even if permission is not explicitly enabled (asks for permission on toggle) - persist permission request banner dismissal across sessions through settings * Add additional, more discrete message to grant permissions * Change permission granting button design according to reviews Co-authored-by: Claire <claire.github-309c@sitedethib.com> | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |