Commit graph

4636 commits

Author SHA1 Message Date
Steffen van Bergerem
8faedd574d
Move post controls to a separate view 2016-09-04 03:16:24 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments
closes #7045
2016-09-04 03:15:35 +02:00
Steffen van Bergerem
89b51dddf9
Add application controller specs for grammatical gender 2016-09-04 03:02:27 +02:00
Steffen van Bergerem
08794bc47b
Remove user_photo method from users controller
closes #7049
2016-09-04 03:01:51 +02:00
Steffen van Bergerem
18fbb2a885 Remove useless notifier spec
closes #7056
2016-09-04 02:24:58 +02:00
Benjamin Neff
4b020b8d61 Fix regressions from #6998
* fixed old reshares of reshares
* fixed deleted root of a reshare
2016-08-22 00:43:43 +02:00
Dennis Schubert
003672f0b1
Merge pull request #7011 from SuperTux88/fix-author-not-lowercase
Use Person.by_account_identifier to find the author
2016-08-21 14:26:20 +02:00
Benjamin Neff
1d5080888f Use Person.by_account_identifier to find the author 2016-08-21 04:01:42 +02:00
Benjamin Neff
8d725160f9 Use https for the pod_uri if require_ssl is true 2016-08-21 01:48:52 +02:00
Benjamin Neff
c6427c4ec0 don't add the root author to the subscribers if the root post was deleted 2016-08-18 23:34:58 +02:00
Denis Hovart
bcace2def2 6840 : meta tags update (#6998)
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.

* Adds tests to post controller to check correctness of metas

* Add methods to PersonPresenter to have metas on profile pages

* Correct meta data helper test

* Update PersonPresenter, add test to PeopleController

* Creates TagPresenter. Display tag metas on tag index page

* Updata meta data helper spec

* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.

* Set meta info as hashes in presenters

* Move original hardcoded metas info to config/defaults.yml

* metas_tags include by default the general metas, update views

* Update code style, clean views

* Renames TagPresenter StreamTagPresenter, updates TagController spec

* Add a default_metas entry to diaspora.yml.example

* Align metas hash in presenters, refactor meta data helper

* Use bio as description meta if user has a public profile

* Rename StreamTagPresenter to TagStreamPresenter
2016-08-18 21:52:39 +02:00
Steffen van Bergerem
8dc011cfb1
Remove specs about services swallowing exceptions 2016-08-18 20:30:17 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:36:27 +02:00
Steffen van Bergerem
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts 2016-08-18 13:02:14 +02:00
Jonne Haß
e3a95d7d71 Merge pull request #6995 from SuperTux88/fix-mention-fetching
only create mentions after creating statusmessages
2016-08-18 12:00:11 +02:00
Steffen van Bergerem
18683f9ca8
Fix backbone router for URLs with trailing slashes 2016-08-18 10:57:59 +02:00
Steffen van Bergerem
34e3fb2e14
Merge pull request #6991 from cmrd-senya/dropdown-regression
Fix aspect dropdown when person is being fetched
2016-08-18 10:07:35 +02:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination 2016-08-18 01:54:43 +02:00
Benjamin Neff
fb318373c7 only create mentions after creating statusmessages 2016-08-17 02:26:58 +02:00
Jonne Haß
fedd378dcf
Merge pull request #6992 from SuperTux88/4491-fetch-mentioned-people
fetch mentioned people if they don't exist locally yet
2016-08-16 10:41:02 +02:00
Steffen van Bergerem
e5c5490932
Merge pull request #6981 from AugierLe42e/fix-6979
Fixes #6979
2016-08-15 23:00:16 +02:00
cmrd Senya
4b3f36e92a
Fix aspect dropdown when person is being fetched
fix #6989
2016-08-15 23:43:24 +03:00
Dennis Schubert
9d662a90d6
Merge pull request #6987 from SuperTux88/allow-hovercard-for-remote-people
Allow hovercards of remote people when not logged in
2016-08-15 16:25:48 +02:00
CSammy
8491df1625 Added test for loading of previous posts on a tag page. 2016-08-15 13:30:20 +02:00
CSammy
adc9492bf0 Added tests for various result cardinalities of tag pages. 2016-08-15 04:39:36 +02:00
CSammy
1d793fcc49 Reused tag stream query for tag pages. 2016-08-15 04:39:11 +02:00
Benjamin Neff
23541546e9 Allow hovercards of remote people when not logged in
In #6603 hovercards were activated for logged out users, but they only
worked for local people. Hovercards on remote-people are important to
get the diaspora-id to search the person on the local pod, if you don't
know who it is.
2016-08-15 01:33:26 +02:00
Benjamin Neff
0d338b6f79 don't create notifications if the notification-actor is ignored
Also move "shareable hidden"-logic to AlsoCommented, because it is the
only one that needs it. And write some specs for mentioned and started
sharing notifications.

Fixes #6294
2016-08-14 17:03:49 +02:00
Augier
c5618591c3 Fixes #6979 2016-08-14 11:04:11 +02:00
Benjamin Neff
f4459488e5 allow other people to share with a user who ignores them
otherwise we have data-inconsistency if the user stops ignoring the
person.
2016-08-14 01:08:26 +02:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations
Cleanup invitations
2016-08-13 14:16:41 +02:00
Benjamin Neff
bc6c8a0598 disable registration with invite-code when invitations are closed
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
2016-08-13 13:51:28 +02:00
Benjamin Neff
3b1a5c6bdf don't reduce number of invites when registration is open
otherwise the counter goes into negative ;)

also  reset all negative counters
2016-08-13 13:51:02 +02:00
Steffen van Bergerem
da5aef2b75
Fix charcounter position in publisher 2016-08-13 03:21:40 +02:00
Benjamin Neff
e749bbef15 don't reduce number of available invites if there were errors. 2016-08-13 01:47:27 +02:00
Benjamin Neff
2a553940d4 small design fixes for invites 2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a Cleanup legacy invitations from code
Fixes #5116
2016-08-13 01:47:27 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2
Comments expansion refactoring
2016-08-12 23:46:22 +02:00
augier
5c2e241106 Displaying the markdown editor on publisher 2016-08-12 23:08:41 +02:00
cmrd Senya
8e6df0b1e3
Comments expansion refactoring
If you look at comment expand process with javascript debugger, you
will notice that at first comments get added to existing stream ("add"
event handler of model.comments gets launched because of model.comments.fetch).
Then the comment stream gets empty and then filled by the postRenderTemplate
handler.

This patch removes comments rerendering on the expansion. The fetching process is
changed so that older comments are added to the correct place, so the order
looks nice without rerendering. Thus, unnecessary job of rerendering is avoided.
2016-08-12 22:06:51 +03:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Jonne Haß
e70ffebc49 Merge pull request #6805 from cmrd-senya/mention-name-fixup
Fix up the meaning of the name parameter in mention
2016-08-11 13:28:02 +02:00
cmrd Senya
d200e92aeb Fix up the meaning of the name parameter in mentions
The desktop frontend now treats the "name" parameter of mention as
a string to display unconditionally. But the Diaspora::Mentionable
renders mentions the different way: "name" is treated as a fallback
string which is rendered only if the person's name is unavailable.
This reflects on the mobile version ATM. This patch makes it behave
the same way as the current desktop version does.
2016-08-11 13:19:48 +03:00
Jonne Haß
7fa299b7ad Merge pull request #6959 from cmrd-senya/devise-upgrade
Upgrade devise to 4.2
2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Jonne Haß
1d2132ebba Merge pull request #6965 from SuperTux88/5847-fix-settings-page
Fix settings page after submit
2016-08-11 02:29:34 +02:00
Benjamin Neff
71ed7446c1 Fix user settings style after submit
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings

Fixes #5847
2016-08-11 01:58:47 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box 2016-08-10 17:19:58 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js 2016-08-10 00:41:07 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
9f28b935b9
Drop contacts.json 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts 2016-08-09 15:12:44 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
Benjamin Neff
d3edbfd829 remove pending flag from posts 2016-08-08 19:37:10 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
Benjamin Neff
7ff18d92fb remove old unused data_conversion fixtures 2016-08-08 19:37:09 +02:00
Benjamin Neff
4a6721af3c cleanup fixtures/public_posts.json 2016-08-08 19:37:09 +02:00
Jonne Haß
32174aa532
Merge pull request #6932 from SuperTux88/relayable-additional-fields
Save relayable signature data
2016-08-08 19:28:21 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title
closes #6642
2016-08-08 19:23:17 +02:00
Benjamin Neff
89b068e474 write some more tests 2016-08-08 18:56:37 +02:00
Benjamin Neff
1d8ce00bef save signature data on receive 2016-08-08 18:56:37 +02:00
Benjamin Neff
2a6ca1b831 use signature data for federation 2016-08-08 18:56:37 +02:00
cmrd Senya
94ce383498
Introduce NotificationSerializer
And remove the note_html property from the model.
2016-08-08 17:22:30 +03:00
cmrd Senya
a3f208c380
Notifications and search page backend updates
Updates introduce support for preloading contacts to Gon in order
to support client-side rendering of aspect membership dropdown box.
2016-08-08 17:21:38 +03:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards 2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership
in order to support adding new aspect to a dropdown without full
page reload
2016-08-08 17:21:14 +03:00
cmrd Senya
15e0f88758
Rename photos[:count] to photos_count in gon 2016-08-08 17:19:26 +03:00
cmrd Senya
ed7fc10043
Clear gon after each rspec test 2016-08-08 17:19:08 +03:00
cmrd Senya
838e5ca432
Use the factory in the publisher_view_spec.js 2016-08-08 17:18:53 +03:00
cmrd Senya
f0bd1f9f06
AspectSelections spec corrections 2016-08-08 17:18:45 +03:00
cmrd Senya
06352b7809
AspectSelections style fixes 2016-08-08 17:18:37 +03:00
cmrd Senya
d50ab83157
Rename app.collections.Aspect{,Selection}s 2016-08-08 17:18:31 +03:00
cmrd Senya
ac2f161271
Fix views.js corner case 2016-08-08 17:18:20 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Steffen van Bergerem
ba26175421
Fix duplicate activity stream posts 2016-08-07 02:07:05 +02:00
Jonne Haß
f91734028c
Merge pull request #6934 from SuperTux88/fetch-error-handling
better error message if we webfinger a person with invalid guid
2016-08-01 13:20:56 +02:00
Jonne Haß
48e5db8235
Stabilize social_relay_presenter_spec.rb 2016-08-01 13:19:07 +02:00
Benjamin Neff
5aa52b36af better error message if we webfinger a person with invalid guid
this happens if a remote person changed the diaspora-id manually (renamed
domain or something) in their database.
2016-07-31 23:05:53 +02:00
cmrd Senya
035a483a7a Fix randomly failing profile federation spec
same as #6913
2016-07-17 13:02:46 +03:00
Jonne Haß
8fcb66a425
Merge pull request #6910 from SaiVardhan/Issue#6850_private_message
[Fix] #6850 Don't include subjects of private message
2016-07-17 09:32:19 +02:00
Benjamin Neff
2cd831f94e also validate remote posts
all data is included in the federated status_message, so we can validate
on receive. add the photos to the status_message before save.
2016-07-17 01:40:00 +02:00
Benjamin Neff
df9874b73a remove raw_message
This was only an alias for "text", and "raw_message" is also not used
for federation anymore, so we can drop it.
2016-07-17 01:40:00 +02:00
Jonne Haß
8cffc5cfbe
bump rails to 4.2.7 2016-07-15 13:48:09 +02:00
Benjamin Neff
32cc0951bb bump diaspora_federation 2016-07-15 02:02:55 +02:00
SaiVardhan
274104aac6 issue-6850 Don't include subjects of private messages in email notifications 2016-07-12 16:33:15 +05:30
Jonne Haß
b3a06c1c58 Merge pull request #6913 from svbergerem/fix-randomly-failing-federation-spec
Fix randomly failing profile federation spec
2016-07-11 11:23:13 +02:00
Steffen van Bergerem
d6fbde3b7f
Fix randomly failing profile federation spec 2016-07-09 19:22:22 +02:00
Steffen van Bergerem
f8d8089cb6
Add more specs for the admins controller 2016-07-09 12:30:19 +02:00
Steffen van Bergerem
b01ca5d3bc
Add basic help controller spec 2016-07-09 10:55:59 +02:00
Steffen van Bergerem
b296e73c36
Add basic terms controller spec 2016-07-09 10:55:59 +02:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions
Filter mentions on status message creation
2016-07-06 22:27:13 +02:00
aoh0x7DE
d75f795cad Fix issue #6847 (#6905)
* Fix issue #6847
2016-07-06 01:57:23 +02:00
Jonne Haß
bcd7894e59
add code coverage reporting 2016-07-05 23:35:53 +02:00
Steffen van Bergerem
46cbc6e52a
Filter mentions on status message creation 2016-07-04 10:26:45 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
715cb1bb87
Remove unused translations 2016-07-03 18:14:23 +02:00
Jonne Haß
18fc98d3aa Merge pull request #6895 from cmrd-senya/services-spec-fixup
Fix up nodeinfo tests
2016-06-28 00:15:08 +02:00
cmrd Senya
27ae4ff4fd
Fix up nodeinfo tests
Tests for nodeinfo failed if services config are non-default. Fix it
to pick the data for comparation from application settings.
2016-06-27 22:54:01 +03:00
Benjamin Neff
824201fedc fetch mentioned people if they don't exist locally yet
fixes #4491
2016-06-27 17:04:22 +02:00
Benjamin Neff
3bfc4003fb fetch unknown persons to generate url 2016-06-27 14:43:19 +02:00
Jonne Haß
09908a45fb
StatusMessage#raw_message returns empty string for NULL values
Previously the federation layer has written the empty string to the
database, now it writes nil/no value to it while our code still expects
the empty string in some cases. Restore the old assumption by returning
the empty string, the real raw value by now is available again in
StatusMessage#text for those that need it, such as validations or tests.
2016-06-27 12:07:11 +02:00
Benjamin Neff
c0ab42fecc check if links is an array in the JRD 2016-06-27 04:04:09 +02:00
Benjamin Neff
2a0e87957f validate NodeInfo json against schema in ConnectionTester 2016-06-27 04:04:09 +02:00
Jonne Haß
5d318400c9
Diaspora::Federation::Receive::ignore_existing_guid returns nil when
ignoring the error message

Previously it returned the return value of Logging::Logger#warn, which
is true for loggers that log the warn level. However
Diaspora::Federation::Receive::receive_relayable checks the return value
for truthiness in order to decide whether to attempt to relay it,
resulting in a NoMethodError: undefined method `parent' for
true:TrueClass in Diaspora::Federation::Receive::relay_relayable

This change is cosmetic as the exception raised prevented any action
that shouldn't happen anyway, so there's no actual logic change.
2016-06-26 17:01:33 +02:00
Benjamin Neff
9a3f653c45 fix sender for messages for old pods
Send a second message to remote recipients with conversation-author
as salmon author if the conversation-author is local.

The first dispatch will fail on old pods. New pods will ignore the
second message, if the guid already exist.
2016-06-26 14:05:52 +02:00
Benjamin Neff
9fda255add use the parent author of the target as sender for relayable retractions 2016-06-26 11:05:23 +02:00
Benjamin Neff
5e0b1dd28d use match_array for comment_service_spec 2016-06-26 10:43:27 +02:00
Benjamin Neff
7241b1c054 use the parent author as salmon sender, if the parent author is local 2016-06-26 10:28:32 +02:00
Benjamin Neff
3b1d113a9a add own posts to activity-stream again 2016-06-26 06:21:03 +02:00
Benjamin Neff
ab2118ffa5 don't participate own posts 2016-06-26 06:21:03 +02:00
Benjamin Neff
e08306dab4 remove participation parent author check
the check that the participation parent author is local is now done in
the diaspora_federation gem
2016-06-26 06:21:03 +02:00
Benjamin Neff
65f03b2d08 extract mappings between diaspora and the federation gem 2016-06-26 06:21:02 +02:00
Benjamin Neff
bb0d7e46dc add #object_to_receive to Diaspora::Federated::Base 2016-06-26 06:21:02 +02:00
Benjamin Neff
1cf11db634 remove diaspora_handle setter to set author 2016-06-26 06:21:02 +02:00
Benjamin Neff
5e16b9c7cd add author to subscribers of public shareables to ensure local delivery 2016-06-26 06:21:02 +02:00
Benjamin Neff
a81bdac38c don't send relayables back to sender pod
send retraction for relayable to target author if retracted by parent author
2016-06-26 06:21:02 +02:00
Benjamin Neff
9dfa8e1442 send retractions for public relayables privately if the parent is remote 2016-06-26 06:21:02 +02:00
Benjamin Neff
70f378a1c1 don't participate own posts on creation 2016-06-26 06:21:02 +02:00
Benjamin Neff
f58167c154 disconnect when receiving a Contact with sharing=false 2016-06-26 06:21:02 +02:00
Benjamin Neff
709ad6e909 Participation is not relayable anymore
only deliver to parent author
2016-06-26 06:21:02 +02:00
Benjamin Neff
cf5a72719e participates root author when receiving a reshare 2016-06-26 06:21:02 +02:00
Benjamin Neff
9fa3cc97d4 deliver message always to all participants
message doesn't include Diaspora::Relayable anymore
2016-06-26 06:21:02 +02:00
Benjamin Neff
b39f3ccc74 relay relayables after receive
also refactored relayable specs to use `let`
2016-06-26 06:21:02 +02:00
Benjamin Neff
91c6c74ca0 retract relayables if the author is ignored by the parent author 2016-06-26 06:21:02 +02:00
Benjamin Neff
0f6e0b7288 send the profile to remote persons on start shareing with them 2016-06-26 06:21:02 +02:00
Benjamin Neff
c15babdc9f allow to dispatch to specific subscribers 2016-06-26 06:21:02 +02:00
Benjamin Neff
57dbcc0e67 add root author to reshare subscribers 2016-06-26 06:21:02 +02:00
Benjamin Neff
03123f1c4d remove more unused code and cleanup 2016-06-26 06:21:01 +02:00
Benjamin Neff
2476b74dbe refactoring delete from services 2016-06-26 06:21:01 +02:00
Benjamin Neff
dee8bc6f0e write specs for dispatcher 2016-06-26 06:21:01 +02:00
Benjamin Neff
f95e0faa37 delete old postzord dispatcher 2016-06-26 06:21:01 +02:00
Benjamin Neff
0e6446d05f create ShareVisibilities with batch import
and delete old batch worker and receiver
2016-06-26 06:21:01 +02:00
Benjamin Neff
4d8211b641 remove old SignedRetraction and RelayableRetraction 2016-06-26 06:21:01 +02:00
Benjamin Neff
9144a4aadd write specs for retractions 2016-06-26 06:21:01 +02:00
Benjamin Neff
51aca4506f remove HttpMulti and HydraWrapper 2016-06-26 06:21:01 +02:00
Benjamin Neff
ae05d4e928 use Diaspora::Federation::Dispatcher everywhere 2016-06-26 06:21:01 +02:00
Benjamin Neff
b0942bc219 remove salmon code 2016-06-26 06:21:01 +02:00
Benjamin Neff
fa5a35ed4a remove xml specs 2016-06-26 06:21:01 +02:00
Benjamin Neff
d2219aa58f write spec for Diaspora::Federation::Entities to replace xml specs 2016-06-26 06:21:01 +02:00
Benjamin Neff
7893a23927 add resharers and participants to subscribers on public posts 2016-06-26 06:21:01 +02:00
Benjamin Neff
566f4890a2 merge Federated::Shareable to Shareable
also drop xml-code for Shareable
2016-06-26 06:21:01 +02:00
Benjamin Neff
902d7faca4 relay retractions for relayables 2016-06-26 06:21:01 +02:00
Benjamin Neff
3df70bb205 send retractions for public targets publicly 2016-06-26 06:21:01 +02:00
Benjamin Neff
7f11beae37 dispatch retractions 2016-06-26 06:21:00 +02:00
Benjamin Neff
65ba573a3b Contact retraction 2016-06-26 06:21:00 +02:00
Benjamin Neff
89fbcf7c56 federate retractions 2016-06-26 06:21:00 +02:00
Benjamin Neff
ecbf5fa3e7 enable some skipped tests again 2016-06-26 06:21:00 +02:00
Benjamin Neff
9ce9b4bcd0 deliver profile update with new dispatcher 2016-06-26 06:21:00 +02:00
Benjamin Neff
caf5d562de mock new send worker in tests 2016-06-26 06:21:00 +02:00
Benjamin Neff
5f25135848 send public messages 2016-06-26 06:21:00 +02:00
Benjamin Neff
7184d4334e remove after_dispatch hook
handle photos in StatusMessageCreationService
2016-06-26 06:21:00 +02:00
Benjamin Neff
20dabbd15f remove user parameter from subscribers method 2016-06-26 06:21:00 +02:00
Benjamin Neff
f9f91a0e9e create new contact for local receive 2016-06-26 06:21:00 +02:00
Benjamin Neff
83f5662d62 remove NotifyLocalUsers worker 2016-06-26 06:21:00 +02:00
Benjamin Neff
645c7bd5ad rewrite attack vector specs using new federation 2016-06-26 06:21:00 +02:00
Benjamin Neff
7bb172cefb remove old Private and Public Receiver 2016-06-26 06:21:00 +02:00
Benjamin Neff
581f8d7226 don't force remove contact on block
this creates inconsistent states, if you remove the block in the future
2016-06-26 06:21:00 +02:00
Benjamin Neff
102e2a0834 remove Request class and refactor Connecting 2016-06-26 06:20:59 +02:00
Benjamin Neff
d87756c4b7 move #add_contact_to_aspect from User-model to user_methods.rb 2016-06-26 06:20:59 +02:00
Benjamin Neff
6fbfc2bf96 write receive specs and delete old unused specs
also refactored receive methods
2016-06-26 06:20:59 +02:00
Benjamin Neff
aa3ec1b93c write specs for :receive_entity and extend factories 2016-06-26 06:20:59 +02:00
Benjamin Neff
a7f6c84bf3 fix TODOs in federation specs 2016-06-26 06:20:59 +02:00
Benjamin Neff
59bb46eeb6 handle retractions 2016-06-26 06:20:59 +02:00
Benjamin Neff
58a5a881cf receive local
* Contact: auto-follow-back
* Shareable: create share visibilities
2016-06-26 06:20:59 +02:00
Benjamin Neff
f3466bcfd6 update profile 2016-06-26 06:20:59 +02:00
Benjamin Neff
4fb34139b0 cleanup notifications and fix tests 2016-06-26 06:20:59 +02:00
Benjamin Neff
ebfb0aa884 create NotificationService: send notifications after receive 2016-06-26 06:20:59 +02:00
Benjamin Neff
87666eeb35 handle receive contact 2016-06-26 06:20:59 +02:00
Benjamin Neff
e0da6708f4 save entities on receive
first implementation of receive_entity callback
2016-06-26 06:20:59 +02:00
Benjamin Neff
e9f53265c9 create new receive workers 2016-06-26 06:20:59 +02:00
Benjamin Neff
dfe32a5e4b fix federation tests 2016-06-26 06:20:59 +02:00
Benjamin Neff
3a5990c552 create fetch_related_entity callback and cleanup unused callbacks 2016-06-26 06:20:58 +02:00
Benjamin Neff
1790efad08 implement :update_pod callback 2016-06-26 06:20:58 +02:00
Benjamin Neff
4408efdff3 fetch public key for unknown person
and do some refactorings
2016-06-26 06:20:58 +02:00
Benjamin Neff
7596a49b46 add new send workers 2016-06-26 06:20:58 +02:00
Benjamin Neff
b1d30aa9cc add more "diaspora to federation entity" methods
move it to Diaspora::Federation::Entities and use it in some tests, but most of the tests can be removed later.
2016-06-26 06:20:58 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page 2016-06-20 02:03:53 +02:00
Jonne Haß
1ef3c1387b
Merge pull request #6872 from denschub/autolink-with-rel-noopener
Add rel="noopener noreferrer" to autolinks
2016-06-19 16:21:04 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop 2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly
closes #6877
2016-06-19 16:14:00 +02:00
Dennis Schubert
652050a87e Add rel="noopener noreferrer" to autolinks 2016-06-19 13:43:43 +02:00
Dennis Schubert
eb1e1e1263 Merge pull request #6768 from svbergerem/poltergeist
Use Poltergeist instead of Selenium
2016-06-19 11:43:50 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium 2016-06-19 01:53:18 +02:00
Dennis Schubert
61fb7410cc
Merge pull request #6844 from cmrd-senya/unique-aspect-visibilities
Fix possible duplication of AspectVisibility
2016-06-19 01:49:41 +02:00
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
Dennis Schubert
f1e296cc52 Merge pull request #6870 from svbergerem/update-status-message-text-prefill-mention
Update status message text after prefilling mentions
2016-06-19 01:03:26 +02:00
Steffen van Bergerem
657eec29f0 Update status message text after prefilling mentions 2016-06-18 23:29:59 +02:00
Benjamin Neff
30ea6ef72f fix spec for ApplicationHelper#changelog_url 2016-06-18 23:12:29 +02:00
Benjamin Neff
d68c1ad974 remove REDISTOGO_URL deprecation 2016-06-14 06:40:34 +02:00
Steffen van Bergerem
b84eff62ea Improve status message creation service spec 2016-06-12 11:48:11 +02:00
Dennis Schubert
520d80cc1a
Merge branch 'stable' into develop 2016-06-09 03:19:35 +02:00
Steffen van Bergerem
a14c61300e
Remove the publisher from the photos page
closes #6851
2016-06-09 03:17:52 +02:00
cmrd Senya
2737280fa4
Don't include wrong shareable types in scopes 2016-05-31 18:20:07 +03:00
cmrd Senya
717554edac
Fix possible duplication of AspectVisibility
No uniqueness control on AspectVisibility resulted in possible having
multiple AspectVisibility objects in the DB for the same aspect and
shareable which doesn't make sense. Introduce uniqueness validation
and fix up tests where duplication happened.
2016-05-27 20:22:03 +03:00
Dennis Schubert
53808847a2 Merge branch 'stable' into develop 2016-05-07 18:52:34 +02:00
Ralin Chimev
1773e3e35d Do not change notification timestamp when making it read or unread.
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.

Fixes #6798.

closes #6821
2016-05-07 18:52:27 +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
Dennis Schubert
a414fb2381 Merge pull request #6747 from cmrd-senya/rspec-fixup
Fix usage of hard-coded pod URI in rspec testsuite
2016-04-05 17:52:50 +02:00
Steffen van Bergerem
c8a8110cf1 Merge branch 'stable' into develop 2016-03-30 11:13:47 +02:00
Dennis Schubert
4617629098 Add spec for PeopleHelper#birthday_format
closes #6738
2016-03-30 11:13:35 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +02:00
Benjamin Neff
69f08a4a7e add fetch callbacks 2016-03-30 10:01:54 +02:00
Benjamin Neff
a3ed9da210 changes for new federation-gem version 2016-03-30 09:45:46 +02:00
cmrd Senya
0f04414a4f Fix usage of hard-coded pod URI in rspec testsuite 2016-03-22 15:06:30 +03: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
Jonne Haß
7c5d6886ba Merge pull request #6729 from theworldbright/6696-api-scope-escalation-fix
#6696 - Fix API scope escalation
2016-03-21 13:45:18 +01:00
Dennis Schubert
3bb28ec016 Merge pull request #6757 from svbergerem/fix-mentions-input-box-submitting
Fix publisher overflow on submit
2016-03-18 07:28:36 +01:00
Dennis Schubert
446201b584 Merge branch 'stable' into develop 2016-03-18 07:24:44 +01:00
Benjamin Neff
6ea8cd546e don't change AppConfig.environment.url in jsxc_helper_spec
closes #6748
2016-03-18 07:24:40 +01:00
Steffen van Bergerem
3210d0d260 Fix publisher overflow on submit 2016-03-18 05:04:22 +01:00
theworldbright
bb3849e4b1 Fix API privilege scope escalation 2016-03-11 17:18:21 -08:00
Benjamin Neff
80201d452e fix randomly failing specs for public posts 2016-03-09 03:00:47 +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
df1c1ab24e Merge pull request #6744 from SuperTux88/refactor-services
Refactor services
2016-03-08 23:35:43 +01:00
Dennis Schubert
d5560430ce Merge pull request #6740 from svbergerem/refactor-cukes
Refactor invitations and public stream cukes
2016-03-07 18:47:52 +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
Steffen van Bergerem
11b659864f Fix typeahead suggestions with nonlatin chars 2016-03-07 14:54:45 +01:00
Benjamin Neff
0c8588eec8 PostService: create find!
* find returns nil if nothing found
* find! raises errors if not found or not visible
2016-03-07 05:52:54 +01:00
Benjamin Neff
017842cc01 don't update updated_at date when read the notifications.
updated_at is displayed in the frontend and should only be updated when
another notification_actor gets added

Also improved the sql-queries: update directly and not select first and
update then.
2016-03-07 05:52:54 +01:00
Benjamin Neff
d94eae0d45 refactoring PostService
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
2016-03-07 05:52:54 +01:00
Benjamin Neff
d872c64369 write specs for CommentService 2016-03-07 05:52:54 +01:00
Benjamin Neff
b398b115bc refactoring CommentService 2016-03-07 05:52:54 +01:00
Benjamin Neff
b67b7cf8c6 write specs for StatusMessageCreationService 2016-03-07 05:52:54 +01:00
Benjamin Neff
5a46da47c3 refactoring StatusMessageCreationService
* move parameter normalization back to controller, because this is
  frontend-specific.
* if the StatusMessage is public, save also public photos
2016-03-07 00:00:27 +01:00
Benjamin Neff
10af3a8b11 fix pod table migration if someone deleted a user (owner) manually 2016-03-06 23:55:28 +01:00
Steffen van Bergerem
e4f8023b91 Add rspec test for public stream 2016-03-05 21:07:00 +01:00
Steffen van Bergerem
9d591c6433 Move some multi stream and person stream cukes to rspec 2016-03-05 11:18:55 +01:00
Steffen van Bergerem
6e6a5c1e29 Move multiple participations test to rspec 2016-03-05 11:18:55 +01: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
Steffen van Bergerem
f556a5210e Refactor js search views 2016-03-04 22:55:39 +01:00
Benjamin Neff
f913128967 don't add public shareables to aspect_visibilities 2016-03-04 20:13:52 +01:00
Steffen van Bergerem
bf17205c17 Fix some publisher.scss scss-lint errors 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
Augier
e34960392c Code simplifications and typo 2016-03-04 18:02:22 +01:00
Augier
8f021be20b Do not instanciate publisher if not publisher element is present 2016-03-04 18:02:22 +01:00
augier
b1d60d7c9a Jasmine tests 2016-03-04 18:02:22 +01:00
augier
f1e8c57c26 CSS guidestyle 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
Benjamin Neff
14d45861cb remove old migration spec, because it tries to downgrade later migrations 2016-03-03 21:43:11 +01:00
Dennis Schubert
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00