Commit graph

2583 commits

Author SHA1 Message Date
Jonne Haß
04744b4dac API: Return 409 when trying to create something existing and 410 when trying to delete something already gone
Probably missed a few more cases where we always return sucess when the user requests
status quo, but this should cover most ground
2020-02-02 18:04:11 +01:00
Jonne Haß
e8b9a70fbf Ensure API responses adhere to documented error format 2020-02-02 18:04:11 +01:00
Jonne Haß
35bfbc9c82 Return missing created_at field on reshares endpoint 2020-01-24 16:58:32 +01:00
Jonne Haß
16b242fa0f Drop chat_enabled from aspects API 2020-01-21 23:35:01 +01:00
Jonne Haß
39c863ead9 Merge branch 'develop' into api 2020-01-21 23:35:01 +01:00
cmrd Senya
6b8cd5d390 API: accept name parameter instead of first name and last name in user patch 2020-01-21 23:34:43 +01:00
Jonne Haß
dad54db7f4 Return API pagination links as headers rather than in the response body itself 2020-01-21 23:34:43 +01:00
Jonne Haß
cb679371ac Merge branch 'develop' into api 2020-01-21 23:34:43 +01:00
Benjamin Neff
1cbb3f9a7c
Merge pull request #8069 from denschub/remove-chat
Remove the JSXC/Prosody integration.
2019-10-25 01:32:37 +02:00
Benjamin Neff
6bb2e2fadd
Merge branch 'next-minor' into develop 2019-10-25 01:24:19 +02:00
FeruzOripov
3856b44c57
Refactoring aspects_controller.rb
closes #8064
2019-10-25 01:22:02 +02:00
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
Benjamin Neff
e63fa7a398
Merge branch 'next-minor' into develop 2019-07-04 02:30:38 +02:00
Benjamin Neff
b42c9896bc
Migrate pending profile photos and fix upload to unpend profile photos
fixes #8043

closes #8044
2019-07-04 02:29:17 +02:00
Benjamin Neff
6f14f1b850
Merge branch 'next-minor' into develop 2019-06-17 01:20:42 +02:00
Benjamin Neff
5602dc4418
Use username parameter first if present
this makes sure we don't use an old otp_user_id from an old session

closes #8031
2019-06-17 01:14:22 +02:00
Benjamin Neff
88e35d3f3a
Use :database_authenticatable strategy to check password for OTP user
This:
* makes sure that after_database_authentication is called for users with
enabled 2fa.
* handles paranoid mode correctly
2019-06-17 01:12:42 +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
alebor-5
469983a623
Improve communication about signing up on closed pods
fixes #7767
2019-05-12 00:25:08 +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
Benjamin Neff
d58646085f
Merge branch 'next-minor' into develop 2019-04-27 19:12:35 +02:00
Benjamin Neff
035b6f39fc
Change wording of description in PWA manifest 2019-04-27 19:11:27 +02:00
Benjamin Neff
6ba9b24c1a
Merge branch 'next-minor' into develop 2019-04-27 18:00:40 +02:00
flaburgan
2073791cee
Add a manifest.json file as a first step to make diaspora* a PWA
fixes #7997

closes #7998
2019-04-27 18:00:14 +02:00
flaburgan
5b6cef0679
Remove legacy mobile web-capable 2019-04-27 17:56:51 +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
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI
fixes #7840

closes #7884
2019-01-06 21:55:33 +01:00
Hank Grabowski
ce01946eb0 Fixed new pronto warnings after develop branch sync 2018-12-30 17:04:35 -05:00
Hank Grabowski
f07912ebdd API Branch Final Cleanup Before PR 2018-12-30 11:50:58 -05:00
Hank Grabowski
a8d69c48dc OpenID Scopes and Security updates 2018-12-26 14:13:13 -05:00
Hank Grabowski
7109773b83 API Paging library and used in appropriate controllers with full tests 2018-12-17 22:07:33 -05:00
Hank Grabowski
ff6d0064d0 Add Poll Voting Method to Interactions Endpoint 2018-12-16 11:06:27 -05:00
Hank Grabowski
8851f664e5 Photos API Endpoint and unit tests complete 2018-12-10 12:43:50 -05:00
Hank Grabowski
68d7d59286 Search API Endpoint and unit test complete 2018-12-04 09:24:17 -05:00
Hank Grabowski
c3852a8e9c Users Controller and unit tests complete 2018-12-04 08:48:16 -05:00
Hank Grabowski
ef762c4920 Notifications API Endpoint and unit test complete 2018-12-04 07:51:57 -05:00
Hank Grabowski
6e469825cd Interactions API endpoint complete with full tests 2018-12-03 20:56:50 -05:00
HankG
8a60870f04 Contacts API Feature complete with full tests 2018-12-01 15:21:16 -05:00
Frank Rousseau
6fa99072d1
Merge branch 'api' into api-tag-updates 2018-11-11 18:06:50 +01:00
Hank Grabowski
d5e1cbeefa Tags API Endpoint complete with full tests 2018-11-11 11:45:21 -05:00
Hank Grabowski
97af2441ee Aspects API Endpoint complete with full tests 2018-11-11 11:30:19 -05:00
Hank Grabowski
9757637afa Reshares API Endpoint complete with full unit tests 2018-11-11 09:53:13 -05:00
Frank Rousseau
f428f840f6
Merge pull request #9 from frankrousseau/api-conversations-updates
Conversations API Endpoint Feature complete with full tests
2018-11-07 18:37:25 +01:00
HankG
8b6c32e655 Conversations API Endpoint Feature complete with full tests 2018-11-06 14:52:55 -05:00
HankG
5bfe7048eb Streams Controller API feature complete and fully tested 2018-11-06 13:58:47 -05:00