Commit graph

1885 commits

Author SHA1 Message Date
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration.
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
2019-10-18 23:14:14 +02:00
Jonne Haß
995f3394a8 Merge branch 'next-minor' into develop 2019-09-01 02:44:02 +02:00
Jonne Haß
6a7e937d90 Update open_graph_reader to 0.7.0
This should fix undefined method `og' for #<OpenGraphReader::Base:0x00007f73c53f2308 @bases={}>
for sites that have OpenGraph tags of other namespaces but no actual OpenGraph core tags
2019-09-01 02:42:11 +02:00
Benjamin Neff
8cab64b715
Merge branch 'next-minor' into develop 2019-07-06 22:45:05 +02:00
Benjamin Neff
593614aef1
Bump fuubar
Version 2.4.0 was yanked ... why do people do such things? m(

https://github.com/thekompanee/fuubar/issues/111
2019-07-06 22:43:41 +02:00
Benjamin Neff
a26e20ab7d
Merge branch 'next-minor' into develop 2019-07-03 13:25:49 +02:00
Benjamin Neff
cde29af545
Bump rails-assets-jasmine-ajax 2019-07-03 13:20:07 +02:00
Benjamin Neff
1e2e064268
Bump jasmine 2019-07-03 13:20:07 +02:00
Benjamin Neff
435e60c214
Bump cucumber-rails 2019-07-03 13:20:07 +02:00
Benjamin Neff
51e7958c4b
Bump pronto 2019-07-03 13:18:38 +02:00
Benjamin Neff
18b0dd0060
Bump coveralls 2019-07-03 13:18:38 +02:00
Benjamin Neff
26b247bf98
Bump webmock 2019-07-03 13:18:38 +02:00
Benjamin Neff
556fa42004
Bump fuubar 2019-07-03 13:18:38 +02:00
Benjamin Neff
1458d2d57f
Bump rubocop 2019-07-03 13:18:38 +02:00
Benjamin Neff
d2c4faeb9f
Bump versionist 2019-07-03 13:18:37 +02:00
Benjamin Neff
3a1428a672
Bump hamlit 2019-07-03 13:17:37 +02:00
Benjamin Neff
06c582a672
Bump faraday_middleware 2019-07-03 13:17:36 +02:00
Benjamin Neff
fa08ebf7bd
Bump addressable 2019-07-03 13:17:36 +02:00
Benjamin Neff
c059550943
Bump openid_connect 2019-07-03 13:17:36 +02:00
Benjamin Neff
ee503737cb
Bump secure_headers 2019-07-03 13:17:36 +02:00
Benjamin Neff
a6261fdc64
Bump nokogiri 2019-07-03 13:17:36 +02:00
Benjamin Neff
56670865b9
Bump leaflet-rails 2019-07-03 13:17:36 +02:00
Benjamin Neff
325a9122b8
Bump js-routes 2019-07-03 13:17:36 +02:00
Benjamin Neff
a018abcfe9
Bump jquery 2019-07-03 13:17:35 +02:00
Benjamin Neff
8f5c248536
Bump handlebars_assets 2019-07-03 13:17:35 +02:00
Benjamin Neff
e2ce43c3c7
Bump fog-aws 2019-07-03 13:17:35 +02:00
Benjamin Neff
c154c4e2af
Bump activerecord-import 2019-07-03 13:17:35 +02:00
Benjamin Neff
07513e2ec0
Bump rack-cors 2019-07-03 13:17:35 +02:00
Benjamin Neff
b1441356d2
Bump sidekiq 2019-07-03 13:17:35 +02:00
Benjamin Neff
e7a7f62531
Bump unicorn 2019-07-03 13:17:35 +02:00
Benjamin Neff
4ae373e3a2
Bump rails 2019-07-03 13:17:30 +02:00
lislis
9d5b981809 Two factor authentication (#7751) 2019-04-28 23:24:40 +02:00
lislis
1da118780e Two factor authentication (#7751) 2019-04-28 19:06:48 +02:00
cmrd Senya
ce597380e6 Merge branch 'next-minor' into develop 2019-04-28 19:29:36 +03:00
cmrd Senya
3f74a759b3 Bump diaspora_federation 2019-04-28 19:28:25 +03:00
cmrd Senya
f85f167f50 Implement archive import backend
This implements archive import feature.

The feature is divided in two main subfeatures: archive validation and archive import.

Archive validation performs different validation on input user archive. This can be
used without actually running import, e.g. when user wants to check the archive
before import from the frontend. Validators may add messages and modify the archive.

Validators are separated in two types: critical validators and non-critical validators.

If validations by critical validators fail it means we can't import archive.

If non-critical validations fail, we can import archive, but some warning messages
are rendered.

Also validators may change archive contents, e.g. when some entity can't be
imported it may be removed from the archive.

Validators' job is to take away complexity from the importer and perform the validations
which are not implemented in other parts of the system, e.g. DB validations or
diaspora_federation entity validations.

Archive importer then takes the modified archive from the validator and imports it.

In order to incapsulate high-level migration logic a MigrationService is
introduced. MigrationService links ArchiveValidator, ArchiveImporter and
AccountMigration.

Also here is introduced a rake task which may be used by podmins to run archive
import.
2019-04-26 18:41:27 +03:00
Benjamin Neff
e0a6189ec4
Merge branch 'next-minor' into develop 2019-03-30 15:05:47 +01:00
Benjamin Neff
093cca9a76
Bump rails-controller-testing 2019-03-30 15:03:12 +01:00
Benjamin Neff
ccbc65993d
Bump rspec-rails 2019-03-30 15:03:12 +01:00
Benjamin Neff
d9d0eb1512
Bump webmock 2019-03-30 15:03:12 +01:00
Benjamin Neff
f8419b14ba
Bump shoulda-matchers 2019-03-30 15:03:12 +01:00
Benjamin Neff
290ddbf271
Bump capybara 2019-03-30 15:03:11 +01:00
Benjamin Neff
18d7b38037
Bump rubocop 2019-03-30 15:03:11 +01:00
Benjamin Neff
01468c34dd
Bump rb-inotify 2019-03-30 15:03:11 +01:00
Benjamin Neff
7ae2dc6249
Bump asset_sync 2019-03-30 15:03:11 +01:00
Benjamin Neff
6f53f1bc0a
Bump will_paginate 2019-03-30 15:03:11 +01:00
Benjamin Neff
5195f7daac
Bump rails-timeago 2019-03-30 15:03:11 +01:00
Benjamin Neff
2585fb9b49
Bump hamlit 2019-03-30 15:03:11 +01:00
Benjamin Neff
02617a3562
Bump faraday 2019-03-30 15:03:10 +01:00
Benjamin Neff
0372924b90
Bump omniauth 2019-03-30 15:03:10 +01:00