Claire
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Matt Jankowski
d00e45a7d3
Fix Rails/I18nLocaleAssignment cop ( #24693 )
2023-04-30 14:07:03 +02:00
Claire
612a1ee697
Fix body_classes test for glitch-soc
2023-04-29 11:08:38 +02:00
Matt Jankowski
0a5f0a8b20
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +02:00
Nick Schonning
84cc805cae
Enable Style/FrozenStringLiteralComment for specs ( #23790 )
2023-02-22 09:55:31 +09:00
Nick Schonning
5116347eb7
Autofix Rubocop RSpec/BeEq ( #23740 )
2023-02-20 06:14:50 +01:00
Nick Schonning
e0e63b73ee
Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )
2023-02-19 14:54:34 +09:00
Nick Schonning
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
Ikko Ashimine
baecdf2882
Fix typo in application_helper_spec.rb ( #20981 )
...
enviroment -> environment
2022-12-15 16:20:55 +01:00
Eugen Rochko
45aa5781ce
Change brand color and logotypes ( #18592 )
...
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
2022-06-09 22:25:23 +02:00
Josh Soref
b5329e0035
Spelling ( #17705 )
...
* spelling: account
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: affiliated
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: appearance
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: autosuggest
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: cacheable
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: component
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: conversations
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: domain.example
Clarify what's distinct and use RFC friendly domain space.
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: environment
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: exceeds
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: functional
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: inefficiency
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: not
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: notifications
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: occurring
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: position
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: progress
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: promotable
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: reblogging
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: repetitive
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: resolve
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: saturated
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: similar
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: strategies
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: success
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: targeting
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: thumbnails
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unauthorized
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unsensitizes
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: validations
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: various
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
2022-03-06 22:51:40 +01:00
Eugen Rochko
51e154f5e8
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
2019-03-14 05:28:30 +01:00
Eugen Rochko
3d7f68c273
Revert Font Awesome 5 upgrade ( #8810 )
...
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit 3f9ec3de82#8799 )"
This reverts commit 8bae14591b#8792 )"
This reverts commit b9c727a945#8776 )"
This reverts commit 17af4d27da#8484 )"
This reverts commit 4b794e134d
2018-09-28 02:11:14 +02:00
Naoki Kosaka
8bae14591b
Migrate to font-awesome 5.0. ( #8799 )
2018-09-27 17:08:56 +02:00
ThibG
c39183cc62
Refactor active_nav_class for use with multiple paths ( #8757 )
2018-09-23 20:42:13 +02:00
Eugen Rochko
22e46ebad8
Add theme identifier to body classes for easier custom CSS styling ( #8439 )
...
Add forgotten custom CSS admin setting strings
2018-08-25 22:55:25 +02:00
Yamagishi Kazutoshi
1a4860a57a
Hold value of I18n.locale with ApplicationHelperSpec ( #3474 )
2017-05-31 17:09:28 +02:00
Akihiko Odaki
2d39560dc1
Use around hook to restore context in ApplicationHelper spec ( #3432 )
2017-05-30 06:29:48 -04:00
Akihiko Odaki
dff576b75d
Cover ApplicationHelper more ( #3412 )
2017-05-29 18:03:37 +02:00
Matt Jankowski
3834e1e69b
View spec fix ( #1888 )
...
* Add option to disable verify partial doubles
* Add show_landing_strip? helper method
* Use show_landing_strip? helper in accounts and stream entries views
* Fix naming in view specs
2017-04-16 03:40:33 +02:00
Matt Jankowski
ea6c930c04
Helper cleanup ( #1348 )
...
* Remove unused helper files
* Add coverage for application helper
* Add coverage for StreamEntriesHelper #display_name
2017-04-09 17:11:37 +02:00
Eugen Rochko
3cc47beb6e
Refactored generation of unique tags, URIs and object URLs into own classes,
...
as well as formatting of content
2016-09-09 20:04:34 +02:00
Eugen Rochko
1022d682dc
Normalized data in Redux, fix for asset URLs when rendered outside request
2016-09-04 14:04:26 +02:00
Eugen Rochko
039e6f951c
Fix issue with unresolvable usernames
2016-03-27 23:38:46 +02:00
Eugen Rochko
a08e724476
Fix subscriptions:clear task, refactor feeds, refactor streamable activites
...
and atom feed generation to some extent, as well as the way mentions are
stored
2016-03-25 02:13:30 +01:00
Eugen Rochko
071f64d317
Fix #13 , Atom feeds now contain formatted post content
2016-03-19 00:16:04 +01:00
Eugen Rochko
23d08c6749
Changing the use of config constants to the Rails configuration object
2016-02-29 20:06:39 +01:00
Eugen Rochko
0e8f59c16f
Refactoring Grape API methods into normal controllers & other things
2016-02-29 19:42:08 +01:00
Eugen Rochko
47d50b0e39
A lot of fixes from a live test
2016-02-28 15:46:29 +01:00
Eugen Rochko
f16b31f077
Adding a bunch of tests
2016-02-26 15:28:08 +01:00
