me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38492 commits 2 branches 0 tags 429 MiB
Commit graph

38492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Takeshi Umeda
b7420b8643 Change dashboard to short number notation (#11847) 
* Add short numeric notation to the dashboard

* Fix i18n

* Fix to embed units in code

* Remove settings and always use short notation

* Remove misplaced test lines

* Fit to other pages
 2019-09-16 14:26:16 +02:00
dependabot-preview[bot]
85afa898cd Bump puma from 4.1.0 to 4.1.1 (#11855) 
Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 14:25:37 +02:00
dependabot-preview[bot]
73fa0a7b13 Bump puma from 4.1.0 to 4.1.1 (#11855) 
Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 14:25:37 +02:00
dependabot-preview[bot]
dc35bb1ed2 Bump es6-symbol from 3.1.1 to 3.1.2 (#11851) 
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/medikoo/es6-symbol/releases)
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 19:16:02 +09:00
dependabot-preview[bot]
b2acbb62f6 Bump es6-symbol from 3.1.1 to 3.1.2 (#11851) 
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/medikoo/es6-symbol/releases)
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 19:16:02 +09:00
dependabot-preview[bot]
09785659bf Bump eslint-plugin-import from 2.18.0 to 2.18.2 (#11849) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.0...v2.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 19:15:21 +09:00
dependabot-preview[bot]
08ba494578 Bump eslint-plugin-import from 2.18.0 to 2.18.2 (#11849) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.0...v2.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 19:15:21 +09:00
Eugen Rochko
8eb0d880cb Fix 2FA challenge and password challenge for non-database users (#11831) 
* Fix 2FA challenge not appearing for non-database users

Fix #11685

* Fix account deletion not working when using external login

Fix #11691
 2019-09-15 21:08:39 +02:00
Eugen Rochko
c707ef49d9
Fix 2FA challenge and password challenge for non-database users (#11831) 
* Fix 2FA challenge not appearing for non-database users

Fix #11685

* Fix account deletion not working when using external login

Fix #11691
 2019-09-15 21:08:39 +02:00
mayaeh
79927b1f55 Change the hashtag link from WebUI to public page (#11845) 2019-09-15 15:48:00 +02:00
mayaeh
1511638975 Change the hashtag link from WebUI to public page (#11845) 2019-09-15 15:48:00 +02:00
ThibG
9291cc1b75 Merge pull request #1219 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-09-15 14:45:24 +02:00
ThibG
221bb05cf8
Merge pull request #1219 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-09-15 14:45:24 +02:00
Eugen Rochko
d43a743f31 Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
Eugen Rochko
e41527f505 Update Crowdin configuration file 2019-09-14 11:40:13 +02:00
Eugen Rochko
f86b585390 Revert "Bump webpush from 0.3.8 to 1.0.0 (#11614)" (#11840) 
This reverts commit c812a03e00.
 2019-09-14 10:36:10 +02:00
Eugen Rochko
a31b89dd71
Revert "Bump webpush from 0.3.8 to 1.0.0 (#11614)" (#11840) 
This reverts commit 9045f5e3f8.
 2019-09-14 10:36:10 +02:00
ThibG
20f209452e Fix media description button being disabled at 420 characters instead of 1500 (#11836) 2019-09-14 00:52:56 +02:00
ThibG
c00ab575b7 Fix media description button being disabled at 420 characters instead of 1500 (#11836) 2019-09-14 00:52:56 +02:00
Thibaut Girka
e143653d3a Fix tests being broken because of different default setting 2019-09-13 20:28:22 +02:00
Thibaut Girka
b83e2df6b5 Fix tests being broken because of different default setting 2019-09-13 20:28:22 +02:00
Eugen Rochko
caa2fc89b3 [Glitch] Add timeline read markers API 
Port 89989b6255 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 20:28:22 +02:00
Eugen Rochko
3665d554c5 [Glitch] Add timeline read markers API 
Port e445a8af64 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 20:28:22 +02:00
Thibaut Girka
129a2c1fc8 Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
Thibaut Girka
5477726f50 Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
Eugen Rochko
c5836cc5de Fix profile fields overflowing page width (#11828) 
Fix #11720
 2019-09-13 19:15:59 +02:00
Eugen Rochko
cfd4c55c88
Fix profile fields overflowing page width (#11828) 
Fix #11720
 2019-09-13 19:15:59 +02:00
Eugen Rochko
a5e34d5ff8 Fix web push subscriptions being deleted on rate limit or timeout (#11826) 2019-09-13 19:15:47 +02:00
Eugen Rochko
e8703c281e
Fix web push subscriptions being deleted on rate limit or timeout (#11826) 2019-09-13 19:15:47 +02:00
Eugen Rochko
47bfd278c1 [Glitch] Change max length of media descriptions from 420 to 1500 characters 
Port 9301574423 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:38:37 +02:00
Eugen Rochko
344e52ffbe [Glitch] Change max length of media descriptions from 420 to 1500 characters 
Port b6381bdc7d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:38:37 +02:00
ThibG
7de74d2e1b [Glitch] Fix display of long poll options 
Port f8e09ac4a8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:22 +02:00
ThibG
eaf49439d1 [Glitch] Fix display of long poll options 
Port cf2b708e6b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:22 +02:00
Eugen Rochko
f369837caa [Glitch] Fix unused CSS 
Port 8352a0f352 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:00 +02:00
Eugen Rochko
ef8c311a66 [Glitch] Fix unused CSS 
Port 45f44ef4d3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:00 +02:00
Eugen Rochko
d3da04be54 [Glitch] Add batch actions and categories to admin UI for custom emojis 
Port SCSS changes from 25fb124ee6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:35:20 +02:00
Eugen Rochko
c2843c5f62 [Glitch] Add batch actions and categories to admin UI for custom emojis 
Port SCSS changes from 1110ea1a91 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:35:20 +02:00
ThibG
6251d7dd76 [Glitch] Add account bio to account admin view 
Port SCSS changes from fef7f3b6d5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:55 +02:00
ThibG
ffe8decb73 [Glitch] Add account bio to account admin view 
Port SCSS changes from ec2a439a22 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:55 +02:00
Eugen Rochko
8dfd8dcbb0 [Glitch] Add batch approve/reject for pending hashtags in admin UI 
Port SCSS changes from 7799c7c75f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:26 +02:00
Eugen Rochko
6809e37f8e [Glitch] Add batch approve/reject for pending hashtags in admin UI 
Port SCSS changes from 261e52268c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:26 +02:00
Thibaut Girka
2e38d889a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 2019-09-13 18:13:43 +02:00
Thibaut Girka
74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 2019-09-13 18:13:43 +02:00
Eugen Rochko
8824964836 Remove deprecated GET /api/v1/search API (#11823) 
Use `GET /api/v2/search` instead
 2019-09-13 16:11:13 +02:00
Eugen Rochko
18331fefa2
Remove deprecated GET /api/v1/search API (#11823) 
Use `GET /api/v2/search` instead
 2019-09-13 16:11:13 +02:00
ThibG
f8e09ac4a8 Fix display of long poll options (#11717) 2019-09-13 16:04:09 +02:00
ThibG
cf2b708e6b Fix display of long poll options (#11717) 2019-09-13 16:04:09 +02:00
ThibG
7d2fceae9b Change /api/v1/timelines/public to require auth when public preview is off (#11802) 
Fixes #11289
 2019-09-13 16:03:46 +02:00
ThibG
225edac118 Change /api/v1/timelines/public to require auth when public preview is off (#11802) 
Fixes #11289
 2019-09-13 16:03:46 +02:00
Yamagishi Kazutoshi
025de313bc Change rate limit for media proxy (#11814) 2019-09-13 16:02:52 +02:00