Claire
f90fa11db5
Merge branch 'main' into glitch-soc/merge-upstream
4 years ago
ThibG
7d0031a515
Fix Google Translate breaking web interface ( #15610 )
...
- marks the page as a whole as untranslatable
- still marks user text as translatable
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 years ago
Eugen Rochko
9b1f2a4b61
Add subresource integrity for JS and CSS assets ( #15096 )
...
Fix #2744
4 years ago
Thibaut Girka
63dc7cfa90
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
Takeshi Umeda
2c7128c7f0
Add local only to hashtag timeline ( #13502 )
5 years ago
Thibaut Girka
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
5 years ago
Eugen Rochko
e5cee8062f
Fix blurhash and autoplay not working on public pages ( #11585 )
5 years ago
Thibaut Girka
02062aab55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
6 years ago
Eugen Rochko
65fffeac3f
Redesign landing page ( #10232 )
6 years ago
Thibaut Girka
5e0cf92fd1
Merge branch 'master' into glitch-soc/merge-upstream
...
No conflicts.
6 years ago
Eugen Rochko
8b19903559
Improve the public hashtag page ( #9831 )
...
- Fix height not updating when clicking show more on public hashtag page
- Add header to the public hashtag page
- Change text size and margins on the public hashtag page
6 years ago
Eugen Rochko
bc642ac24b
Redesign public hashtag page to use a masonry layout ( #9822 )
6 years ago
Thibaut Girka
45fce0e496
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
7 years ago
Yamagishi Kazutoshi
0a7e8320b2
Add alternate for RSS ( #7436 )
7 years ago
Thibaut Girka
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
Yamagishi Kazutoshi
e0b1e17bd0
Show media modal on public timeline ( #7413 )
7 years ago
David Yip
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
7 years ago
Lynx Kotoura
7150f2e9d3
Grid layout for tag pages ( #6545 )
...
* Use grid layout for the landing page
* Use grid layout for tag pages
* Set 2 columns width as explicit percentage for tag pages
7 years ago
David Yip
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi
931e66e572
Back to Web UI from tag page when signed in ( #5943 )
7 years ago
kibigo!
bdbbd06dad
Finalized theme loading and stuff
7 years ago
Lynx Kotoura
b3b4b5a2eb
Adjust public hashtag pages ( #5357 )
7 years ago
Eugen Rochko
f486ef2666
Redesign public hashtag pages ( #5237 )
7 years ago
Lynx Kotoura
a3e53bd442
Adjust tags and accounts page ( #4534 )
...
* Adjust tag and accounts page
* Remove units from 0px paddings
7 years ago
yhirano
48594b18e6
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
8 years ago
Matt Jankowski
cde1f37d93
Use site title on tags#show page ( #1802 )
8 years ago
Matt Jankowski
4ada50985a
Pagination improvements ( #1445 )
...
* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views
8 years ago
Eugen Rochko
d551e43a9b
Improve public tag page
8 years ago
Greg V
18deeb9db5
Add Microformats2 markup
...
h-feed, h-card and h-entry
8 years ago
Eugen Rochko
d236dcded2
Fix public tags page
8 years ago
Eugen Rochko
1d0321fc45
Fix pt translations, improve pre-cache queries, removing will_paginate
...
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
8 years ago
Eugen Rochko
a698b767c1
Fix linking of remote hashtags in UI, add public view of hashtags
8 years ago
Eugen Rochko
48b9619439
Adding hashtags
8 years ago