07066bf5bb
remove duplicate border radi
2018-11-18 18:36:06 -05:00
2f9d59cf1e
fix full-width embeds and light theme embeds
2018-11-18 18:35:42 -05:00
9a49c503c8
Fix unnecessary scrollbar on compose drawer
2018-11-17 20:00:41 -08:00
7c0624ccfa
Merge branch 'theme_win95' into cybrespace
2018-11-17 17:27:22 -08:00
6f6c4f2a50
Merge branch 'theme_light' into cybrespace
2018-11-17 17:26:59 -08:00
42954f329a
Merge branch 'theme_cybre' into cybrespace
2018-11-17 17:26:55 -08:00
a0ba41a78c
Merge branch 'theme_base' into cybrespace
2018-11-17 17:26:47 -08:00
6695882f19
Merge branches 'branding_cybre', 'dependency_whatinput', 'feature_512_char_toots', 'feature_disable_reply_counts', 'feature_hotlink_twitter_mentions', 'feature_cybrespace_locale', 'feature_doodlebox' and 'feature_longer_bios' into cybrespace
2018-11-17 17:26:31 -08:00
35d7ae4974
Cybrespace branding changes
2018-11-17 17:26:07 -08:00
f40d8a3c37
Windows 95 theme
2018-11-17 17:21:37 -08:00
9eab8a139f
Cybrespace light theme
2018-11-17 16:30:57 -08:00
7abb76fd6f
Cybre dark theme
2018-11-17 16:22:42 -08:00
a0bce3a23f
Fix media height weirdness, handle new status cards
2018-11-17 16:20:49 -08:00
chr
7dae98557c
Base SCSS for cybrespace themes
...
Performs some baseline tweaks to the mastodon application scss that are
shared between all the cybrespace themes
2018-11-12 23:26:12 -08:00
Andrew
87eb1df45a
Add whatinput dependency for more responsive focus styling
2018-11-12 23:00:14 -08:00
a01c7ce321
Cybrespace locale
...
An alternative locale that replaces "toot" with "ping", "favorite" with
"florp", and "boost" with "relay", as well as a few other miscellaneous
changes. Also includes alternate settings that make the en-CY locale
default instead of en-US, and fixes the timestamps.
2018-11-12 22:35:38 -08:00
ebed61cf88
Doodlebox
...
A modification to the Mastodon interface that allows you to select a
doodle icon in addition to uploading a media file from your computer.
The doodle interface allows you to draw using your mouse, finger, or
pointing device in several colors. It was originally developed by
Ondřej Hruška <ondra@ondrovo.com> for use on the GlitchSoc fork.
2018-11-12 21:53:37 -08:00
Andrew
99b3c18b28
Hotlink twitter mentions
...
Differentiate twitter mentions from normal mentions
2018-11-12 21:44:10 -08:00
df0855a91b
Bio length -> 413 characters
...
Increase the cybre.space profile bio text length limit to 413
characters. Also modifies the account settings page to automatically
resize the textbox to the size of the contained text, so that it's
easier to type longer bios.
2018-11-12 21:28:25 -08:00
Andrew
bf7b956a99
Remove reply counts on non-expanded view
2018-11-12 20:16:48 -08:00
Andrew
5834fc5aa1
Feature: 512-character limit in the toot box on client and serverside
2018-11-12 19:58:20 -08:00
Eugen Rochko
ba06a5f485
Bump version to 2.6.1 ( #9172 )
2018-10-31 01:04:45 +01:00
Eugen Rochko
b9d0d209cd
Fix reducer error when conversation has no last status in web UI ( #9173 )
...
Fix #9170
2018-10-31 00:55:20 +01:00
Eugen Rochko
ce2ee68b64
Revert "Fix FetchAtomService content type handling ( #9132 )" ( #9171 )
...
This reverts commit c36a4a1617
2018-10-31 00:43:34 +01:00
Eugen Rochko
50ce347ef9
Bump version to 2.6.0 ( #9149 )
...
* Bump version to 2.6.0
* Update CHANGELOG.md
2018-10-30 22:06:59 +01:00
Quentí
804586172e
[i18n] Update for Occitan ( #9169 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
* Update simple_form.oc.yml
* Update oc.json
2018-10-30 22:06:31 +01:00
Eugen Rochko
f2290e311b
Remove progress estimate from MigrateAccountConversations ( #9168 )
2018-10-30 21:09:33 +01:00
Jeong Arm
7800e1af7e
Specify node version to not use node11 ( #9166 )
...
uWS has no support node11 yet.
2018-10-30 19:46:20 +01:00
Eugen Rochko
66019b0ec4
Bump version to 2.6.0rc4 ( #9164 )
...
* Bump version to 2.6.0rc4
* Update CHANGELOG.md
2018-10-30 17:37:49 +01:00
Eugen Rochko
f59b840549
Fix empty display name precedence over username in web UI ( #9163 )
...
Fix #9131
2018-10-30 17:06:12 +01:00
Eugen Rochko
cc45a8f9f7
Fix td instead of th in sessions table header ( #9162 )
...
Fix #9130
2018-10-30 17:00:34 +01:00
Eugen Rochko
5c8e7f0e1d
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" ( #9161 )
...
This reverts commit 10680f93e7
2018-10-30 16:25:54 +01:00
valerauko
c36a4a1617
Fix FetchAtomService content type handling ( #9132 )
...
* Add profile to json+ld in Accept
It's required by the ActivityPub spec
* Use headers['Content-type'] instead of mime_type
mime_type strips the profile from the content type, but it's still available raw in the headers hash
* Add test for ld+json with profile
2018-10-30 15:07:57 +01:00
Quentí
a3d40ba53b
[i18n] Update for Occitan ( #9157 )
...
* Update oc.json
* Update devise.oc.yml
* Update oc.yml
* Update oc.json
2018-10-30 15:05:01 +01:00
Eugen Rochko
be202f9377
Accept the same payload in multiple inboxes and deliver ( #9150 )
2018-10-30 15:03:55 +01:00
Eugen Rochko
47b8d195e6
Always let through notifications from staff ( #9152 )
...
* Always let through notifications from staff
Follow-up to #8993
* Let messages from staff through, but no other notifications
2018-10-30 15:02:55 +01:00
ThibG
a03d506626
Fix Pleroma mentions being fetched as preview cards ( #9158 )
2018-10-30 15:02:24 +01:00
dependabot[bot]
c1eec9869e
[Security] Bump loofah from 2.2.2 to 2.2.3 ( #9160 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 22:59:11 +09:00
dependabot[bot]
6771e8c88c
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 06:39:52 +01:00
trwnh
2cc099c70f
Make detailed-status__wrapper actually wrap detailed status ( #8547 )
...
* Remove class from scrollable div
.detailed-status__wrapper does not actually wrap the detailed status here
* Re-add class to focusable div
.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area
2018-10-30 06:33:02 +01:00
Eugen Rochko
d4415cc316
Bump i18n-tasks from master to 0.9.28 ( #9148 )
2018-10-30 01:06:47 +01:00
Masoud Abkenar
e961a763a2
RTL: fix toot privacy preferences radio buttonss ( #9146 )
2018-10-30 00:49:29 +01:00
Masoud Abkenar
5ee0b51ac8
RTL: fix preferences page checkbox margins ( #9145 )
...
* RTL: fix preferences page checkbox margins
* Update rtl.scss
2018-10-30 00:47:43 +01:00
ThibG
33a71e8f7c
Do not hide boost notifications from followed people with hidden boosts ( #9147 )
...
* Do not hide boost notifications from followed people with hidden boosts
Not displaying boosts from a followed user in the Home timeline and not
having notifications when they reblog your own content are two very
separate concerns, tying them together seem counter-intuitive and unwanted.
* Update specs accordingly
2018-10-30 00:47:31 +01:00
Eugen Rochko
e84da282f6
Bump version to 2.6.0rc3 ( #9142 )
...
* Bump version to 2.6.0rc3
* Update CHANGELOG.md
2018-10-29 14:15:54 +01:00
Eugen Rochko
3fd808ab26
Update AUTHORS.md ( #9141 )
2018-10-29 14:05:53 +01:00
Eugen Rochko
b40ea6d1d4
Bump sanitize from 4.6.6 to 5.0.0 ( #9140 )
2018-10-29 14:05:25 +01:00
Eugen Rochko
32f950a7a8
Update i18n-tasks to master ( #9139 )
2018-10-29 13:46:39 +01:00
Julian
fb2e699eeb
Improved grammar in German translation ( #9092 )
...
Just a grammar improvement.
2018-10-29 13:24:15 +01:00
m.b
2b18f5f85d
Add Page AP type support ( #9121 )
2018-10-29 13:23:29 +01:00
