fef
/
nyastodon
forked from mirrors/catstodon
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,657 Commits
2 Branches
270 Tags
270 MiB
develop
main
nya-1.2.2
nya-1.2.1
nya-1.2.0
v0.1.2
v0.1.1
v0.1.0
4.0.1+1.0.0
4.0.1+1.0.1
4.0.1+1.0.2
4.0.1+1.0.3
4.0.1+1.0.4
v0.6
v0.7
v0.8
v0.9
v0.9.9
v1.0
v1.1
v1.1.1
v1.1.2
v1.2
v1.2.1
v1.2.2
v1.3
v1.3.1
v1.3.2
v1.4.1
v1.4.2
v1.4.3
v1.4.4
v1.4.5
v1.4.6
v1.4.7
v1.4rc1
v1.4rc2
v1.4rc3
v1.4rc4
v1.4rc5
v1.4rc6
v1.5.0
v1.5.0rc1
v1.5.0rc2
v1.5.0rc3
v1.5.1
v1.6.0
v1.6.0rc1
v1.6.0rc2
v1.6.0rc3
v1.6.0rc4
v1.6.0rc5
v1.6.1
v2.0.0
v2.0.0rc1
v2.0.0rc2
v2.0.0rc3
v2.0.0rc4
v2.1.0
v2.1.0rc1
v2.1.0rc2
v2.1.0rc3
v2.1.0rc4
v2.1.0rc5
v2.1.0rc6
v2.1.1
v2.1.2
v2.1.3
v2.2.0
v2.2.0rc1
v2.2.0rc2
v2.3.0
v2.3.0rc1
v2.3.0rc2
v2.3.0rc3
v2.3.1
v2.3.1rc1
v2.3.1rc2
v2.3.1rc3
v2.3.2
v2.3.2rc1
v2.3.2rc2
v2.3.2rc3
v2.3.2rc4
v2.3.2rc5
v2.4.0
v2.4.0rc1
v2.4.0rc2
v2.4.0rc3
v2.4.0rc4
v2.4.0rc5
v2.4.1
v2.4.1rc1
v2.4.1rc2
v2.4.1rc3
v2.4.1rc4
v2.4.2
v2.4.2rc1
v2.4.2rc2
v2.4.2rc3
v2.4.3
v2.4.3rc1
v2.4.3rc2
v2.4.3rc3
v2.4.4
v2.4.5
v2.5.0
v2.5.0rc1
v2.5.0rc2
v2.5.1
v2.5.2
v2.6.0
v2.6.0rc1
v2.6.0rc2
v2.6.0rc3
v2.6.0rc4
v2.6.1
v2.6.2
v2.6.3
v2.6.4
v2.6.5
v2.7.0
v2.7.0rc1
v2.7.0rc2
v2.7.0rc3
v2.7.1
v2.7.2
v2.7.3
v2.7.4
v2.8.0
v2.8.0rc1
v2.8.0rc2
v2.8.0rc3
v2.8.1
v2.8.2
v2.8.3
v2.8.4
v2.9.0
v2.9.0rc1
v2.9.0rc2
v2.9.1
v2.9.2
v2.9.3
v2.9.4
v3.0.0
v3.0.0rc1
v3.0.0rc2
v3.0.0rc3
v3.0.1
v3.0.2
v3.1.0
v3.1.0rc1
v3.1.0rc2
v3.1.1
v3.1.2
v3.1.3
v3.1.4
v3.1.5
v3.2.0
v3.2.0rc1
v3.2.0rc2
v3.2.1
v3.2.2
v3.3.0
v3.3.0rc1
v3.3.0rc2
v3.3.0rc3
v3.3.1
v3.3.2
v3.3.3
v3.4.0
v3.4.0rc1
v3.4.0rc2
v3.4.1
v3.4.2
v3.4.3
v3.4.4
v3.4.5
v3.4.6
v3.4.7
v3.4.8
v3.5.0
v3.5.0rc1
v3.5.0rc2
v3.5.0rc3
v3.5.1
v3.5.2
v3.5.3
v3.5.3+1.0.0
v3.5.3+1.0.1
v3.5.3+1.0.3
v3.5.3+1.0.4
v3.5.3+1.0.5
v3.5.3+1.0.6
v3.5.3+1.0.7
v3.5.3+1.0.8
v3.5.3+1.0.9
v3.5.3+1.1.0
v3.5.3+1.1.1
v3.5.3+1.1.2
v3.5.3+1.1.3
v3.5.3+1.1.4
v3.5.3+1.1.5
v3.5.3+1.1.6
v3.5.3+1.2.1
v3.5.3+1.2.2
v3.5.3+1.2.3
v4.0.0
v4.0.0+1.0.0
v4.0.0rc1
v4.0.0rc2
v4.0.0rc3
v4.0.0rc4
v4.0.1
v4.0.2
v4.0.2+1.0.0
v4.0.2+1.0.1
v4.0.2+1.0.10
v4.0.2+1.0.11
v4.0.2+1.0.12
v4.0.2+1.0.13
v4.0.2+1.0.2
v4.0.2+1.0.3
v4.0.2+1.0.4
v4.0.2+1.0.5
v4.0.2+1.0.6
v4.0.2+1.0.7
v4.0.2+1.0.8
v4.0.2+1.0.9
v4.0.2+1.1.0
v4.0.2+1.1.1
v4.0.2+1.1.2
v4.0.2+1.1.3
v4.0.2+1.1.4
v4.0.2+1.1.5
v4.0.2+1.1.6
v4.0.2+1.1.7
v4.0.2+1.1.8
v4.0.2+1.1.9
v4.1.0
v4.1.0+1.0.0
v4.1.0+1.0.1
v4.1.0+2.0.0
v4.1.0+2.0.1
v4.1.0+2.0.2
v4.1.0+2.0.4
v4.1.0+2.0.5
v4.1.0+2.1.0
v4.1.0+2.1.1
v4.1.0rc1
v4.1.0rc2
v4.1.0rc3
v4.1.1+1.0.0
v4.1.1+1.0.1
v4.1.1+1.0.2
v4.1.1+1.0.3
v4.1.1+1.0.4
v4.1.1+1.0.5
v4.1.1+1.0.6
v4.1.1+1.0.7
v4.1.2+1.0.0
v4.1.2+1.0.1
v4.1.2+1.0.2
v4.1.2+1.0.3
v4.1.2+1.0.4
v4.1.2+1.1.0
v4.1.2+1.1.1
v4.1.2+1.1.2
v4.1.2+1.1.3
v4.1.2+1.1.4
v4.1.3+1.0.0
v4.1.4+1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '1792b688ac'
${ noResults }
Commit Graph

287 Commits (1792b688ac6b0eeffa05076327cdf18bc97f5b48)

Author SHA1 Message Date
Jeremy Kescher 394a536ae0
Create distinctions between glitch-soc and Catstodon. 
Version suffix and string changes.
 2 years ago
Claire 3f10136a41 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko fbcbf7898f
Bump version to 3.5.3 (#18530) 2 years ago
Claire c85c3fb708 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated `jest`, moving its config in a separate file.
  This config was modified in glitch-soc, so the corresponding changes have
  been ported to `jest.config.js`
 2 years ago
Claire 014065913c
Bump version to 3.5.2 (#18295) 
* Bump version to 3.5.2

* Change some entries to be more clear

* Add some extra notes

* Fix line wrap

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2 years ago
Claire eff62528de Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko ed5491e5de
Bump version to 3.5.1 (#18000) 2 years ago
Claire fc5dd0c538 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Eugen Rochko 8c7223f4ea
Bump version to 3.5.0 (#17911) 2 years ago
Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
 2 years ago
Eugen Rochko d7d049aab7
Bump version to 3.5.0rc3 (#17876) 2 years ago
Eugen Rochko 07f8b4d1b1
Bump version to 3.5.0rc2 (#17855) 2 years ago
Claire c79a03b319 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
 2 years ago
Eugen Rochko 4bdce2c513
Bump version to 3.5.0rc1 (#17618) 
* Bump version to 3.5.0rc1

* Various fixes and improvements

* Update AUTHORS.md

* Various fixes and improvements

* Update README.md
 2 years ago
Eugen Rochko 3413f1c44b
Forward-port version bump to 3.4.6 (#17434) 2 years ago
Claire 2beb0a7af5 Bump version to 3.4.6 2 years ago
Claire 098f2bc1e1 Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
Claire 54581d43e7
Bump version to 3.4.5 (#17402) 2 years ago
Claire 2cda8be805 Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
Eugen Rochko 2251db42ec
Forward port version bumps to 3.4.2 and 3.4.3 (#16945) 
* Bump version to 3.4.2

* Bump version to 3.4.3
 3 years ago
Claire 5a1e072517
Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 
* Change references to tootsuite/mastodon to mastodon/mastodon

* Remove obsolete test fixture

* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG

And a few other places
 3 years ago
Claire 0157caacef Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
Eugen Rochko d6486c969f
Bump version to 3.4.1 (#16350) 3 years ago
Claire 69737b703a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.
 3 years ago
Eugen Rochko 4c7efdba40
Bump version to 3.4.0 (#16239) 3 years ago
Claire dc58d02192 Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
Eugen Rochko 7bd2b54a46
Bump version to 3.4.0rc2 (#16206) 3 years ago
Claire 87c3a0d0b3 Merge branch 'main' into glitch-soc/merge-upstream 3 years ago
Eugen Rochko d1442a06c3
Bump version to 3.4.0rc1 (#16053) 3 years ago
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream 
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.
 3 years ago
Eugen Rochko 633d175146
Bump version to 3.3.0 (#15433) 3 years ago
Claire 537afa00f3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, glitch-soc-only DM-related method
  too close to changed upstream stuff.
  Ported upstream changes.
- `app/services/batched_remove_status_service.rb`:
  Additional logic in glitch-soc to clear DMs from timelines.
  Ported upstream changes and fixed the DM TL clearing logic.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Additional code in glitch-soc to clear DM timelines.
  Ported upstream changes.
 3 years ago
Eugen Rochko 444b21b55f
Bump version to 3.3.0rc3 (#15411) 3 years ago
Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
 3 years ago
Eugen Rochko c6598b17d9
Bump version to 3.3.0rc2 (#15365) 3 years ago
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
 4 years ago
Eugen Rochko 8e0b98556f
Bump version to 3.3.0rc1 (#15230) 4 years ago
Eugen Rochko e7f1439b97
Bump version to 3.2.1 (#15227) 4 years ago
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
 4 years ago
dependabot[bot] 8972e5f7f6
Bump rubocop from 0.86.0 to 0.88.0 (#14412) 
* Bump rubocop from 0.86.0 to 0.88.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.88.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix for latest RuboCop

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 4 years ago
Thibaut Girka 2cfa142961 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.
 4 years ago
Eugen Rochko 93dd413a47
Bump version to 3.2.0 (#14395) 4 years ago
Eugen Rochko d1a6f8d5a8
Bump version to 3.2.0rc2 (#14382) 4 years ago
Thibaut Girka 1c6c40d17c Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
Eugen Rochko 6f798eb574
Bump version to 3.2.0rc1 (#14312) 4 years ago
Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
 4 years ago
Eugen Rochko 96e89d1ef4
Bump version to 3.1.5 (#14284) 4 years ago
Thibaut Girka f94aebafe5 Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
Eugen Rochko 06225dee94
Bump version to 3.1.4 (#13750) 4 years ago
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
 4 years ago
Eugen Rochko a889756dd5
Bump version to 3.1.3 (#13389) 4 years ago
Thibaut Girka 51d326f852 Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
Eugen Rochko aa8568b7f2
Bump version to 3.1.2 (#13162) 4 years ago
Thibaut Girka e037002401 Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
Eugen Rochko b752666e3f
Bump version to 3.1.1 (#13069) 4 years ago
Thibaut Girka dae5e446fe Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.
 4 years ago
Eugen Rochko d2bcef7f6f Bump version to 3.1.0 (#13053) 4 years ago
Thibaut Girka 369201a425 Merge branch 'master' into glitch-soc/merge-upstream 4 years ago
Eugen Rochko 60e160a02d
Bump version to 3.1.0rc2 (#12999) 4 years ago
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
 4 years ago
Eugen Rochko 4bae4e972d
Bump version to 3.1.0rc1 (#12932) 4 years ago
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
 5 years ago
Eugen Rochko e6d111f38b
Bump version to 3.0.1 (#12116) 5 years ago
Thibaut Girka 1bbba0016a Merge tag 'v3.0.0' into glitch-soc/merge-upstream 5 years ago
Eugen Rochko 83d3e7733d
Bump version to 3.0.0 (#12000) 5 years ago
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
 5 years ago
Eugen Rochko bae268b2f6
Bump version to 3.0.0rc3 (#12063) 5 years ago
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
 5 years ago
Eugen Rochko 13b06d4b3b
Bump version to 3.0.0rc2 (#11999) 5 years ago
Eugen Rochko e87bcaa107
Bump version to 3.0.0rc1 (#11900) 5 years ago
Eugen Rochko 3c8372fa81
Bump version to 2.9.3 (#11899) 5 years ago
Thibaut Girka bca3825c17 Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
Clar Fon a6b4440115 Remove pre from version, add extra suffix variable (#11407) 5 years ago
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
 5 years ago
Eugen Rochko b5c772c3d4
Bump version to 2.9.2 (#11152) 5 years ago
Eugen Rochko 84f945d64c
Bump version to 2.9.1 (#11143) 5 years ago
Thibaut Girka 60adda7e59 Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
Eugen Rochko c9eeb2e832
Bump version to 2.9.0 (#11074) 5 years ago
Eugen Rochko 275f09ccab
Bump version to 2.9.0rc2 (#11070) 5 years ago
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
 5 years ago
Eugen Rochko 0949c43ab3
Bump version to 2.9.0rc1 (#11004) 5 years ago
Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
 5 years ago
Eugen Rochko 5cdb4c483f
Forward port version bumps to 2.8.3 and 2.8.4 (#10819) 
* Bump version to 2.8.3

* Bump version to 2.8.4
 5 years ago
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 5 years ago
Eugen Rochko 2508370f44
Bump version to 2.8.2 (#10703) 5 years ago
Thibaut Girka 52a4284fe5 Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
Ushitora Anqou 56880fa76a Add SOURCE_TAG to show source repository's tag (#10698) 5 years ago
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 5 years ago
Eugen Rochko 5f9f610a23
Bump version to 2.8.1 (#10687) 5 years ago
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 5 years ago
Sho Kusano 3e6c7f3617 Configrationable repository url (#10600) 
* config: Add GITHUB_REPOSITORY for repository name

* config: Add SOURCE_BASE_URL for repository url

* Show source_url and repository name on getting started
 5 years ago
Thibaut Girka f5b4e9a54a Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
Eugen Rochko 6afab2587d
Bump version to 2.8.0 (#10550) 5 years ago
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 5 years ago
Eugen Rochko 830c2a9ccb
Bump version to 2.8.0rc3 (#10535) 5 years ago
Eugen Rochko c03f926cf3
Bump version to 2.8.0rc2 (#10501) 5 years ago
Thibaut Girka 4444d8f9b3 Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
Eugen Rochko ac650d7a13
Bump version to 2.8.0rc1 (#10340) 
Update AUTHORS.md
Update CHANGELOG.md
 5 years ago
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
 5 years ago
Eugen Rochko 7d5e2dda78
Bump version to 2.7.4 (#10179) 5 years ago