Thibaut Girka
a2a64ecd3e
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
..
2018-12-01 17:39:13 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-10 21:00:30 +01:00
2019-01-08 17:31:58 +01:00
2019-01-10 21:00:30 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2017-11-20 22:13:37 -08:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-10 21:00:30 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-10 21:00:30 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2017-05-07 19:55:47 +02:00
2018-07-24 20:47:13 +02:00
2017-05-07 19:55:47 +02:00
2017-05-17 17:50:39 +02:00
2018-05-07 01:34:19 +02:00
2018-07-11 01:14:38 +02:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2017-05-07 19:55:47 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-12-09 15:35:22 +01:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-01-22 14:20:58 +01:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-06-13 03:55:28 +02:00
2018-08-18 01:00:01 +09:00
2017-07-04 16:11:23 +02:00
2019-01-08 14:09:57 +01:00
2018-12-22 23:32:00 +01:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-09-02 03:14:46 +02:00
2017-05-07 19:55:47 +02:00
2018-01-03 21:00:39 +09:00
2018-05-10 14:48:26 +02:00
2018-01-05 04:43:50 +01:00
2018-01-03 21:00:39 +09:00
2017-11-25 03:39:57 +01:00
2018-09-02 18:20:26 +02:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-09 14:12:35 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2017-07-10 14:02:18 +02:00
2017-05-30 23:09:02 +02:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00
2019-01-08 17:31:58 +01:00