nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20357 commits 4 branches 0 tags 121 MiB
Commit graph

9555 commits

Author SHA1 Message Date
flaburgan
78538d034a
Harmonize markdown titles sizes 
fixes #7757

closes #8029
 2019-06-17 01:10:41 +02:00
flaburgan
d8b3718a08
Fix wrong padding for captcha label in registration form 
fixes #8016

closes #8028
 2019-06-17 01:08:38 +02:00
Jonne Haß
700e5588e0 Merge branch 'next-minor' into develop 2019-05-24 22:43:13 +02:00
Jonne Haß
1227f34b2a Pass normalized URI to OpenGraphReader 
This ensures the hostname is downcase and thus subsequent third party library
assumptions hold, namely http-cookie (pulled through faraday-cookie_jar) doesn't
raise

closes #8021
 2019-05-24 22:43:08 +02:00
Benjamin Neff
314239ff2a
Merge branch 'next-minor' into develop 2019-05-12 00:25:52 +02:00
Benjamin Neff
e5ba9a1a46
Move translations to registrations.closed 
And remove unused translations and make "another pod" translatable.

closes #7896
 2019-05-12 00:25:36 +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
flaburgan
6826e89a95
Change design, add a link to the official website 
fixes #7910

closes #7966
 2019-05-12 00:12:12 +02:00
David Moseler
e04ddd0bcc
Clarify pod is part of diaspora in splash screen 2019-05-12 00:09:58 +02:00
Benjamin Neff
165b8f4f6e
Don't encrypt the OTP secret 
It doesn't add any security to have this encrypted, but it adds
complexity for podmins, because they need to backup the key.

closes #8014
 2019-05-12 00:06:28 +02:00
Dennis Schubert
74c3debefe
Merge branch 'next-minor' into develop 2019-05-01 00:22:09 +02:00
Dennis Schubert
caf822f497
Make sure 2fa settings have the right background color 
closes #8008
 2019-05-01 00:22:04 +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
ecda6eccf6
Remove password reset and sign up link below two factor form 
They don't make sense on that page, because at this stage, the user
already has an account and also has already entered their password.

closes #8005
 2019-04-30 22:51:11 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop 2019-04-30 00:21:55 +02:00
Dennis Schubert
3c06bb2f4c
Center <p>s inside formes used as secondary labels 
closes #8004
 2019-04-30 00:21:43 +02:00
Dennis Schubert
ef137f09f2
Add lock icon to the 2fa OTP field 2019-04-30 00:21:36 +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
Benjamin Neff
8372fb2240
Merge branch 'next-minor' into develop 2019-04-28 16:48:49 +02:00
Benjamin Neff
17af65e22c
Allow links with only the diaspora ID to link to a profile 
closes #8000
 2019-04-28 16:48:31 +02:00
Benjamin Neff
91aae4d755
Fix 500er when calling protocol handler with invalid URL 2019-04-28 16:44:29 +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
cf350c3e92
Merge pull request #7660 from cmrd-senya/archive-import-backend 
Archive import backend implementation
 2019-04-27 19:07:09 +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ß
91b6a807c7 API: fix birthday format in responses 2019-04-27 16:05:22 +02:00
Jonne Haß
52e4e9f903 API: Update post location format to floats instead of floats as strings 2019-04-27 16:04:44 +02:00
Jonne Haß
af59bf3265 API: Do not return redundant author for photos 2019-04-27 16:03:55 +02:00
Jonne Haß
8afa17f940 Don't return aspect order in single user info API route 2019-04-27 16:03:02 +02:00
cmrd Senya
597d9e0275 AccountMigration: support chained migration case 2019-04-26 20:29:26 +03:00
Jonne Haß
f7a27f0c07 Ignore Metrics/AbcSize Rubocop for PostPresenter#as_api_response 
[ci skip]
 2019-04-26 18:18:48 +02:00
Jonne Haß
99411fced7 Merge branch 'develop' into api 2019-04-26 17:54:08 +02:00
cmrd Senya
f85f167f50 Implement archive import backend 
This implements archive import feature.

The feature is divided in two main subfeatures: archive validation and archive import.

Archive validation performs different validation on input user archive. This can be
used without actually running import, e.g. when user wants to check the archive
before import from the frontend. Validators may add messages and modify the archive.

Validators are separated in two types: critical validators and non-critical validators.

If validations by critical validators fail it means we can't import archive.

If non-critical validations fail, we can import archive, but some warning messages
are rendered.

Also validators may change archive contents, e.g. when some entity can't be
imported it may be removed from the archive.

Validators' job is to take away complexity from the importer and perform the validations
which are not implemented in other parts of the system, e.g. DB validations or
diaspora_federation entity validations.

Archive importer then takes the modified archive from the validator and imports it.

In order to incapsulate high-level migration logic a MigrationService is
introduced. MigrationService links ArchiveValidator, ArchiveImporter and
AccountMigration.

Also here is introduced a rake task which may be used by podmins to run archive
import.
 2019-04-26 18:41:27 +03:00
Benjamin Neff
e0a6189ec4
Merge branch 'next-minor' into develop 2019-03-30 15:05:47 +01:00
Benjamin Neff
c063f6fa1b
Bump devise 2019-03-30 15:01:00 +01:00
Benjamin Neff
707e358e48
Merge branch 'next-minor' into develop 2019-02-19 01:30:08 +01:00
Dennis Schubert
e47d0d9675
Replace dandelion.jpg with a public domain photo 
Closes #7972

closes #7976
 2019-02-19 01:29:52 +01:00
Dennis Schubert
97805e6602
Merge branch 'next-minor' into develop 2019-01-13 02:17:22 +01:00
Benjamin Neff
2894984f57
Fix order of posts on tags-stream for tags including 'activity' 
closes #7959
 2019-01-13 02:17:15 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +01:00
flaburgan
3f700c3960
Fix photos galley when too many thumbnails by adding a scroll-x 
fixes #7942

closes #7943
 2019-01-06 22:12:38 +01:00
flaburgan
c8a1f308c6
Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode' 
closes #7926
 2019-01-06 22:04:22 +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
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
e127502be5 API Branch Final Cleanup Before PR 2018-12-30 22:33:04 +01:00
Hank Grabowski
9c730fc0f3 OpenID Scopes and Security updates 2018-12-30 22:33:04 +01:00
Hank Grabowski
a53495c9aa API Paging library and used in appropriate controllers with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
16bf5d8130 Add Poll Voting Method to Interactions Endpoint 2018-12-30 22:33:04 +01:00
Hank Grabowski
02cf6a9eb2 Photos API Endpoint and unit tests complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
7dba616e4e Search API Endpoint and unit test complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
2f432eb560 Users Controller and unit tests complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
09c13fdf67 Notifications API Endpoint and unit test complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
803abba5c1 Interactions API endpoint complete with full tests 2018-12-30 22:33:04 +01:00
HankG
0f4789a5cb Contacts API Feature complete with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
7ae36de2cf Tags API Endpoint complete with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
db7fe69ce4 Aspects API Endpoint complete with full tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
173461ac3d Reshares API Endpoint complete with full unit tests 2018-12-30 22:31:33 +01:00
HankG
4923338bcf Conversations API Endpoint Feature complete with full tests 2018-12-30 22:31:33 +01:00
HankG
48b1428c57 Streams Controller API feature complete and fully tested 2018-12-30 22:31:33 +01:00
Hank Grabowski
bb2261b47d Posts API Endpoint feature complete with full unit tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
f64a8e04ed Comments API Endpoint complete with full unit tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
7ee9565a04 Likes API endpoint complete 2018-12-30 22:31:33 +01:00
Frank Rousseau
a56d998499 Fix code style 2018-12-30 22:31:33 +01:00
Frank Rousseau
5326ddf6c3 Adapt error formatting to documentation 2018-12-30 22:31:33 +01:00
Frank Rousseau
df11297654 Fix like deletion 2018-12-30 22:31:33 +01:00
Frank Rousseau
84ac19a090 Clean API routes 
* Remove routes without matching controller
* Rename stream routes to match specifications
* Remove public stream route and related controller
 2018-12-30 22:31:33 +01:00
Frank Rousseau
f8969ddfeb Make Post API match specs 
https://diaspora.github.io/api-documentation/routes/posts.html
 2018-12-30 22:31:33 +01:00
Frank Rousseau
ec47fc67ab Make the comment API match the API specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
317b78394a Improve API error management 
* Fix active record not found case
* Display backtrace in error logs
 2018-12-30 22:31:33 +01:00
Frank Rousseau
ffd5f575bc Make API likes controller match specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
f6b57384e7 Changes to use V1 API version instead of V0 2018-12-30 22:31:33 +01:00
Frank Rousseau
ec18844e8f Move API controllers from v0 to v1 2018-12-30 22:31:33 +01:00
Frank Rousseau
b4dc13f1ce Fix code styles 2018-12-30 22:31:33 +01:00
Frank Rousseau
e6fd043206 Adapt API controllers to recent service changes 2018-12-30 22:31:33 +01:00
Frank Rousseau
72a3b92b50 Make syntax compliant with the pronto configuration 2018-12-30 22:31:33 +01:00
Frank Rousseau
2a8c0ddd51 Follow official specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
13e2841f13 Merge conv deletion and visibility deletion 2018-12-30 22:31:33 +01:00
Frank Rousseau
f9e0dee2dc Make messages API conformed with docs 2018-12-30 22:31:33 +01:00
Frank Rousseau
5040363f7a Make conversation API data format ok with docs 
* Base the API requesting on GUID instead of ID
* Include read field
* Do not include messages in conversation results
 2018-12-30 22:31:33 +01:00
Frank Rousseau
2be3e9eaf3 Fix styles for some API controllers 
* Comments
* Likes
* Streams
 2018-12-30 22:31:33 +01:00
Frank Rousseau
fa53656b3b Add conversation visibilities API controller 2018-12-30 22:31:33 +01:00
Frank Rousseau
f8ba88408b Add messages API controller 2018-12-30 22:31:33 +01:00
Frank Rousseau
559f370116 Add conversations API controller 2018-12-30 22:31:33 +01:00
Frank Rousseau
b37c14ce0e Add service for conversations 2018-12-30 22:31:33 +01:00
Frank Rousseau
c45b785370 Add conversation presenter 2018-12-30 22:31:33 +01:00
Frank Rousseau
5a0759a3d9 Add exception handlers in base API controller 
* For record not found returns a 404 response
* For wrong parameters returns a 400 response
* For other exceptions returns a 500 response
 2018-12-30 22:31:33 +01:00
theworldbright
6cad0a965a Add likes API route 2018-12-30 22:31:33 +01:00
theworldbright
41750e38da Add streams API routes 2018-12-30 22:31:33 +01:00
theworldbright
c9ba1ee197 Combine Comment index with Post show API route 2018-12-30 22:31:33 +01:00
theworldbright
47dd44ff39 Add comments API routes 2018-12-30 22:31:33 +01:00
theworldbright
552d3efb29 Add posts API routes 2018-12-30 22:31:33 +01:00
Benjamin Neff
b30c4e4e97
Merge branch 'next-minor' into develop 2018-11-17 21:08:23 +01:00
Benjamin Neff
98d165c0c5
Bump acts-as-taggable-on 2018-11-17 21:04:37 +01:00
Benjamin Neff
652b0064e6
Merge branch 'next-minor' into develop 2018-11-08 20:58:35 +01:00
Benjamin Neff
25a9f5d5d7
Merge branch 'master' into next-minor 2018-11-08 20:58:22 +01:00
Benjamin Neff
32cd764786
Fix XSS via OpenGraph on mobile 2018-11-08 20:41:50 +01:00
Dennis Schubert
ffe6fc0aa1
Merge branch 'next-minor' into develop 2018-11-08 05:08:16 +01:00
flaburgan
e33466de89
Display raw images in gallery 
closes #7890
 2018-11-08 05:08:04 +01:00
Dennis Schubert
cee30c36a0
Merge branch 'next-minor' into develop 2018-11-08 05:06:53 +01:00
Hank Grabowski
cab0e0100b
7841 Post Unlike sets status icon correctly 
closes #7882
fixes #7841
 2018-11-08 05:06:34 +01:00
Benjamin Neff
0c2cd2ef1b
Merge branch 'next-minor' into develop 2018-11-04 03:07:50 +01:00
Bennett Goble
935ff66c96
Sharpen small and medium thumbnails 
closes #7924
 2018-11-04 03:07:42 +01:00
flaburgan
470efd4ec5
Move comment timestamp next to author name, add permalink 
closes #7905
 2018-11-04 03:01:27 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop 2018-11-02 01:39:11 +01:00
flaburgan
65e0f90b86
Reword the web handler setting 
fixes #7838

closes #7909
 2018-11-02 01:35:44 +01:00
Dennis Schubert
a928e40d7f
Merge branch 'next-minor' into develop 2018-10-14 06:03:12 +02:00
Zachary Rabinovich
c4fed4bbcc
Add the ability to assign roles in the admin panel 
closes #7868
 2018-10-14 06:03:06 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration 
Facebook removed the API and facebook integration is broken now, so lets
remove it.

closes #7874
 2018-10-08 02:50:25 +02:00
Benjamin Neff
c9f65332de
Merge branch 'next-minor' into develop 2018-09-06 02:33:43 +02:00
Dennis Schubert
65a2b8da12
Include PostsHelper in NotifierHelper 
Fixes #7852

closes #7853
 2018-09-06 02:33:33 +02:00
Benjamin Neff
08e108d3d8
Fix comment notification subject for posts without text 
Fixes #7854
 2018-09-05 03:17:58 +02:00
Benjamin Neff
2eb17e109b
Fix comment notification subject for posts without text 
Fixes #7854
 2018-09-05 01:32:36 +02:00
Benjamin Neff
9b3f90dc90
Merge branch 'next-minor' into develop 2018-07-20 11:07:18 +02:00
Benjamin Neff
79907b78b9
Use podname for web+diaspora:// protocol handler 
closes #7839
 2018-07-20 11:07:11 +02:00
Benjamin Neff
80bc90afa9
Fix preview with uploaded photos 2018-07-17 20:48:37 +02:00
Benjamin Neff
1289b3b541
Merge branch 'next-minor' into develop 2018-07-13 10:22:04 +02:00
Dennis Schubert
af500dabbc
Add section in the User's settings to register the protocol handler 
closes #7833
 2018-07-13 10:19:43 +02:00
Dennis Schubert
f8a4a2c510
Gracefully ignore exceptions when trying to register the ProtocolHandler 2018-07-13 10:18:48 +02:00
Dennis Schubert
8709c45d30
Move the protocol handler into a proper helper module 
Previous file history in 80dfdcd6af, couldn't keep it.
 2018-07-13 10:18:48 +02:00
Benjamin Neff
ea15403d57
Merge pull request #7655 from Flaburgan/6721-fix-upload-progress-bar 
Fix multiple photos upload progress bar
 2018-07-11 01:37:02 +02:00
Benjamin Neff
dcbdb69e22
Merge branch 'next-minor' into develop 2018-07-11 01:35:50 +02:00
cmrd Senya
80dfdcd6af
Add web+diaspora:// links handler installation 2018-07-11 01:26:43 +02:00
cmrd Senya
6f812a5b8f
Add LinksController 
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
 2018-07-11 01:24:28 +02:00
cmrd Senya
2e0b382699
Use 'post' prefix for status message route helpers 
This is required to make url_for(StatusMessage.new) work
 2018-07-11 01:24:28 +02:00
flaburgan
af02d01d41 Fix progress when uploading multiple photo at the same time 2018-07-09 17:48:30 +02:00
Benjamin Neff
f9a59f2ff0
Merge branch 'next-minor' into develop 2018-06-20 00:50:34 +02:00
HankG
5a8bdc1e71
Facebook plugin always appends (via D* post URL) to cross-posts 
fixes #7770

closes #7774
 2018-06-20 00:47:12 +02:00
Benjamin Neff
0b9ba559c7
Merge branch 'next-minor' into develop 2018-06-18 02:48:47 +02:00
flaburgan
3d83fbdbe5
Link to the pod in the emails footer 
closes #7814
 2018-06-18 02:47:56 +02:00
Benjamin Neff
f3d2a54050
Merge branch 'next-minor' into develop 2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid 
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.

closes #7815
 2018-06-16 04:36:05 +02:00
Benjamin Neff
0cb212e6cb
Merge branch 'next-minor' into develop 2018-05-16 00:54:46 +02:00
cmrd Senya
a3378ae744
Account merging: handle duplicates for TagFollowing 
I missed it in #7803

closes #7807
 2018-05-16 00:54:16 +02:00
Benjamin Neff
2a60cb30a1
Merge branch 'next-minor' into develop 2018-05-03 21:33:10 +02:00
cmrd Senya
cb294fd3f4
Add completed_at to account_migrations 
Use completed_at datetime field as an indication of a performed migration

closes #7805
 2018-05-03 21:31:29 +02:00
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop 2018-04-30 22:54:33 +02:00
cmrd Senya
8680b24a2e
Account merging support 
Adds support for merging accounts with account migration by eliminating
duplicate data in favor of the target user's data.

closes #7803
 2018-04-30 22:06:34 +02:00
Dennis Schubert
74bac8c495
Merge branch 'next-minor' into develop 2018-04-23 20:33:20 +02:00
HankG
211e5cd1bc
Bugfix 7714 twitter char overflow 
closes #7791
 2018-04-23 20:33:07 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop 2018-04-16 01:26:56 +02:00
Steffen van Bergerem
53d58a8bcb
Remove fileuploader.css 
closes #7778
 2018-04-16 01:24:38 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop 2018-04-12 02:49:11 +02:00