| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2021-10-25 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies. | |||
| 2021-10-21 | Enhance dashboard styles (#16884) | Mashiro | |
| * Display sparkline graph on Chrome * Heatmap auto overflow * Change grid columns number on small screen * Please codeclimate bot * Remove graph height | |||
| 2021-10-14 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `README.md`: Upstream added some documentation in the README, but our README is pretty different and barebone. Kept our README. | |||
| 2021-10-14 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. | |||
| 2021-10-14 | Add font-display to display text before loading (#16330) | Jeong Arm | |
| 2021-10-14 | Add graphs and retention metrics to admin dashboard (#16829) | Eugen Rochko | |
| 2021-10-06 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-10-01 | Improve hover and focus style in columns settings (#16222) | Mélanie Chauvel | |
| * Make focus visible on switches and text buttons in columns settings * Make hover/focus visible on left/right arrows in columns settings Use same style as for station action bar (reply/boost/fav/etc.) * Tab first to “Pin/Unpin” before left/right arrows in columns settings | |||
| 2021-08-20 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-08-11 | Fix download button color in audio player (#16572) | Claire | |
| Fixes #16571 | |||
| 2021-08-09 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did. | |||
| 2021-08-05 | Fix trends layout (#16570) | Jeong Arm | |
| 2021-07-08 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. | |||
| 2021-07-07 | Merge branch 'glitch' | Starfall | |
| 2021-07-05 | Fix pop-in player display when poster has long username or handle (#16468) | Claire | |
| 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 | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |