Commit graph

20247 commits

Author SHA1 Message Date
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
fa0e34f687
Merge branch 'hotfix/0.7.7.1' 2018-11-08 20:57:09 +01:00
Benjamin Neff
32cd764786
Fix XSS via OpenGraph on mobile 2018-11-08 20:41:50 +01:00
Benjamin Neff
f23791b7f7
Bump rack
Fixes CVE-2018-16470 and CVE-2018-16471
2018-11-08 19:29:01 +01:00
Hank Grabowski
6bae98d980 Conversations API Test Removed 'convo' Abbreviations 2018-11-08 13:08:52 -05:00
Dennis Schubert
ddaa5c0064
Merge branch 'next-minor' into develop 2018-11-08 05:15:54 +01:00
Benjamin Neff
9723e283e1
Use sudo for docker if socket is not writable
closes #7921
2018-11-08 05:15:47 +01:00
Dennis Schubert
cd16f29c39
Merge branch 'next-minor' into develop 2018-11-08 05:14:36 +01:00
Benjamin Neff
3c55a425c7
Fix script domain for instagram in CSP header
closes #7920
2018-11-08 05:12:55 +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
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
Frank Rousseau
61b134f81d
Merge pull request #8 from frankrousseau/api-streams-updates
Streams Controller API feature complete and fully tested
2018-11-06 21:21:24 +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
Frank Rousseau
169136f292
Merge pull request #7 from frankrousseau/api-posts-updates
Posts API Endpoint feature complete with full unit tests
2018-11-05 22:35:05 +01:00
Hank Grabowski
6798ba974c Posts API Endpoint feature complete with full unit tests 2018-11-05 08:30:54 -05: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
Benjamin Neff
2c56e447ed
Ignore invalid URLs for camo
When people only write `https://` as image URL, this would fail with
`Addressable::URI::InvalidURIError: Absolute URI missing hierarchical segment: 'https://'`.

closes #7922
2018-11-04 03:06:21 +01:00
Benjamin Neff
b2712ebf1d
Use libjemalloc if it's available for better memory usage
Fixes #6763

closes #7919
2018-11-04 03:04:39 +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
b977e9c39a
Save a screenshot of the page in tmp/capybara when a cucumber test is failing
closes #7912
2018-11-02 01:39:04 +01:00
flaburgan
65e0f90b86
Reword the web handler setting
fixes #7838

closes #7909
2018-11-02 01:35:44 +01:00
Frank Rousseau
b8198efc6c
Merge pull request #6 from frankrousseau/api-comments-updates
Comments API Endpoint complete with full unit tests
2018-11-02 00:42:04 +01:00
Hank Grabowski
038b6f49a9 Comments API Endpoint complete with full unit tests 2018-11-01 14:14:34 -04:00
Frank Rousseau
9faf38671b
Merge pull request #5 from frankrousseau/api-likes-get-details
Likes API endpoint complete
2018-11-01 16:37:21 +01:00
Hank Grabowski
d6915ff5d0 Likes API endpoint complete 2018-11-01 11:06:45 -04:00
Frank Rousseau
2c94994f32 Fix code style 2018-11-01 13:56:18 +01:00
Frank Rousseau
4370315d6c Fix post controller test 2018-11-01 13:56:18 +01:00
Frank Rousseau
a7ea3ba254 Adapt error formatting to documentation 2018-11-01 13:56:18 +01:00
Frank Rousseau
79fe1c2a7e Fix like deletion 2018-11-01 13:56:18 +01:00
Frank Rousseau
27ea63979f Clean API routes
* Remove routes without matching controller
* Rename stream routes to match specifications
* Remove public stream route and related controller
2018-11-01 13:56:18 +01:00
Frank Rousseau
c1ece44c53 Make Post API match specs
https://diaspora.github.io/api-documentation/routes/posts.html
2018-11-01 13:56:18 +01:00
Frank Rousseau
bcbcf6bce3 Make the comment API match the API specs 2018-11-01 13:56:18 +01:00
Frank Rousseau
55dbbad869 Improve API error management
* Fix active record not found case
* Display backtrace in error logs
2018-11-01 13:56:18 +01:00
Frank Rousseau
1b85655d71 Remove default paramter for api routes 2018-11-01 13:56:18 +01:00
Frank Rousseau
348790292b Make API likes controller match specs 2018-11-01 13:56:18 +01:00
Frank Rousseau
39265ab9b5 Fix stream API routes
Put streams under the subpath `/streams`.
2018-11-01 13:56:18 +01:00
Frank Rousseau
797afb1c9b Changes to use V1 API version instead of V0 2018-11-01 13:56:18 +01:00
Frank Rousseau
100b1a4286 Move API controllers from v0 to v1 2018-11-01 13:56:18 +01:00
Frank Rousseau
3532a340c2 Fix code styles 2018-11-01 13:56:18 +01:00
Frank Rousseau
2d40801bb4 Adapt API controllers to recent service changes 2018-11-01 13:56:18 +01:00
Frank Rousseau
f23e947d0c Adapt some API route syntax 2018-11-01 13:56:18 +01:00
Frank Rousseau
b00df8c2e7 Adapt API tests to recent changes 2018-11-01 13:56:18 +01:00
Frank Rousseau
50e034769f Make syntax compliant with the pronto configuration 2018-11-01 13:56:18 +01:00