Commit graph

19648 commits

Author SHA1 Message Date
Frank Rousseau
50e034769f Make syntax compliant with the pronto configuration 2018-11-01 13:56:18 +01:00
Frank Rousseau
71d324a8e4 Follow official specs 2018-11-01 13:56:18 +01:00
Frank Rousseau
3f00195eed Merge conv deletion and visibility deletion 2018-11-01 13:56:18 +01:00
Frank Rousseau
bbbe3aea7f Make messages API conformed with docs 2018-11-01 13:56:18 +01:00
Frank Rousseau
454be1b468 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-11-01 13:56:18 +01:00
Frank Rousseau
d03b830b07 Fix styles for some API controllers
* Comments
* Likes
* Streams
2018-11-01 13:56:18 +01:00
Frank Rousseau
84f972b368 Add conversation visibilities API controller 2018-11-01 13:56:18 +01:00
Frank Rousseau
43a8cbff5d Add messages API controller 2018-11-01 13:56:18 +01:00
Frank Rousseau
0af04a5c1e Add conversations API controller 2018-11-01 13:56:18 +01:00
Frank Rousseau
1879adcde4 Add service for conversations 2018-11-01 13:56:18 +01:00
Frank Rousseau
40d42f4b58 Add conversation presenter 2018-11-01 13:56:18 +01:00
Frank Rousseau
604075c570 Add routes for conversation
Including messages and visibilities
2018-11-01 13:56:18 +01:00
Frank Rousseau
f4f7eb8726 Add locales for conversation API controller 2018-11-01 13:56:18 +01:00
Frank Rousseau
f66bd9e1af 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-11-01 13:56:18 +01:00
theworldbright
e84e3e64c6 Add likes API route 2018-11-01 13:56:18 +01:00
theworldbright
44742109b0 Add streams API routes 2018-11-01 13:56:18 +01:00
theworldbright
ea3395378f Combine Comment index with Post show API route 2018-11-01 13:56:18 +01:00
theworldbright
47c7de22ae Add comments API routes 2018-11-01 13:56:18 +01:00
theworldbright
c432bb4891 Add posts API routes 2018-11-01 13:56:18 +01:00
Dennis Schubert
c1e5f61502
Merge branch 'next-minor' into develop 2018-10-28 22:09:13 +01:00
CSammy
dae1717da8
Add docker setup for development
closes #7870
2018-10-28 22:09:06 +01:00
Dennis Schubert
0da2e9c102
Merge branch 'next-minor' into develop 2018-10-27 00:13:56 +02:00
Dennis Schubert
0133a9f354
updated 17 locale files [ci skip] 2018-10-27 00:13:47 +02:00
Dennis Schubert
a201e3b2c2
updated 17 locale files [ci skip] 2018-10-27 00:12:25 +02:00
Dennis Schubert
21f9a9d134
Merge branch 'next-minor' into develop 2018-10-15 02:45:09 +02:00
Dennis Schubert
2c8d75100c
Merge branch 'master' into next-minor 2018-10-15 02:44:43 +02:00
Dennis Schubert
d8c1b4f460
Merge branch 'release/0.7.7.0' 2018-10-15 02:43:19 +02:00
Dennis Schubert
53a7508222
Merge branch 'next-minor' into develop 2018-10-15 02:41:57 +02:00
Dennis Schubert
fcbc470b5c
Merge branch 'release/0.7.7.0' into next-minor 2018-10-15 02:41:22 +02:00
Dennis Schubert
af3e2e6d53
updated 33 locale files [ci skip] 2018-10-15 02:40:23 +02: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
bb84767a96
Merge branch 'next-minor' into develop 2018-10-08 02:58:01 +02:00
Dennis Schubert
4911782e9b
Merge branch 'release/0.7.7.0' into next-minor 2018-10-08 02:57:50 +02:00
Benjamin Neff
48ebd571d8
Bump diaspora_federation
closes #7876
2018-10-08 02:57:33 +02:00
Benjamin Neff
3be814ea0f
Bump nokogiri
Fixes:
* CVE-2016-9318
* CVE-2017-16932
* CVE-2017-18258
* CVE-2018-14404
* CVE-2018-14567
2018-10-08 02:56:56 +02:00
Benjamin Neff
56bb4be9d3
Bump rubyzip
Fixes CVE-2018-1000544
2018-10-08 02:52:53 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +02:00
Dennis Schubert
89d9a865b6
Merge branch 'release/0.7.7.0' into next-minor 2018-10-08 02:50:29 +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
Dennis Schubert
26212ba3e0
Merge branch 'next-minor' into develop 2018-10-08 02:43:11 +02:00
Dennis Schubert
3cd6f9abbb
Start 0.7.8.0 cycle
[ci skip]
2018-10-08 02:42:10 +02:00
Dennis Schubert
a91579e92a
Merge branch 'next-minor' into develop 2018-10-04 04:38:10 +02:00
Benjamin Neff
d0c6495bba
Bump unicode-display_width
closes #7873
2018-10-04 04:38:05 +02:00
Dennis Schubert
3ebe0e56a8
Merge branch 'next-minor' into develop 2018-10-04 04:37:06 +02:00
Luna Gloaming
45b7f0b119
Added quotation marks for postgresql parameters.
As a new, novice user, I ran into an issue where my postgresql
password contained special characters.  After a brief conversation
with DenSchub on #diaspora, it was noted that while the example
database configuration had quotes added for mysql, but not for
postgresql, and it was suggested this be improved.

closes #7875
2018-10-04 04:36:57 +02:00
Dennis Schubert
fe5c95e0ba
Merge branch 'next-minor' into develop 2018-09-30 21:44:49 +02:00
Benjamin Neff
44452749bc
Don't depend on the database content when loading the tests
closes #7872
2018-09-30 21:44:44 +02:00
Dennis Schubert
883eb54ecf
Merge branch 'next-minor' into develop 2018-09-30 18:00:57 +02:00
Benjamin Neff
d765b34018
Make sure URLs are encoded before sending them to camo
Otherwise camo crashes with:
TypeError [ERR_UNESCAPED_CHARACTERS]: Request path contains unescaped characters

closes #7871
2018-09-30 18:00:49 +02:00