Commit graph

8726 commits

Author SHA1 Message Date
Haelwenn
201f8d89be Merge branch 'move-to-frontend_configurations-endpoint' into 'rebase/glitch-soc'
Move to `/api/pleroma/frontend_configurations` endpoint

See merge request pleroma/mastofe!22
2019-03-06 01:27:29 +00:00
Haelwenn (lanodan) Monnier
994b0d8563
mastodon/actions/pleroma.js: Remove unused terms-of-service code 2019-03-03 12:14:47 +01:00
Haelwenn (lanodan) Monnier
35a8a73bfb
Getting-Started: Don’t put a placeholder panel when it’s disabled 2019-03-03 12:13:56 +01:00
Haelwenn (lanodan) Monnier
1a297466d2
Getting-Started: Change endpoint to /api/pleroma/frontend_configurations and key to masto_fe 2019-03-03 12:12:59 +01:00
Haelwenn
49f9698815 Merge branch 'bugfix/remove-unsupported' into 'rebase/glitch-soc'
Bugfix: remove unsupported

See merge request pleroma/mastofe!21
2019-03-03 09:20:05 +00:00
Haelwenn (lanodan) Monnier
2e180be76d
Remove unsupported Local-only
Note: It’s still being considered to be added, but in a different way so removing it for now
2019-03-03 10:03:33 +01:00
Haelwenn (lanodan) Monnier
0e656e1a58
Remove unsupported Delete&Redraft 2019-03-03 10:00:59 +01:00
Haelwenn
9dd416ac7a Merge branch 'docs/branch-target' into 'rebase/glitch-soc'
README.md: Add `master` branch usage, try a cleaner way to do MRs

See merge request pleroma/mastofe!19
2019-03-03 08:52:55 +00:00
Haelwenn
0f44cff3a5 Merge branch 'features/content-type' into 'rebase/glitch-soc'
Features: content type dropdown

See merge request pleroma/mastofe!20
2019-03-03 08:50:58 +00:00
Haelwenn (lanodan) Monnier
bc52654ec7
Content-Type Dropdown: use the selected option icon for the menu 2019-03-01 11:49:54 +01:00
Haelwenn (lanodan) Monnier
37e72c35d0
Allow status rich-formatting 2019-03-01 11:10:18 +01:00
KokaKiwi
640c456fdf
Add status content type dropdown to compose box. 2019-03-01 10:32:47 +01:00
Haelwenn (lanodan) Monnier
a8d713dc3d
README.md: Add master branch usage, try a cleaner way to do MRs 2019-03-01 10:11:56 +01:00
Haelwenn (lanodan) Monnier
cdf95800db
flavours/glitch/reducers/compose.js: Fix toLowerCase TypeError
[Error] TypeError: e.toLowerCase is not a function. (In 'e.toLowerCase()', 'e.toLowerCase' is undefined)

Some added context: https://queer.hacktivis.me/notice/9g4OfhpIWQLNoZ3mLI
2019-03-01 04:51:26 +01:00
Haelwenn (lanodan) Monnier
210a7a578a
README.md: Add notes on branches 2019-03-01 04:51:26 +01:00
Haelwenn (lanodan) Monnier
9f515e8064
Getting-Started: Add button to switch between the two flavours 2019-03-01 04:51:15 +01:00
Haelwenn (lanodan) Monnier
8e3718cf85
mastodon/features/getting_started/index.js: Warn against support of vanilla 2019-03-01 04:51:15 +01:00
Haelwenn (lanodan) Monnier
83328a7cb1
README.md: Update notes 2019-03-01 04:51:15 +01:00
Haelwenn (lanodan) Monnier
2e941b80aa
flavours/glitch/components/error_boundary: Add switching to pleroma-fe 2019-03-01 04:51:15 +01:00
Haelwenn (lanodan) Monnier
859f855b5f
flavours/glitch/util/backend_links.js: Initial Configuration 2019-03-01 04:51:15 +01:00
Haelwenn (lanodan) Monnier
025762cde3
[glitch-port] initial_state.js: consistent max_toot_chars 2019-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
10df6a5aa1
Change pleroma config endpoint from static to api-based 2019-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
9fab20c069
config/webpack/production.js: Remove caching in OfflinePlugin (introduced in 0692991b5) 2019-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
f8cd770a7e
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-03-01 04:51:14 +01:00
Morgan Bazalgette
a872844567
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-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
5ad5c3bbd4
Remove branded images and their usage 2019-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
5795433a29
Remove countableText to count all text 2019-03-01 04:51:14 +01:00
Morgan Bazalgette
dc2f44d706
Add GitLab CI config 2019-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
c8f3a3bc9a
[mastofe] Adds deleting others notice if you have the rights(~moderator)
Closes: https://git.pleroma.social/pleroma/mastofe/issues/20
2019-03-01 04:51:14 +01:00
Haelwenn (lanodan) Monnier
1593fa866d
Remove extra /settings/profile; Change /settings/{profile,preferences} to /user-settings 2019-03-01 04:51:13 +01:00
Haelwenn (lanodan) Monnier
a04ac7446f
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-03-01 04:51:13 +01:00
Haelwenn (lanodan) Monnier
386ec146ea
app/javascript/mastodon/components/hashtag.js: Do not crash when hashtag.history is undefined 2019-03-01 04:51:13 +01:00
Morgan Bazalgette
22a21fb12d
Getting-Started column customisation (panel, notice) 2019-03-01 04:51:02 +01:00
Haelwenn (lanodan) Monnier
784e01a6e5
app/javascript/mastodon/components/media_gallery.js: Add support for audio attachements 2019-03-01 03:38:50 +01:00
Morgan Bazalgette
ebabad436f
handle empty message (ping) in ws 2019-03-01 03:38:50 +01:00
Morgan Bazalgette
2429af16ca
always make /web/login go through
Original commit: 011eda089abad18c89324ca4bcb6930bb682a0b9
2019-03-01 03:38:50 +01:00
Morgan Bazalgette
bfe8dc3db5
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-03-01 03:38:50 +01:00
Morgan Bazalgette
ff48341b91
fix the homepage being loaded issue 2019-03-01 03:38:50 +01:00
Morgan Bazalgette
e93efea87e
Default when there is no applicationServerKey meta on the page 2019-03-01 03:38:50 +01:00
Haelwenn (lanodan) Monnier
88b6545bf4
README.md: document deployement with build.sh 2019-03-01 03:38:49 +01:00
Morgan Bazalgette
9215eb1202
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-03-01 03:38:49 +01:00
Morgan Bazalgette
b7749da458
remove bundle analyzer, remove chunk hashes from css 2019-03-01 03:38:49 +01:00
Morgan Bazalgette
57e9ddf4a7
Remove unnecessary ruby from build scripts 2019-03-01 03:38:49 +01:00
Lain Iwakura
d629448248
Handle character limit in initial state in frontend. 2019-03-01 03:38:49 +01:00
Morgan Bazalgette
284e503556
Fix going to /web and getting redirected to /web/web 2019-03-01 03:38:49 +01:00
Morgan Bazalgette
b0c19578f1
README.md: full rewrite for pleroma 2019-03-01 03:38:49 +01:00
Haelwenn (lanodan) Monnier
d680a5aad2
package.json: Add (npm run) dev command 2019-03-01 03:38:49 +01:00
Haelwenn (lanodan) Monnier
54179b6529
{mastodon,flavours/glitch/util}/api.js: Remove csrf-token query 2019-03-01 03:38:49 +01:00
ThibG
b969b150e8
Merge pull request #932 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-02-28 22:02:36 +01:00
Thibaut Girka
2267eee356 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-28 21:35:53 +01:00