Commit graph

1175 commits

Author SHA1 Message Date
Benjamin Neff
95c0bb9ef2
Merge branch 'next-minor' into develop 2021-10-25 03:46:48 +02:00
Thorsten Claus
88e2e593a4
Update open_graph_reader gem
closes #8307
2021-10-25 03:28:56 +02:00
Jonne Haß
28213b1a47 Merge branch 'next-minor' into develop 2021-04-11 17:29:57 +02:00
Jonne Haß
2412ee390d update capybara and cucumber-rails 2021-04-11 17:25:18 +02:00
Jonne Haß
7960a51d12 update open_graph_reader to 0.7.1 2021-04-11 17:25:18 +02:00
Jonne Haß
f4dc6d0dc7 Merge branch 'next-minor' into develop 2021-04-11 17:23:46 +02:00
gabrielrumiranda
394eafccc5 Actually implement validation error case in Photo#ownserhip_of_status_message
closes #8214
closes #8048

Co-authored-by: Thorsten Claus <thorstenclaus@web.de>
2021-04-11 17:22:40 +02:00
Jonne Haß
cc5fca99be Fixup rubocop warnings from factory_bot introduction 2021-04-11 01:59:47 +02:00
Ntavranis Serafeim
671e8476ba Update factory_girl to factory_bot 2021-04-11 01:51:38 +02:00
Jonne Haß
7d9f18fda1 Merge branch 'next-minor' into develop 2021-04-10 23:17:47 +02:00
Jonne Haß
7154fc3ccc Port cukes from poltergeist to aparition
closes #8234
2021-04-10 23:17:39 +02:00
Jonne Haß
bbd4a68151 Merge branch 'next-minor' into develop 2020-11-02 19:55:41 +01:00
Jonne Haß
e1aff7e3ab drop coveralls 2020-11-02 19:55:36 +01:00
Jonne Haß
39c863ead9 Merge branch 'develop' into api 2020-01-21 23:35:01 +01:00
Jonne Haß
d08b31f2ed OpenID: remove private profile data claims that are not returned anyway and fix return values for profile and picture 2020-01-21 23:34:43 +01: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
314239ff2a
Merge branch 'next-minor' into develop 2019-05-12 00:25:52 +02:00
flaburgan
4feab5219e
Use a partial to share code between mobile and desktop, add the new route to the RegistrationController, drop flash message for closed registrations 2019-05-12 00:25:36 +02:00
Jonne Haß
dfeea521f5 Merge branch 'next-minor' into develop 2019-05-03 17:18:53 +02:00
flaburgan
83a9877def Improve likes steps
closes #8002
2019-05-03 17:17:32 +02:00
flaburgan
554faa4116 Reorganize steps a bit 2019-05-03 17:15:32 +02:00
Benjamin Neff
d25d9f96f9
Merge branch 'next-minor' into develop 2019-04-30 22:52:00 +02:00
Benjamin Neff
54fd4846c0
Use password to disable 2FA instead of a token
Using token doesn't make much sense when you can generate new tokens
right below.

closes #8006
2019-04-30 22:51:51 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop 2019-04-30 00:21:55 +02:00
Benjamin Neff
607659939d
Enable paranoid mode for devise
fixes #8001

closes #8003
2019-04-30 00:21:00 +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
Jonne Haß
99411fced7 Merge branch 'develop' into api 2019-04-26 17:54:08 +02:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +01:00
flaburgan
6804132c15
Do not autofollow back a user you are ignoring
fixes #7808

closes #7913
2019-01-06 22:02:10 +01:00
Hank Grabowski
3080d1c559 Authentication cucumber tests fixed by updating to for new scopes names 2019-01-01 11:05:55 -05:00
Benjamin Neff
5b0066a426
Merge branch 'next-minor' into develop 2018-11-18 19:36:51 +01:00
Benjamin Neff
7a958bce69
Bump cucumber 2018-11-18 19:32:16 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop 2018-11-02 01:39:11 +01:00
flaburgan
b977e9c39a
Save a screenshot of the page in tmp/capybara when a cucumber test is failing
closes #7912
2018-11-02 01:39:04 +01:00
Benjamin Neff
d06ef4505c
Wait for the image actually uploaded and removed again 2018-07-17 20:48:37 +02:00
Benjamin Neff
dcbdb69e22
Merge branch 'next-minor' into develop 2018-07-11 01:35:50 +02:00
cmrd Senya
a7cc0645e0
Cuke for web+diaspora:// link handler
closes #7826
2018-07-11 01:28:53 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop 2018-04-12 02:49:11 +02:00
Benjamin Neff
9a661177f1
Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar
closes #7772
2018-04-12 02:44:43 +02:00
Benjamin Neff
e0a8a5e34c
Bump database_cleaner 2018-04-12 02:41:56 +02:00
Benjamin Neff
66175f6908
Merge branch 'next-minor' into develop 2018-04-12 01:56:07 +02:00
Steffen van Bergerem
01ae004518
Make public stream accessible for logged out users
Fixes #6564.

closes #7775
2018-04-12 01:42:17 +02:00
Benjamin Neff
7d6623d069
Remove contacts page on profiles
closes #7769
2018-04-12 01:40:49 +02:00
Benjamin Neff
4fa92c1823
Remove flag for contacts visible to each other
This feature only worked on the same pod and was more confusing than
useful.
2018-04-12 01:39:11 +02:00
Benjamin Neff
198dddd69e
Merge branch 'next-minor' into develop 2018-02-25 23:03:17 +01:00
Benjamin Neff
9fa254b898
Use https:// for media-embed tests
I overlooked this when reviewing #6418 since it is excluded on travis
because of the @nophantomjs tag (so it didn't fail). But since we block
http:// embeds now, we need to use https:// for the tests.
2018-02-25 22:59:27 +01:00
Dennis Schubert
1903bfd307
Merge pull request #7581 from Fensterbank/improved-profile-picture-editor
Profile photo upload with cropping function
2018-02-25 04:17:44 +01:00
cmrd Senya
3e31b91b11
Add @nophantomjs tag to default cucumber profile
Use this tag for tests which can't work with PhantomJS, but which we
can run with Selenium using some other profile (not implemented here).

closes #6418
2018-02-17 19:24:39 +01:00