Commit graph

1487 commits

Author SHA1 Message Date
cmrd Senya
e0e40f73c3
Spec for post creation bad aspects_ids issue 2018-03-25 08:28:59 +02:00
kas70
40fc175d6e
only include mutual sharing contacts in conversations form on contacts page
fixes #7377
2018-03-22 23:15:24 +01:00
Benjamin Neff
b9787cc632
Start sending the blocking flag 2018-02-01 23:35:35 +01:00
Benjamin Neff
746ff52256
Fix mention in #newhere message when invited by another person
fixes #7701
closes #7702
2018-02-01 23:35:04 +01:00
Rete2
fc33a2ac5d
Create birthday notification and mailer
closes #7624

fixes #1649
2017-12-18 04:34:35 +01:00
cmrd Senya
ad025850ce
Forbid user destruction 2017-10-17 01:38:36 +02:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
Steffen van Bergerem
b77ecd482a
Replace aspect_membership_dropdown with aspect-membership-dropdown 2017-08-31 02:44:54 +02:00
Benjamin Neff
e31c5ff4dc
Handle unauthenticated users for likes/comments of private posts
closes #7583
2017-08-29 12:55:03 +02:00
Benjamin Neff
350e24863f
Allow to load likes and reshares without login 2017-08-29 12:35:48 +02:00
Steffen van Bergerem
48630b3a04
Fix conversation recipient prefill on contacts page
Use the already available contacts data for the prefill
2017-08-29 02:13:27 +02:00
Steffen van Bergerem
666ada44f1
Fix conversation recipient prefill on profile page
Fixes #7586

Use the already available data about the recipient for the prefill
2017-08-29 02:13:27 +02:00
Benjamin Neff
6d7ba96c4f
Remove locals option from render_template assertion
The locals option is only supported in ActionView::TestCase, so it is
ignored anyway (even worse, it disabled the complete assertion). I added
some more assertions to ensure the template is rendered with the correct
conversation.

closes #7588
2017-08-29 02:02:03 +02:00
Benjamin Neff
634c13f967
Remove wrong format: :json from status_messages_controller_spec
This was added by accident with the rails5 upgrade
2017-08-29 02:01:43 +02:00
Steffen van Bergerem
ff9591aee0
Use gender-neutral forms in comments and specs
closes #7544
2017-08-17 00:50:55 +02:00
Benjamin Neff
2d06b2865f
Handle when the block to delete doesn't exist
closes #7542
2017-08-16 20:40:11 +02:00
Benjamin Neff
a4d1ad160c
Fix stop ignoring from privacy settings and on mobile
Fixes #7541
2017-08-16 20:39:58 +02:00
cmrd Senya
8f46073809
Stop disabling Send workers for each example 2017-08-14 13:54:38 +03:00
Steffen van Bergerem
04735ce9b0
Remove unused interactions method in post controller 2017-08-12 18:09:14 +02:00
Steffen van Bergerem
0bfc2fdd77
Load likes and reshares in the SPV via gon 2017-08-12 18:09:13 +02:00
Benjamin Neff
385ab76077
Refactor OpenID specs to prevent duplicate client names 2017-08-12 15:39:24 +02:00
Benjamin Neff
7c9590a27c
Use .reload instead of (true) in specs
Or remove it where not needed
2017-08-12 15:39:23 +02:00
Benjamin Neff
2a6515fab9
Add params keyword to controller specs 2017-08-12 15:39:23 +02:00
Benjamin Neff
5335ee86d6
Mobile fails now with ActionController::UnknownFormat 2017-08-12 15:39:22 +02:00
Benjamin Neff
80c241bc7a
Replace redirect_to :back with redirect_back
Also remove some unused html responses
2017-08-12 15:39:22 +02:00
Benjamin Neff
4f9e560ab3
Use RFC 7033 webfinger from diaspora_federation gem 2017-07-03 03:14:41 +02:00
Benjamin Neff
246d1ebbdf
Remove legacy post xml
This was used for the old post fetching

Related to diaspora/diaspora_federation#31
2017-07-03 03:14:40 +02:00
Benjamin Neff
95def40c55
Make Message entity non-relayable
Related to #36
2017-07-02 23:56:00 +02:00
Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop 2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
fixes #7195

closes #7455
2017-05-26 01:50:55 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop 2017-05-21 12:06:41 +02:00
Benjamin Neff
7934c1e969
Add NodeInfo 2.0 support 2017-05-21 12:05:54 +02:00
Benjamin Neff
064fc3cc45
Merge branch 'next-minor' into develop 2017-05-05 02:30:56 +02:00
Steffen van Bergerem
23d3d9dc3f
Use post page title for atom feeds and add entry author
Fixes #7249

closes #7420
2017-05-05 02:30:46 +02:00
Steffen van Bergerem
c94bac3cf9
Return 406 instead of 500 for statistics.json
Fixes #7406
2017-03-30 23:17:58 +02:00
Steffen van Bergerem
e8ee74ef87
Remove statistics.json 2017-03-27 15:54:34 +02:00
Benjamin Neff
e82ac2199f
Merge branch 'next-minor' into develop 2017-03-04 22:11:22 +01:00
Steffen van Bergerem
612455d41f
Bump faraday and twitter
closes #7348
2017-03-04 22:10:23 +01:00
Benjamin Neff
ec2c4a8564
Merge branch 'next-minor' into develop 2017-02-18 23:00:59 +01:00
Steffen van Bergerem
436934e890
Refactor reshares controller using reshare service 2017-02-18 22:59:38 +01:00
Steffen van Bergerem
e74b524e8f
Refactor likes index route 2017-02-18 22:59:37 +01:00
Steffen van Bergerem
2772cb6e0c
Refactor likes controller using like service 2017-02-18 22:59:37 +01:00
Benjamin Neff
7b7fbeffdc Merge branch 'next-minor' into develop 2017-01-15 23:45:56 +01:00
Steffen van Bergerem
941118d7af Move formatting from locale to views
closes #7283
2017-01-15 23:42:03 +01:00
Benjamin Neff
03f9147589 Merge branch 'next-minor' into develop 2017-01-15 02:19:10 +01:00
Steffen van Bergerem
b8d3323de0 Return error when unlike failed 2017-01-15 02:17:10 +01:00
cmrd Senya
1fb6040344
new PostController#mentionable_in_comment action 2017-01-13 04:47:50 +02: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
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
Justin Ramos
fa71af71c1 require spec_helper in .rspec
closes #7223
2016-11-27 21:27:12 +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
6c5c865b15 Use error message from the server when reshare failed 2016-11-22 03:53:01 +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
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
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
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
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
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
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js 2016-09-30 00:32:46 +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
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
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link
closes #7061
2016-09-06 05:08:04 +02:00
Steffen van Bergerem
806de7e9d8
Exclude closed accounts from search
closes #7042
2016-09-04 03:22:58 +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
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
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts 2016-08-18 13:02:14 +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
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
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
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
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
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
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
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
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title
closes #6642
2016-08-08 19:23:17 +02: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