Commit graph

1869 commits

Author SHA1 Message Date
Dennis Schubert
49395c0a11
Merge pull request #6812 from cmrd-senya/6811-visibilities-id-overlap
Don't include wrong shareable types in scopes
2016-06-19 01:40:01 +02:00
Benjamin Neff
30ea6ef72f fix spec for ApplicationHelper#changelog_url 2016-06-18 23:12:29 +02:00
Dennis Schubert
0db7252630
Merge pull request #6863 from SuperTux88/remove-REDISTOGO_URL-deprecation
remove REDISTOGO_URL deprecation
2016-06-16 02:52:54 +02:00
Benjamin Neff
d68c1ad974 remove REDISTOGO_URL deprecation 2016-06-14 06:40:34 +02:00
Steffen van Bergerem
e7227891e7 Use eslint instead of jshint 2016-06-12 10:03:59 +02:00
cmrd Senya
204f58e6a7
Remove repetion of shareable initialization code 2016-05-31 21:16:13 +03:00
cmrd Senya
2737280fa4
Don't include wrong shareable types in scopes 2016-05-31 18:20:07 +03:00
Dennis Schubert
209cd783c8 Merge pull request #6816 from cmrd-senya/publisher-refactor
A minor refactor of the Publisher
2016-05-06 02:23:54 +02:00
Dennis Schubert
2131e3425a Merge pull request #6792 from Zauberstuhl/unicorn_killer
Move unicorn_killer to Gemfile
2016-05-06 02:13:07 +02:00
cmrd Senya
ab718dbbc6
A minor refactor of the Publisher
There was a minor copy-paste issue with publisher_public and
publisher_explain methods. Fix it and do a little refactoring
of the publisher's code.
2016-04-28 21:45:49 +03:00
Senya
0c177aaddf the special case is not required anymore
fix #5678
2016-04-19 08:28:47 +03:00
Lukas Matt
56c7af940d
Move unicorn_killer to Gemfile 2016-04-13 14:41:02 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +02:00
Benjamin Neff
625eedf05d add "diaspora to federation entity" methods for posts 2016-03-30 09:45:46 +02:00
Jonne Haß
6bec0dbbb9 Merge branch 'stable' into develop 2016-03-21 14:04:33 +01:00
Benjamin Neff
d97448e552 remove ChromeFrame
Google Chrome Frame was a plugin for Internet Explorer, but is no longer
supported. And it was included with http and not https which triggered a
warning on most pods.

Also set the minimum version to 9 to support #6557

closes #6751
2016-03-21 14:04:24 +01:00
Dennis Schubert
69ac153fe9 Merge pull request #6745 from cmrd-senya/remove_diaspora_handle_shareables
Remove diaspora_handle from shareables
2016-03-08 23:45:16 +01:00
Dennis Schubert
aa873199f8 Merge branch 'stable' into develop 2016-03-08 22:56:02 +01:00
Dennis Schubert
352d732a37 Disable fetching of root posts for relayables
since that could allow fetching spoofed/altered posts
thanks @supertux88
2016-03-08 22:41:26 +01:00
cmrd Senya
2986aa8b24 Remove diaspora_handle from shareables
We can determine diaspora_handle from a relation with people for the
shareables (posts, photos). So we don't need to store diaspora_handle in
the DB. Also remove tmp_old_id from photos which is not refenrenced anywhere.
2016-03-07 18:47:21 +03:00
Jonne Haß
39ae5e741e Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities
Cleanup aspect visibilities
2016-03-05 11:05:55 +01:00
Dennis Schubert
91d636b9f6 Merge pull request #6727 from SuperTux88/improve-pod-check
Improve pod check
2016-03-05 06:03:20 +01:00
Benjamin Neff
acb91c79d2 improve pod connection check
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474 add migration for pods-table
* add port to pods
* remove url from person and link people with pod-table
2016-03-05 00:12:54 +01:00
Benjamin Neff
0c8d9e1907 delete aspect_visibilities when deleting the shareable 2016-03-04 20:13:52 +01:00
Benjamin Neff
f913128967 don't add public shareables to aspect_visibilities 2016-03-04 20:13:52 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
augier
c9f87796cc Using Typeahead for mentionning box 2016-03-04 18:02:22 +01:00
Benjamin Neff
7011f2961d Revert "Back out #6723 due to Postgres breakage"
This reverts commit 84cfbd22fc.
2016-03-04 14:01:31 +01:00
Dennis Schubert
84cfbd22fc Back out #6723 due to Postgres breakage
This reverts commit 832a56134b, reversing
changes made to 75c3e6068c.
2016-03-04 13:33:32 +01:00
Benjamin Neff
e3d1f0fd16 fix order with two posts with the same timestamp for all streams 2016-03-03 21:43:11 +01:00
Benjamin Neff
7583568be8 update queries for new ShareVisibility
Also:
* remove ShareablesFromPerson evil-query
* improve multi-stream and aspect-stream queries
* fix logging for recieve
* don't add last 100 public posts to users streams after sharing
* delete share visibility when shareable is deleted
2016-03-03 21:43:11 +01:00
Dennis Schubert
7c88fb7936 Merge pull request #6586 from cmrd-senya/drop-signatures
Remove parent author signature for relayables from the DB
2016-03-03 17:39:28 +01:00
Steffen van Bergerem
6e685194e9 Increase keysize for OpenID 2016-02-14 23:35:48 +01:00
Dennis Schubert
677bddc3d3 Merge branch 'stable' into develop 2016-02-09 12:42:26 +01:00
Steffen van Bergerem
ac5a7746e2 Remove contacts_title method and translations
closes #6687
2016-02-09 12:42:21 +01:00
Jonne Haß
32bda8fe20 Merge branch 'stable' into develop 2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings
closes #6658
2016-01-28 18:47:13 +01:00
Dennis Schubert
5f986464da Drop Redis namespace support 2016-01-24 07:29:28 +01:00
Jonne Haß
baeff22451 Merge pull request #6095 from AugierLe42e/openid
OpenID Connect
2016-01-06 12:30:15 +01:00
Dennis Schubert
439ea693a0 Merge pull request #6617 from manuelVo/ignored-user-show-posts-on-profile
Show posts of ignored users on their profile page
2016-01-06 10:48:50 +01:00
Dennis Schubert
40e780abcf Merge branch 'stable' into develop 2016-01-06 00:49:15 +01:00
cmrd Senya
b6c7f004e4 Further receive tests development 2016-01-06 00:47:42 +01:00
cmrd Senya
56f022f28c Fix a few issues with public receiver which include:
* Make Retraction be allowed to be received publicly (probably just never used before anywhere)
* Since public receiver bypasses @object.receive in some cases add the author signature verification for relayables to protect from relayables forgery
* xml_author was wrong in some cases for RelayableRetraction
2016-01-06 00:46:14 +01:00
Manuel Vögele
4f34ecafa4 Show posts of ignored users on their profile page 2016-01-04 18:29:30 +01:00
theworldbright
38439277d6 Add licenses where appropriate 2016-01-04 17:22:44 +09:00
theworldbright
f1b394de0f Fix remaining remarks 2016-01-04 16:49:57 +09:00
augier
d028b5672e Fix remarks 2016-01-04 16:49:57 +09:00
theworldbright
2f8c391ac6 Fix pronto and travis errors 2016-01-04 16:49:57 +09:00
theworldbright
0fbcb71255 Add support for request_uri and claims 2016-01-04 16:49:56 +09:00