21837b291e
Merge pull request #430 from ThibG/glitch-soc/features/bookmarks
...
Fix the bookmark column pinning fix…
2018-04-17 11:46:31 +02:00
1aac83ef47
Fix the bookmark column pinning fix…
2018-04-17 11:24:07 +02:00
84d0aa7b26
Merge pull request #429 from ThibG/glitch-soc/features/bookmarks
...
Fix pinning the bookmarks column (fixes #428 )
2018-04-16 23:24:51 +02:00
54f5170f59
Fix pinning the bookmarks column ( fixes #428 )
2018-04-16 22:52:45 +02:00
f879672554
Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements
...
Backport a few MediaGallery/Video changes from upstream (fixes #423 )
2018-04-16 14:41:36 -05:00
1076204eb4
Merge pull request #425 from ThibG/glitch-soc/fixes/gifv-modal-size
...
Fix extended video player (gifv) modal size
2018-04-16 14:41:18 -05:00
5cc7c4b920
Fix extended video player (gifv) modal size
...
It was currently full-size
2018-04-14 21:47:56 +02:00
5d96c5ac41
[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI
...
Port the video-player part of 036dd98abbfixes #423
2018-04-14 17:35:45 +02:00
c5dd4ed1d5
[Glitch] Fix media button type
...
Port ecdac9017e
2018-04-14 12:30:55 +02:00
dfe8abb8cd
[Glitch] Handle preference to always display sensitive media
...
Port the UI part of 76f3d5d16b
2018-04-14 12:27:14 +02:00
d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
...
Conflicts:
db/schema.rb
2018-04-14 03:50:31 -05:00
78aca92689
ci: Tell Travis to expect before_script to be slow.
2018-04-14 03:04:32 -05:00
95a892accd
Merge pull request #422 from KnzkDev/ja-translation
...
Add missing Japanese translation
2018-04-13 18:52:32 -05:00
dd4ad6300b
Add missing Japanese translation
2018-04-14 07:53:56 +09:00
b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
...
Bookmarks
2018-04-13 16:38:15 -05:00
ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
config/application.rb
2018-04-13 16:36:46 -05:00
50529cbceb
Upgrade Rails to version 5.2.0 ( #5898 )
2018-04-12 14:45:17 +02:00
a817f084ea
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
eb72c3398c
Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns
...
Place composer dropdown menus top if they are closer to the bottom of the viewport
2018-04-12 03:28:22 -05:00
0b326950bf
Merge pull request #416 from ThibG/glitch-soc/features/media-modal
...
Port various media modal improvements to glitch-soc
2018-04-12 00:20:19 -05:00
763cda91a8
Merge pull request #420 from ThibG/glitch-soc/fixes/reports-style
...
Update glitch-soc style to match changes to reports UI
2018-04-11 15:21:17 -05:00
8e88a18316
update gem, test pam authentication ( #7028 )
...
* update gem, test pam authentication
* add description for test parameters
* fix inclusion of optional group
2018-04-11 21:40:38 +02:00
acb434b0c9
Add glitch-soc front-end support for bookmarks
...
Unlike boosts and like, there is no confirmation dialog as misclicking
can be recovered without another user seeing it.
2018-04-11 21:05:34 +02:00
09240810b4
Add spec for bookmark endpoints
2018-04-11 21:05:34 +02:00
12f5f13fab
Place privacy dropdown menu top if it is closer to the bottom of the viewport ( #7106 )
2018-04-11 20:42:50 +02:00
50eb8f1f61
Add backend support for bookmarks
...
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
2018-04-11 20:40:29 +02:00
043a699990
Update glitch-soc style to match changes to reports UI
...
Port style changes from d9b62e34da
2018-04-11 19:15:42 +02:00
519119f657
Paginate ancestor statuses in public page ( #7102 )
...
This also limits the statuses returned by API, but pagination is not
implemented in Web API yet. I still expect it brings user experience
better than making a user wait to fetch all ancestor statuses and flooding
the column with them.
2018-04-11 12:35:09 +02:00
33c2bbdda7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-11 00:50:09 +00:00
e74e5c7eb9
Place composer dropdown menus top if they are closer to the bottom of the viewport
2018-04-10 20:52:31 +02:00
d9b62e34da
Feature: Improve reports ui ( #7032 )
...
* Further improvements to Reports UI
- Clean up notes display
- Clean up add new note form
- Simplify controller
- Allow reopening a report with a note
- Show created at date for reports
- Fix report details table formatting
* Show history of report using Admin::ActionLog beneath the report
* Fix incorrect log message when reopening a report
* Implement fetching of all ActionLog items that could be related to the report
* Ensure adding a report_note updates the report's updated_at
* Limit Report History to actions that happened between the report being created and the report being resolved
* Fix linting issues
* Improve report history builder
Thanks @gargron for the improvements
2018-04-10 20:27:59 +02:00
45c9f16f71
Improve load gap styling in web UI ( #7100 )
2018-04-10 17:12:10 +02:00
49bbef1202
Use RAILS_LOG_LEVEL to set log level of Sidekiq, too ( #7079 )
...
Fix #3565 (oops)
2018-04-10 16:08:28 +02:00
8f800ad691
Change custom emoji search to `ILIKE` instead of `=` ( #7099 )
2018-04-10 15:46:27 +02:00
219a4423d8
Feature: Allow staff to change user emails ( #7074 )
...
* Admin: Show unconfirmed email address on account page
* Admin: Allow staff to change user email addresses
* ActionLog: On change_email, log current email address and new unconfirmed email address
2018-04-10 09:16:06 +02:00
e6e93ecd8a
Fix GIFV encoding params ( #7098 )
...
- Explicitly specify video codec.
When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec.
- Swap avarage bitrate and max bitrate.
2018-04-10 09:11:55 +02:00
80a944c882
Log rate limit hits ( #7096 )
...
Fix #7095
2018-04-10 01:20:18 +02:00
0c52654b52
When creating status, if no sensitive status is given, use default ( #7057 )
...
Clients using the API that do not provide the sensitive flag are always
posting with false sensitive option.
2018-04-09 23:02:42 +02:00
904a2479dd
Feature: Direct message from Statuses ( #7089 )
...
* Fix: Switching between composing direct message and mention from menus
Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that.
* Fix: Add missing proptype check for onMention in Status component
* Add the ability to send a direct message to a user from the menu on Statuses
* Add space between "Embed" and "Mention" on expanded statuses menu
2018-04-09 17:09:11 +02:00
e057c0e525
Optimize public/headers/missing.png ( #7084 )
2018-04-09 11:34:48 +02:00
07d90b0414
i18n: Update Polish translation ( #7085 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-09 17:28:53 +09:00
498327b2e3
Exclude status itself from context query ( #7083 )
...
ancestor_statuses and descendant_statuses used to include the root status
itself, but the behavior is confusing because the root status is not
an ancestor nor descendant.
2018-04-09 09:58:53 +02:00
67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/serializers/initial_state_serializer.rb
The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047 ). Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
695b53b796
Merge pull request #414 from ThibG/glitch-soc/fixes/fix-video-playback
...
Fix video playback in glitch-soc detailed statuses
2018-04-08 18:18:41 -05:00
8a082d8735
Merge pull request #415 from ThibG/glitch-soc/fixes/source-url
...
Point to glitch-soc source and not tootsuite on the public page
2018-04-08 18:18:00 -05:00
9073687f66
[Glitch] Fix video player height
...
Port 31e7b73084
2018-04-09 01:08:51 +02:00
101e6564fd
[Glitch] Refactor scss
...
Port f691afaae9
2018-04-09 01:08:50 +02:00
0fb5ea5d15
Fix video modal
2018-04-09 00:11:10 +02:00
a4fa8c9064
[Glitch] Avoid using JS to set height in MediaModal
...
Port fa5c867e0e
2018-04-08 23:18:24 +02:00
87071d9e81
[Glitch] Improved media modal
...
Port 4e929b2d17
2018-04-08 23:15:25 +02:00
ThibG