AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 4 Pull requests Projects Releases Wiki Activity
8477 commits 3 branches 59 tags 148 MiB
Commit graph

8477 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn (lanodan) Monnier
1797752d02
Revert: Resize images before upload in web UI to reduce bandwidth 
Closes: https://git.pleroma.social/pleroma/mastofe/issues/22

(Can also fix an issue with canvas and the Tor Browser)
 2019-01-21 03:19:20 +01:00
Haelwenn (lanodan) Monnier
c0a0acbb6c
Replace mastodon software notice to a mastofe one 2019-01-21 03:19:19 +01:00
Morgan Bazalgette
9b94bfacc2
Pleroma theme for mastofe 
- resize columns dynamically, with min width of 330↵
- Change colours of mastodon frontend↵
- make avatars circled↵
- add slight hint of rounding on main ui components↵
 2019-01-21 03:19:19 +01:00
Haelwenn (lanodan) Monnier
e881ba3dda
Remove branded images and their usage 2019-01-21 03:19:19 +01:00
Haelwenn (lanodan) Monnier
e3c84991db
Remove countableText to count all text 2019-01-21 03:19:18 +01:00
Morgan Bazalgette
9ac319bb63
remove --color and --progress from buildscripts 2019-01-21 03:19:18 +01:00
Morgan Bazalgette
9532a62f22
Add GitLab CI config 2019-01-21 03:19:17 +01:00
Haelwenn (lanodan) Monnier
cb11b0f78e
[mastofe] Adds deleting others notice if you have the rights(~moderator) 
Closes: https://git.pleroma.social/pleroma/mastofe/issues/20
 2019-01-21 03:19:17 +01:00
Haelwenn (lanodan) Monnier
9bc105bafd
Remove extra /settings/profile; Change /settings/{profile,preferences} to /user-settings 2019-01-21 03:19:17 +01:00
Haelwenn (lanodan) Monnier
09039a4a55
app/javascript/styles/mastodon/components.scss: Fix notifications text color 
This is because pleroma doesn’t put a “<p></p>” everywhere in the statuses.

It was done previously in 68fd7ee6a435c3fdef82b2b92d9e8f6f550a61aa

Co-authored-by: Morgan Bazalgette <the@howl.moe>
 2019-01-21 03:19:16 +01:00
Haelwenn (lanodan) Monnier
a771ef5641
app/javascript/mastodon/components/hashtag.js: Do not crash when hashtag.history is undefined 2019-01-21 03:19:16 +01:00
Morgan Bazalgette
c4577e8b09
Add support for instance-specific panel 2019-01-21 03:19:16 +01:00
Haelwenn (lanodan) Monnier
9ed3eb0762
app/javascript/mastodon/components/media_gallery.js: Add support for audio attachements 2019-01-21 03:19:16 +01:00
Morgan Bazalgette
6c39e8c9d3
handle empty message (ping) in ws 2019-01-21 03:19:15 +01:00
Morgan Bazalgette
3445b80b9e
always make /web/login go through 
Original commit: 011eda089abad18c89324ca4bcb6930bb682a0b9
 2019-01-21 03:19:15 +01:00
Morgan Bazalgette
9c92359bc2
package.json: Add description field 
APPARENTLY NPM ADDS A npm_package_description WHICH IS THE description
FIELD IN package.json WHICH HOWEVER IF NOT SET BECOMES THE SECOND LINE
OF THE README LIKE WHAT THE FUCKKKKKKKKKKKKK
 2019-01-21 03:19:15 +01:00
Morgan Bazalgette
8a1453254b
fix the homepage being loaded issue 2019-01-21 03:19:14 +01:00
Morgan Bazalgette
c43d48fdf1
Default when there is no applicationServerKey meta on the page 2019-01-21 03:19:14 +01:00
Haelwenn (lanodan) Monnier
fcaf59cea2
README.md: document deployement with build.sh 2019-01-21 03:19:13 +01:00
Morgan Bazalgette
85bd55e5cf
remove gzip on assets, add build.sh 
pickups:
- build.sh: Make the target dir configurable
- build.sh: Auto-update yarn dependencies

Co-authored-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
 2019-01-21 03:19:13 +01:00
Morgan Bazalgette
ec849e5730
remove bundle analyzer, remove chunk hashes from css 2019-01-21 02:44:34 +01:00
Morgan Bazalgette
0d872d2cbb
Remove unnecessary ruby from build scripts 2019-01-21 02:34:07 +01:00
Lain Iwakura
7719295a07
Handle character limit in initial state in frontend. 2019-01-21 02:34:04 +01:00
Morgan Bazalgette
09f52338a7
Fix going to /web and getting redirected to /web/web 2019-01-21 02:33:01 +01:00
Morgan Bazalgette
5be3169930
Rewrite installation guide for using with pleroma be 2019-01-21 02:32:45 +01:00
ThibG
aa362ab73d
Merge pull request #888 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-20 13:56:37 +01:00
Thibaut Girka
5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a17 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka
e9060b04d4 [Glitch] Hide floating action button on search and getting started pages 
Port 30af4ee65f to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576
9b5810b3e9 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka
a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port b506ce1197 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka
8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from a492a9bcd3 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni)
6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka
02295257b3 [Glitch] Improve the public hashtag page 
Port 8b19903559 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka
3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout 
Port bc642ac24b to glitch flavour
 2019-01-20 11:38:09 +01:00
Thibaut Girka
5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
Eugen Rochko
7c3fddeab4
Change CHANGELOG.md references from pull requests to authors (#9864) 
Add `rake repo:changelog` to do that automatically
 2019-01-19 16:25:20 +01:00
Eugen Rochko
57e79eb1c2
Bump to 2.7.0rc3 2019-01-19 00:01:27 +01:00
Eugen Rochko
80768e2840
Fix missing account association in tombstone model (#9857) 2019-01-18 23:52:09 +01:00
Eugen Rochko
b59818d4ab
Bump version to 2.7.0rc2 (#9836) 2019-01-18 22:55:01 +01:00
Alexander Mankuta
88c5a8a4ff Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01:00
Eugen Rochko
b506ce1197
Fix new hashtag page's items not being full-width on mobile (#9852) 
Fix #9845
 2019-01-18 20:58:11 +01:00
Eugen Rochko
32daecffef
Fix REST API showing non-public reblogs for a given status (#9850) 2019-01-18 20:58:00 +01:00
dependabot[bot]
bf31f394fb Bump json-ld from 2.2.1 to 3.0.2 (#8804) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 16:02:29 +01:00
dependabot[bot]
f424e99e46 Bump brakeman from 4.3.1 to 4.4.0 (#9848) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.3.1...v4.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 15:57:41 +01:00
ThibG
aeb124491d Reject existing Follow in addition to sending a Block (#9811) 
Mastodon expects remote servers to remove follow relationships upon receiving
a Block. However, the spec only evokes Block activities in a C2S context, never
in a S2S context.

This PR, in addition to federating the Block, explicitly sends a Reject for any
affected follow relationship, which makes a bit more sense with regards to the
spec.
 2019-01-18 15:57:19 +01:00
ThibG
75b1488cf4 Add tombstones for remote statuses (#9830) 
* Add Tombstone model to remember object deletion

* Do not recreate a status if it has been deleted

* Record Tombstone for remote deleted items

Also, only record deleted items from same-host actors

* Clear an user's tombstones when their key change
 2019-01-18 15:56:55 +01:00
Eugen Rochko
31f396b57d
Add support for non-public reblogs from ActivityPub (#9841) 
Fix #9838
 2019-01-18 15:56:21 +01:00
dependabot[bot]
55219f11cc Bump bundler-audit from 0.6.0 to 0.6.1 (#9847) 
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases)
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md)
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.0...v0.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 23:23:31 +09:00
Eugen Rochko
a492a9bcd3
Add information about how to opt-in to the directory on the directory (#9834) 
Fix #9833
 2019-01-18 10:25:44 +01:00
Eugen Rochko
4699cf853c
Add timeouts for S3 (#9842) 2019-01-18 01:36:59 +01:00