github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-10 07:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,985 Commits 4 Branches 95 Tags
develop
Commit Graph

608 Commits

Author SHA1 Message Date
flaburgan
452f46a548 Add reported user diaspora ID in /report view 
closes #8464
 2025-04-13 18:09:15 +02:00
Benjamin Neff
42ffd6322f Merge pull request #8203 from tclaus/2999-likes-comment 
Re-introduce likes on comments
 2023-11-13 02:32:43 +01:00
Benjamin Neff
b0c196aea0 Add notifications for likes on comments 2023-11-13 02:27:55 +01:00
Benjamin Neff
71d071be60 Only show heart icon when avatars are shown for comment likes 2023-11-13 02:27:55 +01:00
Thorsten Claus
67f8ba5d57 Refacor files namespaces 2023-11-13 02:27:55 +01:00
flaburgan
587e106095 Add a more detailed modal when reporting a post or a comment 2023-11-13 00:15:33 +01:00
Dennis Schubert
c095959e6a [CI] Make the extremely long status message less long. 
The old message, being 2048 chars long, apparently sometimes tripped up
Ferrum or Chrome itself. The new, shorter, message does that less or not
at all. It's still long enough, though, as the way we determine if a
status message is "too long" is by height only, so line-breaks work.
 2023-06-13 05:00:29 +02:00
Benjamin Neff
5425f5cfa6 Switch from apparition to cuprite driver 
Apparition4 isn't really maintained anymore and there are no new releases
and it always logs a lot of errors, making the output hard to read.

So lets switch to cuprite, as it also supports everything we need and is
still maintained.

Supersedes #8330
 2023-06-05 23:34:52 +02:00
Thorsten Claus
8e01a66cb5 Finishing Touches 2022-09-01 22:49:48 +02:00
Benjamin Neff
6c9e7f283f Merge branch 'next-minor' into develop 2022-06-19 19:30:56 +02:00
Sage Ross
6fadfb30fe Undo another Capybara refactor that causes CI to break 
Alas.

Closed #8331
 2022-06-19 19:30:41 +02:00
Sage Ross
107f118db4 Undo change to aspects_steps.rb that breaks the build 
When I removed this and tested it locally, the feature spec still passed, but it is failing on CI, so it looks like we still need this `execute_script` use until we find a better Capybara strategy.
 2022-06-19 19:29:57 +02:00
Sage Ross
ae5333d67d Revert "Replace "execute_script" for triggering hovercards" 
This reverts commit e7dc4eca9e.
 2022-06-19 19:29:57 +02:00
Sage Ross
4fe52a72f1 Fix comment style violation 2022-06-19 19:29:57 +02:00
Sage Ross
d14036b630 Replace "evaluate_script" for toggling a Bootstrap switch in spec 2022-06-19 19:29:57 +02:00
Sage Ross
637dad208a Replace "execute_script" in publisher_steps definitions 2022-06-19 19:29:57 +02:00
Sage Ross
4548380080 Replace "execute_script" in spec scrolling down on notifications 2022-06-19 19:29:57 +02:00
Sage Ross
b67cf8e983 Replace "execute_script" for filling in Close Account modal 
Using "fill_in" seems to work fine with the apparition driver, and will hopefully also work on CI now.
 2022-06-19 19:29:57 +02:00
Sage Ross
ef7a5f8d6e Replace "execute_script" for triggering hovercards 
In addition to getting rid of an "execute_script" instance, this approach is slightly higher fidelity, as it renders the hovercard at the correct place on the page and doesn't reach into jQuery to trigger the hovercard.
 2022-06-19 19:29:57 +02:00
Sage Ross
688245c0de Remove unnecessary execute_script call in feature spec 
This call to `execute_script` would directly call jQuery's `sortable` function on an element to make it sortable. However, this isn't necessary; the test can still drag the "Cat People" aspect to the desired position without it.
 2022-06-19 19:29:57 +02:00
Sage Ross
245bc1a05f Remove unused custom web step 
It looks like this web step is no longer used anywhere. It was implemented for the "Feature: inifinite scroll" test, but that no longer exists.
 2022-06-19 19:29:57 +02:00
Sage Ross
df4504979e Refactor "I scroll" web step to avoid using execute_script 
The apparition driver does not support "scroll_by" without going through "execute_script", but we can better express the intention of this test and make the scrolling action a bit more general by replacing "scroll a bit" with "scroll to [some element]" — in this case, we need to scroll until the "Change" button is visible so that we can press it.

This change_settings.feature spec is the only place that used "I scroll a bit".
 2022-06-19 19:29:57 +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ß
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
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
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
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