Thibaut Girka
|
a02244f17c
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
|
2018-10-09 21:08:26 +02:00 |
|
dependabot[bot]
|
02b17344fd
|
Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936)
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases)
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:43:26 +02:00 |
|
dependabot[bot]
|
46e4a759bb
|
Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936)
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases)
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:43:26 +02:00 |
|
dependabot[bot]
|
a1be1d17fe
|
Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934)
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:43:05 +02:00 |
|
dependabot[bot]
|
076ceffa84
|
Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934)
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:43:05 +02:00 |
|
mayaeh
|
cf43973ecd
|
Fix that the copy button of verify link did not work. (#8938)
|
2018-10-09 19:36:13 +02:00 |
|
mayaeh
|
e50cb5f4bd
|
Fix that the copy button of verify link did not work. (#8938)
|
2018-10-09 19:36:13 +02:00 |
|
Eugen Rochko
|
ad0f37e924
|
Track historical space stats in PgHero to determine PostgreSQL growth (#8906)
|
2018-10-09 19:35:14 +02:00 |
|
Eugen Rochko
|
7f9dd92a27
|
Track historical space stats in PgHero to determine PostgreSQL growth (#8906)
|
2018-10-09 19:35:14 +02:00 |
|
Thibaut Girka
|
f9fc7d7660
|
Fix CW icon color in local-settings modal
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
269edc0e48
|
Fix CW icon color in local-settings modal
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
d21c9f08e5
|
Define some local-settings hints
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
721aec40cd
|
Define some local-settings hints
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
c40ba63f42
|
Add support for hints (or extended descriptions) in local-settings pages
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
26409f3e8e
|
Add support for hints (or extended descriptions) in local-settings pages
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
c598692cdf
|
When screen width is too narrow, hide local-settings page text, keep only icons
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
5f308a7f05
|
When screen width is too narrow, hide local-settings page text, keep only icons
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
56773bc55c
|
Change “preferences” icon to match settings page icon
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
6cd793f0ac
|
Change “preferences” icon to match settings page icon
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
065a19b18b
|
Add icons for each of the local-setting pages
|
2018-10-09 18:10:54 +02:00 |
|
Thibaut Girka
|
edb9ec8543
|
Add icons for each of the local-setting pages
|
2018-10-09 18:10:54 +02:00 |
|
ThibG
|
02422158ae
|
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2018-10-09 13:23:01 +02:00 |
|
ThibG
|
641d056e0f
|
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2018-10-09 13:23:01 +02:00 |
|
dependabot[bot]
|
4580979e28
|
Bump faker from 1.8.7 to 1.9.1 (#8935)
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:59:34 +09:00 |
|
dependabot[bot]
|
d4b7d75968
|
Bump faker from 1.8.7 to 1.9.1 (#8935)
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:59:34 +09:00 |
|
dependabot[bot]
|
dbaded7ed2
|
Bump memory_profiler from 0.9.11 to 0.9.12 (#8937)
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:39:46 +09:00 |
|
dependabot[bot]
|
a47c8545c7
|
Bump memory_profiler from 0.9.11 to 0.9.12 (#8937)
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-09 19:39:46 +09:00 |
|
Thibaut Girka
|
f09150f2a9
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-10-09 12:12:03 +02:00 |
|
Thibaut Girka
|
122ac9cd1d
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-10-09 12:12:03 +02:00 |
|
ThibG
|
d73c1df33b
|
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2018-10-09 12:11:14 +02:00 |
|
ThibG
|
4134a10549
|
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
|
2018-10-09 12:11:14 +02:00 |
|
Thibaut Girka
|
e968dcea13
|
Fix app-wide hotkeys randomly failing to work
|
2018-10-09 12:10:51 +02:00 |
|
Thibaut Girka
|
d0b1369a85
|
Fix app-wide hotkeys randomly failing to work
|
2018-10-09 12:10:51 +02:00 |
|
Sascha
|
b7a337f63c
|
add ffmpeg initializer (#8855)
* add ffmpeg initializer
* use different expression to check for environment var
|
2018-10-09 03:02:52 +02:00 |
|
Sascha
|
b2a57a5d6f
|
add ffmpeg initializer (#8855)
* add ffmpeg initializer
* use different expression to check for environment var
|
2018-10-09 03:02:52 +02:00 |
|
mayaeh
|
bcb43baf50
|
Add Japanese translations. (#8927)
|
2018-10-09 07:12:37 +09:00 |
|
mayaeh
|
87abbb07f3
|
Add Japanese translations. (#8927)
|
2018-10-09 07:12:37 +09:00 |
|
Thibaut Girka
|
683608dd60
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-10-08 15:34:53 +02:00 |
|
Thibaut Girka
|
b368d3c15d
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-10-08 15:34:53 +02:00 |
|
mayaeh
|
96a313d02b
|
Fixed error occurrence when pinning the DM column. (#8922)
|
2018-10-08 14:43:38 +02:00 |
|
mayaeh
|
770e337497
|
Fixed error occurrence when pinning the DM column. (#8922)
|
2018-10-08 14:43:38 +02:00 |
|
Thibaut Girka
|
74e411f4e8
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-10-08 13:51:33 +02:00 |
|
Thibaut Girka
|
d17844e6d1
|
Merge branch 'master' into glitch-soc/merge-upstream
|
2018-10-08 13:51:33 +02:00 |
|
Thibaut Girka
|
3f68e9ed11
|
Move “Show action buttons in collapsed toots” option
|
2018-10-08 13:49:25 +02:00 |
|
Thibaut Girka
|
96c3d26870
|
Move “Show action buttons in collapsed toots” option
|
2018-10-08 13:49:25 +02:00 |
|
Thibaut Girka
|
caa56b01a9
|
Switch from selects to radio buttons for local settings, improve styling
|
2018-10-08 13:49:25 +02:00 |
|
Thibaut Girka
|
faecb35fe0
|
Switch from selects to radio buttons for local settings, improve styling
|
2018-10-08 13:49:25 +02:00 |
|
dependabot[bot]
|
e303c0730f
|
Bump capybara from 3.8.2 to 3.9.0 (#8924)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-08 07:45:31 +02:00 |
|
dependabot[bot]
|
4c4ff05a46
|
Bump capybara from 3.8.2 to 3.9.0 (#8924)
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-08 07:45:31 +02:00 |
|
dependabot[bot]
|
7e089b5a31
|
Bump tty-prompt from 0.17.0 to 0.17.1 (#8925)
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-10-08 07:45:08 +02:00 |
|