Commit Graph

24 Commits

Author SHA1 Message Date
Rens Groothuijsen
59a5193280 [Glitch] Show correct error message if chosen password is too long
Port 66baa629ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16 16:26:04 +01:00
ThibG
9a5825f864 [Glitch] Add honeypot fields and minimum fill-out time for sign-up form
Port 49eb4d4ddf to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2020-12-10 09:44:16 +01:00
ThibG
813c84cd6c [Glitch] Change how CDN_HOST is passed down to make assets build reproducible
Port 4c45b43cb8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-10-21 21:28:47 +02:00
ThibG
0f71372d63 [Glitch] Add client-side validation in password change forms
Port 7dc4c74265 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-13 22:26:22 +02:00
ThibG
b6c0f1fdc6 [Glitch] Add HTML form validation for the registration form
Port d70c3ab4c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-08-13 22:25:33 +02:00
Thibaut Girka
a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
2020-05-03 21:23:49 +02:00
Thibaut Girka
9101254d0a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
2020-04-05 18:32:06 +02:00
Thibaut Girka
9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
ThibG
fe9a124f5a [Glitch] Fix dates (without time) being rendered as datetimes in public pages
Port c31d61d7f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-02-06 21:41:50 +01:00
Thibaut Girka
dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
Nolan Lawson
ec567337dc [Glitch] fix: support KaiOS arrow navigation on public pages
Port 1e232e455c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:59:57 +01:00
Eugen Rochko
9e2e623ebe [Glitch] Change single-column mode to scroll the whole page
Port aa22b38fdb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-10-05 22:53:20 +02:00
Eugen Rochko
27f922168a [Glitch] Fix page body not being scrollable in admin layout
Port SCSS changes from b9a8b38844 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-30 15:58:29 +02:00
nzws✨
2ecc7106d7 [Glitch] Fix eslint error of import/no-extraneous-dependencies
Port d0c2c52783 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-18 17:27:51 +02:00
ThibG
5971ea7466 [Glitch] Add public blocks to /about/blocks
Port SCSS changes from 9b6a5ed109 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19 21:56:25 +02:00
ThibG
c1231a846a [Glitch] Play animated custom emoji on hover
Port 7de8c51873 to glitch-soc
2019-07-23 16:24:21 +02: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
278ff1318f [Glitch] Add attachment list fallback to public pages
Port JS changes from 4fb94c758e to glitch-soc
2019-01-13 14:42:50 +01:00
Thibaut Girka
394525e329 [Glitch] Postpone scroll-to-detailed status after react components are loaded
Port 70801b850c to glitch-soc
2019-01-10 21:00:33 +01:00
Thibaut Girka
d1da0a1086 Port a few public.js changes from upstream, move some code around
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
2019-01-10 18:45:17 +01:00
Thibaut Girka
94db024e4c [Glitch] Combine similar components into one on public UI
Port f9afd06221 to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka
dd1d98f9cf [Glitch] Show card modal on public pages
Port 16fee0335f to glitch-soc
2018-05-17 18:37:00 +02:00
Thibaut Girka
7a68079b3f [Glitch] Show media modal on public pages
Port ff7941e652 to glitch-soc
2018-04-20 15:58:36 +02:00
kibigo!
bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00