Commit graph

4730 commits

Author SHA1 Message Date
Steffen van Bergerem
5efb4a912e Prevent scroll to top when clicking 'mark all as read' in the notification dropdown
Fixes #7252

closes #7253
2017-01-10 23:41:35 +01:00
Steffen van Bergerem
fb06d03f49 Close modals at the end of each jasmine spec
closes #7246
2017-01-10 23:32:27 +01:00
Steffen van Bergerem
c164dac7a4
Merge branch 'next-minor' into develop 2017-01-07 18:32:15 +01:00
Frédéric Bolvin
7cc4b46d7e
Replaced fileuploader-custom with FineUploader
closes #7083
2017-01-07 18:32:08 +01:00
Dennis Schubert
2c68c1f142
Merge branch 'next-minor' into develop 2016-12-04 20:10:17 +01:00
Benjamin Neff
6c37171f9f
Change last sentence and fix specs
closes #7238
2016-12-04 20:10:13 +01:00
Benjamin Neff
da52627ab2 Merge branch 'next-minor' into develop 2016-12-02 03:31:45 +01:00
Senya
dd9bda24f4 Remove user_methods require line
No need to explicitly require user_methods.rb since it is already required in spec_helper.rb

closes #7236
2016-12-02 03:24:36 +01:00
Dennis Schubert
af1c992e01
Merge branch 'next-minor' into develop 2016-12-01 03:17:21 +01:00
cmrd Senya
31a31ecbe1
pass "state" parameter back to openid client 2016-12-01 03:16:50 +01:00
Benjamin Neff
bab503d960 Merge branch 'next-minor' into develop 2016-12-01 02:29:00 +01:00
Steffen van Bergerem
00ce187b07 Don't show browser notifications on pageload
closes #7211
2016-12-01 02:27:52 +01:00
Benjamin Neff
3b0c1020c0 Merge pull request #6818 from cmrd-senya/1851-mentions-in-comments.new
Mentions in comments backend changes
2016-11-29 19:31:43 +01:00
Senya
c547e66eb6 Remove a dangling "lola" object creation
It's never used and possibly was left unnoticed by some refactoring.

closes #7230
2016-11-29 17:46:37 +01:00
cmrd Senya
33ad411bbd
Mentions in comments backend changes 2016-11-28 15:56:56 +02:00
cmrd Senya
ef5751b808
Refactor mail workers to use common base
Introduce Workers::Mail::NotifierBase to be a base for all appropriate
mail workers to reduce code duplication
2016-11-28 15:35:46 +02:00
cmrd Senya
0ee34f8590
Remove the photo comment spec
This functionality is not something we support and it doesn't look
it will be reintroduced soon.

see discussion https://github.com/diaspora/diaspora/pull/6818#discussion_r70227392
2016-11-28 15:35:36 +02:00
Justin Ramos
fa71af71c1 require spec_helper in .rspec
closes #7223
2016-11-27 21:27:12 +01:00
Steffen van Bergerem
9f88850faf Fix 500 on mobile commented and liked streams
Fixes #7218, regression from #7036

closes #7219
2016-11-26 02:37:33 +01:00
Steffen van Bergerem
e186811aed Remove unused contacts link methods
closes #7221
2016-11-26 02:25:29 +01:00
Justin Ramos
6c6f9bb982
only show community spotlight link on /contacts if it is enabled
closes #7213
2016-11-25 14:10:58 +01:00
Steffen van Bergerem
0051d6a0b8 Move comment, like and reshare creation error translations
closes #7202
2016-11-22 03:54:56 +01:00
Steffen van Bergerem
f999624967 Use error message from the server when comment failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
82e78d3ce8 Use error message from the server when like failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
6c5c865b15 Use error message from the server when reshare failed 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8078c60cee Refactor aspect membership error response handling with flash messages 2016-11-22 03:53:01 +01:00
Steffen van Bergerem
b645541d52 Update notifications when changing the stream
fixes #6473

closes #7199
2016-11-22 03:00:59 +01:00
Steffen van Bergerem
5660d2f4a8 Refactor comment creation in post interactions backbone model
closes #7186
2016-11-19 03:40:42 +01:00
Steffen van Bergerem
ed5f218559 Only clear comment textarea when comment submission was successful
fixes #5094
2016-11-19 03:40:29 +01:00
Augier
af331bfb30
Add collection to app.views.NotificationDropdown and app.views.Notifications
closes #6952
2016-11-18 15:27:37 +01:00
Steffen van Bergerem
9b72527f3e Refactor conversations controller creation specs
closes #7197
2016-11-18 02:14:18 +01:00
Steffen van Bergerem
9bca03d5e9 Refactor ShareVisibilitesController
closes #7196
2016-11-18 02:10:26 +01:00
Steffen van Bergerem
37b34237b9 Force jasmine fails on syntax errors
closes #7185
2016-11-15 22:50:17 +01:00
Steffen van Bergerem
cdce25374f Reduce i18n.load side effects
closes #7184
2016-11-15 22:46:06 +01:00
Steffen van Bergerem
a951c40ba0 Only reload profile header when changing aspect memberships
closes #7183

fixes #7072
2016-11-15 22:37:39 +01:00
Steffen van Bergerem
3930069e67 Leave help view spec with the default locale 2016-11-15 22:36:06 +01:00
Steffen van Bergerem
1863137161 Use string-direction gem for rtl detection
closes #7181
2016-11-15 22:33:56 +01:00
Steffen van Bergerem
457cf2aafb Fix deprecation warnings in conversations controller spec
closes #7187
2016-11-14 03:27:55 +01:00
Steffen van Bergerem
7cd2232812 Only allow conversation creation in controller with mututal contacts 2016-11-14 03:27:15 +01:00
Steffen van Bergerem
117b17e25e Remove unused conversations modal fixture
closes #7129
2016-11-13 20:11:34 +01:00
Steffen van Bergerem
8983554f94 Improve profile header jasmine test
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
cbe3ca5cf6 Improve conversations form jasmine test
* test that tag element are removed when clicking the tag's remove button
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
4c86b64532 Improve contacts page jasmine test
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
2016-11-13 20:08:59 +01:00
Steffen van Bergerem
9cbadec659 Move 'XSS via name parameter' to mobile conversation specs
because the desktop view doesn't use the name parameter anymore
2016-11-13 20:08:59 +01:00
Augier
f2fdaf1daf Use typeahead on conversations 2016-11-13 20:08:59 +01:00
Steffen van Bergerem
5269a0d3c0
Fix aspect membership view spec syntax
Regression introduced in #7132
2016-11-12 21:37:48 +01:00
Benjamin Neff
851c16d80c
Add setting for a custom changelog url.
fixes #7073

closes #7166
2016-11-06 02:41:42 +01:00
Benjamin Neff
57c0330535
Schedule a connection-check when receiving a message from an offline pod
closes #7158
2016-11-06 02:40:05 +01:00
Steffen van Bergerem
a73e1baaed Show spinner when loading comments
closes #7170
2016-11-03 22:50:03 +01:00
Steffen van Bergerem
e3b3da404f Fetch comments, likes and reshares separately
Fixes #7165

closes #7167
2016-11-02 23:02:32 +01:00
Steffen van Bergerem
98b345305e Remove unused jasmine fixture 2016-11-02 22:59:25 +01:00
Steffen van Bergerem
2ec45317a3 Add new JSON endpoint for reshares 2016-11-02 22:59:25 +01:00
Benjamin Neff
9f38a424e7
Revert "Test token authentication; should allow it"
It shouldn't be allowed!

This reverts commit 46097ba8c8.

closes #7160
2016-10-28 00:36:18 +02:00
Benjamin Neff
d421e42ddb
Remove ability to authenticate with auth_token on the frontend
Remove devise-token_authenticatable gem and only generate a token to be
used by the chat.
2016-10-28 00:36:14 +02:00
Benjamin Neff
0dd98a5c13
Bump diaspora_federation
closes #7145
2016-10-27 02:26:11 +02:00
Steffen van Bergerem
f90812671c
Show error messages from server when aspect membership changes fail
closes #7132
2016-10-27 02:24:58 +02:00
Steffen van Bergerem
3bea40b248
Refactor conversations creation
closes #7131
2016-10-27 02:23:35 +02:00
Steffen van Bergerem
0c995eb629
Add JavaScript for mobile alerts 2016-10-27 02:23:26 +02:00
cmrd Senya
a80806ca58
Fix ID token issuer field to match discovery data
OpenID Connect spec says:

"The issuer returned by discovery MUST exactly match the value of iss in the ID Token."

https://openid.net/specs/openid-connect-core-1_0.html#IssuerIdentifier

closes #7081
2016-10-27 02:22:27 +02:00
hilkoc
b7791e6c9d Add user setting for default post visibility
fixes #4319

closes #7118
2016-10-26 02:48:11 +02:00
Benjamin Neff
ac08e9351b
Hide "Follow #tag" button on tag page if not logged in
closes #7155
2016-10-24 00:25:27 +02:00
Augier
8c90e5ac46
Search suggestion can be opened in a new tab + displays contact's hovercard
closes #7134
2016-10-18 15:37:23 +02:00
cmrd Senya
cdcf2d747e
Override forgery settings in controllers
ClientsController and TokenEndpointController are called from the outside,
so CSRF verification prevents them from normal operation.

closes #7062
2016-10-01 10:24:15 +02:00
Benjamin Neff
6ec0fd4b9f
Add nonce to javascript tags 2016-09-30 02:10:37 +02:00
Steffen van Bergerem
35aa0badc5
Refactor stream shortcuts
closes #7127
2016-09-30 01:44:24 +02:00
Steffen van Bergerem
b1a76cac86
Fix spelling in conversations inbox view spec 2016-09-30 00:32:46 +02:00
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js 2016-09-30 00:32:46 +02:00
Benjamin Neff
b8c76a3317
Trigger getting started with backbone 2016-09-28 21:59:08 +02:00
Benjamin Neff
20cdbe262e
Link directly to the comment from notification mails
closes #7124
2016-09-25 23:07:53 +02:00
Dennis Schubert
dfb5b717b6 Add In-Reply-To and References headers to notification mails
closes #7122
2016-09-25 20:15:16 +02:00
Benjamin Neff
fe5811bb65
Don't federate to pods that are offline for more than two weeks
Also fix a case where offline_since can be nil.

fixes #6220

closes #7120
2016-09-25 03:20:41 +02:00
Augier
523f1e848e
Replace .stream_element by .stream-element 2016-09-25 03:12:28 +02:00
Steffen van Bergerem
709547860a
Refactor SPV post interactions
closes #7089
2016-09-25 03:07:02 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL
closes #7066
2016-09-25 02:58:56 +02:00
Steffen van Bergerem
ffb442266f
Remove custom typeahead mouse events
closes #7096
2016-09-20 04:29:43 +02:00
Benjamin Neff
fe071aa2a2
Deliver to each recipient only once
closes #7071
2016-09-20 04:25:04 +02:00
Benjamin Neff
3f2586bc6f
Create share visibilities for photos attached to a private post
Also fixed the "fix public photos"-migration, because it didn't work
with migration-models :/

fixes #6177
2016-09-20 04:24:37 +02:00
Steffen van Bergerem
327cabe6fe Add number of unreviewed reports to admin dashboard and admin sidebar
closes #7109
2016-09-18 22:48:05 +02:00
Benjamin Neff
5837919946
Fix link to comment on report-page
closes #7105
2016-09-18 13:41:44 +02:00
Steffen van Bergerem
dc1bc75303 Fix moving publisher on first click after page load
closes #7094

fixes #7093
2016-09-13 01:02:39 +02:00
Steffen van Bergerem
546f909658 Fix 500 in html requests for post interactions
closes #7085
2016-09-11 00:21:13 +02:00
Steffen van Bergerem
e54077c856 Remove photo_backdrop factories 2016-09-11 00:18:39 +02:00
cmrd Senya
ad596d8df1
Fix tags URLs in hovercards
fixes #7074

closes #7075
2016-09-09 00:53:21 +02:00
Steffen van Bergerem
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link
closes #7061
2016-09-06 05:08:04 +02:00
Benjamin Neff
c5ebea5bda
Fix randomly failing interacted_at spec
also remove some unnecessary Timecop.return

closes #7060
2016-09-05 22:44:52 +02:00
Benjamin Neff
50e7314535
Cleanup invalid unconfirmed emails
Also remove confirm_email_token when unconfirmed_email is removed.

Fixes #7048

closes #7051
2016-09-04 21:40:27 +02:00
Steffen van Bergerem
4d51c02432 Add OpenGraph video support
closes #7043
2016-09-04 03:55:09 +02:00
Benjamin Neff
8c58206e63
Fix links of more-button on mobile streams
Fixes #6999

closes #7036
2016-09-04 03:31:41 +02:00
Benjamin Neff
4fea926057
Only update interacted_at on new comments
I got feedback from many users, that they don't understand how the "my
activity" stream is sorted, because they have posts on the top, but
don't see why. The user doesn't see if a like was added, and it is also
not imported for the user to see the post again then. And we have
notifications if someone likes a users own posts, so no need to move it on
top of the "my activity" stream here too.

closes #7030
2016-09-04 03:29:59 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails
closes #7050
2016-09-04 03:26:42 +02:00
Steffen van Bergerem
6ad9000f8c
Sign out users with wrong CSRF tokens
See http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf
2016-09-04 03:26:18 +02:00
Steffen van Bergerem
806de7e9d8
Exclude closed accounts from search
closes #7042
2016-09-04 03:22:58 +02:00
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions
closes #7040
2016-09-04 03:17:48 +02:00
Steffen van Bergerem
02742a4a8f
Use post controls view for single post moderation 2016-09-04 03:16:24 +02:00
Steffen van Bergerem
8faedd574d
Move post controls to a separate view 2016-09-04 03:16:24 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments
closes #7045
2016-09-04 03:15:35 +02:00
Steffen van Bergerem
89b51dddf9
Add application controller specs for grammatical gender 2016-09-04 03:02:27 +02:00
Steffen van Bergerem
08794bc47b
Remove user_photo method from users controller
closes #7049
2016-09-04 03:01:51 +02:00
Steffen van Bergerem
18fbb2a885 Remove useless notifier spec
closes #7056
2016-09-04 02:24:58 +02:00
Benjamin Neff
4b020b8d61 Fix regressions from #6998
* fixed old reshares of reshares
* fixed deleted root of a reshare
2016-08-22 00:43:43 +02:00
Dennis Schubert
003672f0b1
Merge pull request #7011 from SuperTux88/fix-author-not-lowercase
Use Person.by_account_identifier to find the author
2016-08-21 14:26:20 +02:00
Benjamin Neff
1d5080888f Use Person.by_account_identifier to find the author 2016-08-21 04:01:42 +02:00
Benjamin Neff
8d725160f9 Use https for the pod_uri if require_ssl is true 2016-08-21 01:48:52 +02:00
Benjamin Neff
c6427c4ec0 don't add the root author to the subscribers if the root post was deleted 2016-08-18 23:34:58 +02:00
Denis Hovart
bcace2def2 6840 : meta tags update (#6998)
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.

* Adds tests to post controller to check correctness of metas

* Add methods to PersonPresenter to have metas on profile pages

* Correct meta data helper test

* Update PersonPresenter, add test to PeopleController

* Creates TagPresenter. Display tag metas on tag index page

* Updata meta data helper spec

* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.

* Set meta info as hashes in presenters

* Move original hardcoded metas info to config/defaults.yml

* metas_tags include by default the general metas, update views

* Update code style, clean views

* Renames TagPresenter StreamTagPresenter, updates TagController spec

* Add a default_metas entry to diaspora.yml.example

* Align metas hash in presenters, refactor meta data helper

* Use bio as description meta if user has a public profile

* Rename StreamTagPresenter to TagStreamPresenter
2016-08-18 21:52:39 +02:00
Steffen van Bergerem
8dc011cfb1
Remove specs about services swallowing exceptions 2016-08-18 20:30:17 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:36:27 +02:00
Steffen van Bergerem
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts 2016-08-18 13:02:14 +02:00
Jonne Haß
e3a95d7d71 Merge pull request #6995 from SuperTux88/fix-mention-fetching
only create mentions after creating statusmessages
2016-08-18 12:00:11 +02:00
Steffen van Bergerem
18683f9ca8
Fix backbone router for URLs with trailing slashes 2016-08-18 10:57:59 +02:00
Steffen van Bergerem
34e3fb2e14
Merge pull request #6991 from cmrd-senya/dropdown-regression
Fix aspect dropdown when person is being fetched
2016-08-18 10:07:35 +02:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination 2016-08-18 01:54:43 +02:00
Benjamin Neff
fb318373c7 only create mentions after creating statusmessages 2016-08-17 02:26:58 +02:00
Jonne Haß
fedd378dcf
Merge pull request #6992 from SuperTux88/4491-fetch-mentioned-people
fetch mentioned people if they don't exist locally yet
2016-08-16 10:41:02 +02:00
Steffen van Bergerem
e5c5490932
Merge pull request #6981 from AugierLe42e/fix-6979
Fixes #6979
2016-08-15 23:00:16 +02:00
cmrd Senya
4b3f36e92a
Fix aspect dropdown when person is being fetched
fix #6989
2016-08-15 23:43:24 +03:00
Dennis Schubert
9d662a90d6
Merge pull request #6987 from SuperTux88/allow-hovercard-for-remote-people
Allow hovercards of remote people when not logged in
2016-08-15 16:25:48 +02:00
CSammy
8491df1625 Added test for loading of previous posts on a tag page. 2016-08-15 13:30:20 +02:00
CSammy
adc9492bf0 Added tests for various result cardinalities of tag pages. 2016-08-15 04:39:36 +02:00
CSammy
1d793fcc49 Reused tag stream query for tag pages. 2016-08-15 04:39:11 +02:00
Benjamin Neff
23541546e9 Allow hovercards of remote people when not logged in
In #6603 hovercards were activated for logged out users, but they only
worked for local people. Hovercards on remote-people are important to
get the diaspora-id to search the person on the local pod, if you don't
know who it is.
2016-08-15 01:33:26 +02:00
Benjamin Neff
0d338b6f79 don't create notifications if the notification-actor is ignored
Also move "shareable hidden"-logic to AlsoCommented, because it is the
only one that needs it. And write some specs for mentioned and started
sharing notifications.

Fixes #6294
2016-08-14 17:03:49 +02:00
Augier
c5618591c3 Fixes #6979 2016-08-14 11:04:11 +02:00
Benjamin Neff
f4459488e5 allow other people to share with a user who ignores them
otherwise we have data-inconsistency if the user stops ignoring the
person.
2016-08-14 01:08:26 +02:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations
Cleanup invitations
2016-08-13 14:16:41 +02:00
Benjamin Neff
bc6c8a0598 disable registration with invite-code when invitations are closed
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
2016-08-13 13:51:28 +02:00
Benjamin Neff
3b1a5c6bdf don't reduce number of invites when registration is open
otherwise the counter goes into negative ;)

also  reset all negative counters
2016-08-13 13:51:02 +02:00
Steffen van Bergerem
da5aef2b75
Fix charcounter position in publisher 2016-08-13 03:21:40 +02:00
Benjamin Neff
e749bbef15 don't reduce number of available invites if there were errors. 2016-08-13 01:47:27 +02:00
Benjamin Neff
2a553940d4 small design fixes for invites 2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a Cleanup legacy invitations from code
Fixes #5116
2016-08-13 01:47:27 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2
Comments expansion refactoring
2016-08-12 23:46:22 +02:00
augier
5c2e241106 Displaying the markdown editor on publisher 2016-08-12 23:08:41 +02:00
cmrd Senya
8e6df0b1e3
Comments expansion refactoring
If you look at comment expand process with javascript debugger, you
will notice that at first comments get added to existing stream ("add"
event handler of model.comments gets launched because of model.comments.fetch).
Then the comment stream gets empty and then filled by the postRenderTemplate
handler.

This patch removes comments rerendering on the expansion. The fetching process is
changed so that older comments are added to the correct place, so the order
looks nice without rerendering. Thus, unnecessary job of rerendering is avoided.
2016-08-12 22:06:51 +03:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Jonne Haß
e70ffebc49 Merge pull request #6805 from cmrd-senya/mention-name-fixup
Fix up the meaning of the name parameter in mention
2016-08-11 13:28:02 +02:00
cmrd Senya
d200e92aeb Fix up the meaning of the name parameter in mentions
The desktop frontend now treats the "name" parameter of mention as
a string to display unconditionally. But the Diaspora::Mentionable
renders mentions the different way: "name" is treated as a fallback
string which is rendered only if the person's name is unavailable.
This reflects on the mobile version ATM. This patch makes it behave
the same way as the current desktop version does.
2016-08-11 13:19:48 +03:00
Jonne Haß
7fa299b7ad Merge pull request #6959 from cmrd-senya/devise-upgrade
Upgrade devise to 4.2
2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Jonne Haß
1d2132ebba Merge pull request #6965 from SuperTux88/5847-fix-settings-page
Fix settings page after submit
2016-08-11 02:29:34 +02:00
Benjamin Neff
71ed7446c1 Fix user settings style after submit
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings

Fixes #5847
2016-08-11 01:58:47 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box 2016-08-10 17:19:58 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js 2016-08-10 00:41:07 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
9f28b935b9
Drop contacts.json 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts 2016-08-09 15:12:44 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
Benjamin Neff
d3edbfd829 remove pending flag from posts 2016-08-08 19:37:10 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
Benjamin Neff
7ff18d92fb remove old unused data_conversion fixtures 2016-08-08 19:37:09 +02:00
Benjamin Neff
4a6721af3c cleanup fixtures/public_posts.json 2016-08-08 19:37:09 +02:00
Jonne Haß
32174aa532
Merge pull request #6932 from SuperTux88/relayable-additional-fields
Save relayable signature data
2016-08-08 19:28:21 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title
closes #6642
2016-08-08 19:23:17 +02:00
Benjamin Neff
89b068e474 write some more tests 2016-08-08 18:56:37 +02:00
Benjamin Neff
1d8ce00bef save signature data on receive 2016-08-08 18:56:37 +02:00
Benjamin Neff
2a6ca1b831 use signature data for federation 2016-08-08 18:56:37 +02:00
cmrd Senya
94ce383498
Introduce NotificationSerializer
And remove the note_html property from the model.
2016-08-08 17:22:30 +03:00
cmrd Senya
a3f208c380
Notifications and search page backend updates
Updates introduce support for preloading contacts to Gon in order
to support client-side rendering of aspect membership dropdown box.
2016-08-08 17:21:38 +03:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards 2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership
in order to support adding new aspect to a dropdown without full
page reload
2016-08-08 17:21:14 +03:00
cmrd Senya
15e0f88758
Rename photos[:count] to photos_count in gon 2016-08-08 17:19:26 +03:00
cmrd Senya
ed7fc10043
Clear gon after each rspec test 2016-08-08 17:19:08 +03:00
cmrd Senya
838e5ca432
Use the factory in the publisher_view_spec.js 2016-08-08 17:18:53 +03:00
cmrd Senya
f0bd1f9f06
AspectSelections spec corrections 2016-08-08 17:18:45 +03:00
cmrd Senya
06352b7809
AspectSelections style fixes 2016-08-08 17:18:37 +03:00
cmrd Senya
d50ab83157
Rename app.collections.Aspect{,Selection}s 2016-08-08 17:18:31 +03:00
cmrd Senya
ac2f161271
Fix views.js corner case 2016-08-08 17:18:20 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Steffen van Bergerem
ba26175421
Fix duplicate activity stream posts 2016-08-07 02:07:05 +02:00
Jonne Haß
f91734028c
Merge pull request #6934 from SuperTux88/fetch-error-handling
better error message if we webfinger a person with invalid guid
2016-08-01 13:20:56 +02:00
Jonne Haß
48e5db8235
Stabilize social_relay_presenter_spec.rb 2016-08-01 13:19:07 +02:00
Benjamin Neff
5aa52b36af better error message if we webfinger a person with invalid guid
this happens if a remote person changed the diaspora-id manually (renamed
domain or something) in their database.
2016-07-31 23:05:53 +02:00
cmrd Senya
035a483a7a Fix randomly failing profile federation spec
same as #6913
2016-07-17 13:02:46 +03:00
Jonne Haß
8fcb66a425
Merge pull request #6910 from SaiVardhan/Issue#6850_private_message
[Fix] #6850 Don't include subjects of private message
2016-07-17 09:32:19 +02:00
Benjamin Neff
2cd831f94e also validate remote posts
all data is included in the federated status_message, so we can validate
on receive. add the photos to the status_message before save.
2016-07-17 01:40:00 +02:00
Benjamin Neff
df9874b73a remove raw_message
This was only an alias for "text", and "raw_message" is also not used
for federation anymore, so we can drop it.
2016-07-17 01:40:00 +02:00
Jonne Haß
8cffc5cfbe
bump rails to 4.2.7 2016-07-15 13:48:09 +02:00
Benjamin Neff
32cc0951bb bump diaspora_federation 2016-07-15 02:02:55 +02:00
SaiVardhan
274104aac6 issue-6850 Don't include subjects of private messages in email notifications 2016-07-12 16:33:15 +05:30
Jonne Haß
b3a06c1c58 Merge pull request #6913 from svbergerem/fix-randomly-failing-federation-spec
Fix randomly failing profile federation spec
2016-07-11 11:23:13 +02:00
Steffen van Bergerem
d6fbde3b7f
Fix randomly failing profile federation spec 2016-07-09 19:22:22 +02:00
Steffen van Bergerem
f8d8089cb6
Add more specs for the admins controller 2016-07-09 12:30:19 +02:00
Steffen van Bergerem
b01ca5d3bc
Add basic help controller spec 2016-07-09 10:55:59 +02:00
Steffen van Bergerem
b296e73c36
Add basic terms controller spec 2016-07-09 10:55:59 +02:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions
Filter mentions on status message creation
2016-07-06 22:27:13 +02:00
aoh0x7DE
d75f795cad Fix issue #6847 (#6905)
* Fix issue #6847
2016-07-06 01:57:23 +02:00
Jonne Haß
bcd7894e59
add code coverage reporting 2016-07-05 23:35:53 +02:00
Steffen van Bergerem
46cbc6e52a
Filter mentions on status message creation 2016-07-04 10:26:45 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
715cb1bb87
Remove unused translations 2016-07-03 18:14:23 +02:00
Jonne Haß
18fc98d3aa Merge pull request #6895 from cmrd-senya/services-spec-fixup
Fix up nodeinfo tests
2016-06-28 00:15:08 +02:00
cmrd Senya
27ae4ff4fd
Fix up nodeinfo tests
Tests for nodeinfo failed if services config are non-default. Fix it
to pick the data for comparation from application settings.
2016-06-27 22:54:01 +03:00
Benjamin Neff
824201fedc fetch mentioned people if they don't exist locally yet
fixes #4491
2016-06-27 17:04:22 +02:00
Benjamin Neff
3bfc4003fb fetch unknown persons to generate url 2016-06-27 14:43:19 +02:00
Jonne Haß
09908a45fb
StatusMessage#raw_message returns empty string for NULL values
Previously the federation layer has written the empty string to the
database, now it writes nil/no value to it while our code still expects
the empty string in some cases. Restore the old assumption by returning
the empty string, the real raw value by now is available again in
StatusMessage#text for those that need it, such as validations or tests.
2016-06-27 12:07:11 +02:00
Benjamin Neff
c0ab42fecc check if links is an array in the JRD 2016-06-27 04:04:09 +02:00
Benjamin Neff
2a0e87957f validate NodeInfo json against schema in ConnectionTester 2016-06-27 04:04:09 +02:00
Jonne Haß
5d318400c9
Diaspora::Federation::Receive::ignore_existing_guid returns nil when
ignoring the error message

Previously it returned the return value of Logging::Logger#warn, which
is true for loggers that log the warn level. However
Diaspora::Federation::Receive::receive_relayable checks the return value
for truthiness in order to decide whether to attempt to relay it,
resulting in a NoMethodError: undefined method `parent' for
true:TrueClass in Diaspora::Federation::Receive::relay_relayable

This change is cosmetic as the exception raised prevented any action
that shouldn't happen anyway, so there's no actual logic change.
2016-06-26 17:01:33 +02:00
Benjamin Neff
9a3f653c45 fix sender for messages for old pods
Send a second message to remote recipients with conversation-author
as salmon author if the conversation-author is local.

The first dispatch will fail on old pods. New pods will ignore the
second message, if the guid already exist.
2016-06-26 14:05:52 +02:00
Benjamin Neff
9fda255add use the parent author of the target as sender for relayable retractions 2016-06-26 11:05:23 +02:00
Benjamin Neff
5e0b1dd28d use match_array for comment_service_spec 2016-06-26 10:43:27 +02:00
Benjamin Neff
7241b1c054 use the parent author as salmon sender, if the parent author is local 2016-06-26 10:28:32 +02:00
Benjamin Neff
3b1d113a9a add own posts to activity-stream again 2016-06-26 06:21:03 +02:00
Benjamin Neff
ab2118ffa5 don't participate own posts 2016-06-26 06:21:03 +02:00
Benjamin Neff
e08306dab4 remove participation parent author check
the check that the participation parent author is local is now done in
the diaspora_federation gem
2016-06-26 06:21:03 +02:00
Benjamin Neff
65f03b2d08 extract mappings between diaspora and the federation gem 2016-06-26 06:21:02 +02:00
Benjamin Neff
bb0d7e46dc add #object_to_receive to Diaspora::Federated::Base 2016-06-26 06:21:02 +02:00
Benjamin Neff
1cf11db634 remove diaspora_handle setter to set author 2016-06-26 06:21:02 +02:00
Benjamin Neff
5e16b9c7cd add author to subscribers of public shareables to ensure local delivery 2016-06-26 06:21:02 +02:00
Benjamin Neff
a81bdac38c don't send relayables back to sender pod
send retraction for relayable to target author if retracted by parent author
2016-06-26 06:21:02 +02:00
Benjamin Neff
9dfa8e1442 send retractions for public relayables privately if the parent is remote 2016-06-26 06:21:02 +02:00
Benjamin Neff
70f378a1c1 don't participate own posts on creation 2016-06-26 06:21:02 +02:00
Benjamin Neff
f58167c154 disconnect when receiving a Contact with sharing=false 2016-06-26 06:21:02 +02:00
Benjamin Neff
709ad6e909 Participation is not relayable anymore
only deliver to parent author
2016-06-26 06:21:02 +02:00
Benjamin Neff
cf5a72719e participates root author when receiving a reshare 2016-06-26 06:21:02 +02:00
Benjamin Neff
9fa3cc97d4 deliver message always to all participants
message doesn't include Diaspora::Relayable anymore
2016-06-26 06:21:02 +02:00
Benjamin Neff
b39f3ccc74 relay relayables after receive
also refactored relayable specs to use `let`
2016-06-26 06:21:02 +02:00
Benjamin Neff
91c6c74ca0 retract relayables if the author is ignored by the parent author 2016-06-26 06:21:02 +02:00
Benjamin Neff
0f6e0b7288 send the profile to remote persons on start shareing with them 2016-06-26 06:21:02 +02:00
Benjamin Neff
c15babdc9f allow to dispatch to specific subscribers 2016-06-26 06:21:02 +02:00
Benjamin Neff
57dbcc0e67 add root author to reshare subscribers 2016-06-26 06:21:02 +02:00
Benjamin Neff
03123f1c4d remove more unused code and cleanup 2016-06-26 06:21:01 +02:00
Benjamin Neff
2476b74dbe refactoring delete from services 2016-06-26 06:21:01 +02:00
Benjamin Neff
dee8bc6f0e write specs for dispatcher 2016-06-26 06:21:01 +02:00
Benjamin Neff
f95e0faa37 delete old postzord dispatcher 2016-06-26 06:21:01 +02:00
Benjamin Neff
0e6446d05f create ShareVisibilities with batch import
and delete old batch worker and receiver
2016-06-26 06:21:01 +02:00
Benjamin Neff
4d8211b641 remove old SignedRetraction and RelayableRetraction 2016-06-26 06:21:01 +02:00
Benjamin Neff
9144a4aadd write specs for retractions 2016-06-26 06:21:01 +02:00
Benjamin Neff
51aca4506f remove HttpMulti and HydraWrapper 2016-06-26 06:21:01 +02:00
Benjamin Neff
ae05d4e928 use Diaspora::Federation::Dispatcher everywhere 2016-06-26 06:21:01 +02:00
Benjamin Neff
b0942bc219 remove salmon code 2016-06-26 06:21:01 +02:00
Benjamin Neff
fa5a35ed4a remove xml specs 2016-06-26 06:21:01 +02:00
Benjamin Neff
d2219aa58f write spec for Diaspora::Federation::Entities to replace xml specs 2016-06-26 06:21:01 +02:00
Benjamin Neff
7893a23927 add resharers and participants to subscribers on public posts 2016-06-26 06:21:01 +02:00
Benjamin Neff
566f4890a2 merge Federated::Shareable to Shareable
also drop xml-code for Shareable
2016-06-26 06:21:01 +02:00
Benjamin Neff
902d7faca4 relay retractions for relayables 2016-06-26 06:21:01 +02:00
Benjamin Neff
3df70bb205 send retractions for public targets publicly 2016-06-26 06:21:01 +02:00
Benjamin Neff
7f11beae37 dispatch retractions 2016-06-26 06:21:00 +02:00
Benjamin Neff
65ba573a3b Contact retraction 2016-06-26 06:21:00 +02:00
Benjamin Neff
89fbcf7c56 federate retractions 2016-06-26 06:21:00 +02:00
Benjamin Neff
ecbf5fa3e7 enable some skipped tests again 2016-06-26 06:21:00 +02:00
Benjamin Neff
9ce9b4bcd0 deliver profile update with new dispatcher 2016-06-26 06:21:00 +02:00
Benjamin Neff
caf5d562de mock new send worker in tests 2016-06-26 06:21:00 +02:00
Benjamin Neff
5f25135848 send public messages 2016-06-26 06:21:00 +02:00
Benjamin Neff
7184d4334e remove after_dispatch hook
handle photos in StatusMessageCreationService
2016-06-26 06:21:00 +02:00
Benjamin Neff
20dabbd15f remove user parameter from subscribers method 2016-06-26 06:21:00 +02:00
Benjamin Neff
f9f91a0e9e create new contact for local receive 2016-06-26 06:21:00 +02:00