Commit graph

20270 commits

Author SHA1 Message Date
Jonne Haß
2f7acbe4b3 API: fix missing page parameter to integer conversion 2020-01-21 23:34:43 +01:00
Jonne Haß
ab04633474 fix styling on the new authorization page 2020-01-21 23:34:43 +01:00
Jonne Haß
07acfba488 Merge branch 'develop' into api 2020-01-21 23:34:43 +01:00
Jonne Haß
6d6e846916 API: photo width and height are optional 2020-01-21 23:34:43 +01:00
Jonne Haß
cb679371ac Merge branch 'develop' into api 2020-01-21 23:34:43 +01:00
Jonne Haß
16e754f4c7 API: don't return default avatar 2020-01-21 23:34:00 +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
Jonne Haß
36b4076af6
set better example values for unicorn stdout/stderr log settings
[ci skip]

closes #8058
2019-10-25 01:24:08 +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
Jonne Haß
995f3394a8 Merge branch 'next-minor' into develop 2019-09-01 02:44:02 +02:00
Jonne Haß
ba16185b8e install ghostscript on travis
closes #8049
2019-09-01 02:43:51 +02:00
Jonne Haß
6937fa13e5 travis: ensure postgresql and mysql are available 2019-09-01 02:42:11 +02:00
Jonne Haß
5b09e9d38d install libidn-dev on travis 2019-09-01 02:42:11 +02:00
Jonne Haß
6a7e937d90 Update open_graph_reader to 0.7.0
This should fix undefined method `og' for #<OpenGraphReader::Base:0x00007f73c53f2308 @bases={}>
for sites that have OpenGraph tags of other namespaces but no actual OpenGraph core tags
2019-09-01 02:42:11 +02:00
Benjamin Neff
8cab64b715
Merge branch 'next-minor' into develop 2019-07-06 22:45:05 +02:00
Benjamin Neff
593614aef1
Bump fuubar
Version 2.4.0 was yanked ... why do people do such things? m(

https://github.com/thekompanee/fuubar/issues/111
2019-07-06 22:43:41 +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
11caf4f86f
Merge pull request #8036 from theRealNG/develop
Do not show getting started after account import

fixes #8018
2019-07-03 13:33:22 +02:00
Benjamin Neff
e0b8b295df
Merge pull request #8039 from SuperTux88/photos-remove-commentable
Remove commentable functionality from photos
2019-07-03 13:29:39 +02:00
Benjamin Neff
a26e20ab7d
Merge branch 'next-minor' into develop 2019-07-03 13:25:49 +02:00
Benjamin Neff
df4e79b842
Cleanup pending photos which were never posted with cronjob
Only delete photos older than a day, so we don't delete photos for posts
which were uploaded 10 minutes ago and the author is still writing the
post for it.

closes #8041
2019-07-03 13:24:27 +02:00
Benjamin Neff
397dbdbee8
Bump unf_ext
closes #8042
2019-07-03 13:21:20 +02:00
Benjamin Neff
68234fc91f
Bump macaddr 2019-07-03 13:20:09 +02:00
Benjamin Neff
2b8cc070f2
Bump jsonpath 2019-07-03 13:20:08 +02:00
Benjamin Neff
18d6d39c62
Bump jwt 2019-07-03 13:20:08 +02:00
Benjamin Neff
6ede2ade7b
Bump bcrypt 2019-07-03 13:20:08 +02:00
Benjamin Neff
4b2414c9eb
Bump rspec-expectations and rspec-mocks 2019-07-03 13:20:08 +02:00
Benjamin Neff
b654ca7f82
Bump rails-assets-bootstrap 2019-07-03 13:20:08 +02:00
Benjamin Neff
5278ae6a96
Bump fugit 2019-07-03 13:20:08 +02:00
Benjamin Neff
4b921816eb
Bump ffi 2019-07-03 13:20:08 +02:00
Benjamin Neff
2503934a04
Bump fabrication 2019-07-03 13:20:08 +02:00
Benjamin Neff
cde29af545
Bump rails-assets-jasmine-ajax 2019-07-03 13:20:07 +02:00
Benjamin Neff
1e2e064268
Bump jasmine 2019-07-03 13:20:07 +02:00
Benjamin Neff
435e60c214
Bump cucumber-rails 2019-07-03 13:20:07 +02:00
Benjamin Neff
51e7958c4b
Bump pronto 2019-07-03 13:18:38 +02:00
Benjamin Neff
18b0dd0060
Bump coveralls 2019-07-03 13:18:38 +02:00
Benjamin Neff
26b247bf98
Bump webmock 2019-07-03 13:18:38 +02:00
Benjamin Neff
800676a90f
Bump rspec-json_expectations 2019-07-03 13:18:38 +02:00
Benjamin Neff
556fa42004
Bump fuubar 2019-07-03 13:18:38 +02:00
Benjamin Neff
1458d2d57f
Bump rubocop 2019-07-03 13:18:38 +02:00
Benjamin Neff
d2c4faeb9f
Bump versionist 2019-07-03 13:18:37 +02:00
Benjamin Neff
3a1428a672
Bump hamlit 2019-07-03 13:17:37 +02:00
Benjamin Neff
06c582a672
Bump faraday_middleware 2019-07-03 13:17:36 +02:00
Benjamin Neff
fa08ebf7bd
Bump addressable 2019-07-03 13:17:36 +02:00
Benjamin Neff
c059550943
Bump openid_connect 2019-07-03 13:17:36 +02:00
Benjamin Neff
ee503737cb
Bump secure_headers 2019-07-03 13:17:36 +02:00
Benjamin Neff
a6261fdc64
Bump nokogiri 2019-07-03 13:17:36 +02:00