me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9594 commits 2 branches 0 tags 429 MiB
Commit graph

25 commits

Author SHA1 Message Date
Thibaut Girka
e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
ThibG
4ad004d2ef Fix “invited by” not showing up for invited accounts in admin interface (#10791) 2019-05-19 21:40:36 +02:00
Thibaut Girka
73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Eugen Rochko
c3b1f6963b Change e-mail whitelist/blacklist to not be checked when invited (#10683) 
* Change e-mail whitelist/blacklist to not be checked when invited

And only when creating an account, not when updating it later

Fix #10648

* Fix test
 2019-05-03 23:44:44 +02:00
Thibaut Girka
cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 2019-04-10 09:16:08 +02:00
Hinaloe
da343470c4 Allow set the voting period to just 5 minutes (#10525) 
* Add spec of PollValidator for #10190

* Raise fraction less than 1 second

* format

* simplify time initialize
 2019-04-09 17:02:12 +02:00
Thibaut Girka
de60ff3809 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-12 20:32:48 +01:00
Franck Zoccolo
ffe97d5dda Add support for IPv6 only MXes in Email validation (#10009) 
* Add support for IPv6 only MXes

* Fixed email validator tests
 2019-02-12 14:48:04 +01:00
Thibaut Girka
a78447a6a4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
 2019-01-10 21:00:30 +01:00
ysksn
cd51dfdd76 Add specs for UrlValidator (#9699) 2019-01-03 13:10:20 +09:00
ysksn
3cab7b9a17 Add specs for UnreservedUsernameValidator (#9698) 
* Add specs for UnreservedUsernameValidator

* Use instance variable
 2019-01-03 13:10:02 +09:00
Thibaut Girka
44f2224606 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
 2019-01-02 15:36:53 +01:00
ysksn
41afd670c9 Add specs for FollowLimitValidator (#9655) 2018-12-29 08:24:52 +01:00
ysksn
5eb6d7e3e0 Add specs for BlackListedEmailValidator (#9651) 
* Add specs for BlackListedEmailValidator

* Use instance variable
 2018-12-29 07:23:44 +01:00
ysksn
a3b4684435 Add specs for DisallowedHashtagsValidator (#9653) 
In order to implement tests easier, `#select_tags` created.
 2018-12-29 07:22:51 +01:00
ysksn
44c1647ea1 Add specs for StatusPinValidator (#9648) 2018-12-28 18:09:32 +09:00
ysksn
c4559969b4 Add pending specs for StatusLengthValidator (#9647) 
* Add pending specs of StatusLengthValidator

* Use instance variable
 2018-12-28 08:18:47 +01:00
Thibaut Girka
04204427d0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
 2018-12-15 10:45:53 +01:00
Eugen Rochko
8d3910afdd Improve e-mail MX validator and add tests (#9489) 2018-12-10 22:53:25 +01:00
Thibaut Girka
b62953b3d2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
 2018-12-09 16:08:04 +01:00
ysksn
994c20699c Remove pending spec (#9454) 
Since dots are not allowed in username,
this spec is no longer needed.
 2018-12-07 16:38:50 +01:00
David Yip
2567d0a704 Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
unarist
0fb7252ac4 Add a spec for UniqueUsernameValidator (#6927) 
Note that this spec has a pending test about dots in the username,
because allowing it has been reverted for now.
 2018-03-27 05:22:58 +02:00
aschmitz
8fb6b02b54 Fix StatusLengthValidator tests 
This fixes the StatusLengthValidator tests to use
StatusLengthValidator::MAX_CHARS to derive the length of the strings
tested, and so makes them resilient to changes in MAX_CHARS (such as the
one that made these tests fail, with it being changed from 500 to 512).

This seems a bit odd for some types of tests, but appears to make sense
here, where the testing goes beyond `status.length > MAX_CHARS`.
 2017-09-02 11:37:40 -05:00
Eugen Rochko
39b0588256 Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) 
* Count all URLs in text as 23 characters flat, do not count domain part of usernames

* Add new status text counting logic to web UI
 2017-07-29 00:06:29 +02:00