nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19766 commits 4 branches 0 tags 121 MiB
Commit graph

1613 commits

Author SHA1 Message Date
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
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
0e6446d05f create ShareVisibilities with batch import 
and delete old batch worker and receiver
 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
fa5a35ed4a remove 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
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
9ce9b4bcd0 deliver profile update with new dispatcher 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
7bb172cefb remove old Private and Public Receiver 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
58a5a881cf receive local 
* Contact: auto-follow-back
* Shareable: create share visibilities
 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
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
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
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
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
10af3a8b11 fix pod table migration if someone deleted a user (owner) manually 2016-03-06 23:55:28 +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
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
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +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
Jonne Haß
21cb1f44cd Merge branch 'stable' into develop 2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826 
closes #6573
 2015-12-08 17:30:27 +01:00
Dennis Schubert
5081d69847 Merge branch 'stable' into develop 2015-11-22 02:52:37 +01:00
Jason Robinson
9a35a0d8dd Add participation to root.author on receiving reshare 
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.

closes #6481
 2015-11-22 02:50:38 +01:00
Jonne Haß
17d0ddab41 Merge branch 'stable' into develop 2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions 
closes #6552
 2015-11-18 03:16:54 +01:00
Jonne Haß
800be9b2cf Merge branch 'stable' into develop 2015-10-20 16:27:43 +02:00
cmrd Senya
00588e1ef8 Disable self-notification possibility 
closes #6512
 2015-10-20 16:27:39 +02:00
Lukas Matt
78f9b39e55 Use polymorphic association for the report item 
* Adopt pronto suggestions

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 17:18:03 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm 
5813 show geolocation on osm
 2015-09-23 01:43:49 +02:00
Jonne Haß
0508c1b8d4 Merge branch 'stable' into develop 2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos 
closes #6398
 2015-09-14 22:04:53 +02:00
realtin
1cdcc50c63 fix all the pronto remarks finally 
- fix map controls in stream
 2015-09-11 10:24:39 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University 
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
 2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer 
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
 2015-09-09 12:26:47 +02:00
zaziemo
f92a2ee0dd merge address & coordinates in one location object 
to provide a clear arrangement of all location data
- add 'L' to predefs for pronto because it is part of the leaflet library
- fix: show address template only with an address present
with merging the location objects into one, only the objects within
the location object can be empty
(#5813)
 2015-09-09 12:22:48 +02:00
zaziemo
298e195a8f add a map subview 
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813)
 2015-09-09 12:19:38 +02:00
Jonne Haß
6528f1479c Merge branch 'stable' into develop 2015-09-07 13:32:19 +02:00
Jonne Haß
0dd5447e63 Fix tumblr service deletion spec to actually test deletion 2015-09-07 13:31:45 +02:00
Jonne Haß
ba61ca4bdf Merge branch 'stable' into develop 2015-09-07 13:25:14 +02:00
Jonne Haß
0e64d8de2a Refactor tumblr service spec 
closes #6386
 2015-09-07 13:24:53 +02:00
Vinothan Shankar
2ace9b47b1 * app/models/services/tumblr.rb (Services::Tumblr#post): Post only to primary blog 
Hardly a total fix, but it's a start.  Based on meitar/diaspora:b5c01598.

* app/models/services/tumblr.rb: style: double-quote string

Line 22.  Change from single-quotes.

* app/models/services/tumblr.rb: parse URL only for blogs we care about

...which in this case is just the primary.

This also fixes the failed test in 7079fda (and by extension, 7a1d3a9).

* spec/models/services/tumblr_spec.rb: Add "primary" flag to test user-info

* spec/models/services/tumblr_spec.rb: Add a secondary blog to test user-info

This should not cause a request to be issued, so we can continue to
expect the request for the primary blog only.  Any request for the
secondary indicates a bug in the service implementation.

* spec/models/services/tumblr_spec.rb: Make the second blog returned the primary

Just to catch if it's picking the first one

* app/models/services/tumblr.rb: use blogs.find instead of blogs.each

Since we're only handling the primary blog, this should be easy enough

* app/models/services/tumblr.rb: Remove redundant if block

The condition it would have caught is dealt with by the ifnone on the find

* app/models/services/tumblr.rb: Style: remove space between { and |
 2015-09-07 12:45:16 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb add more specs to test moderator role 
fixes #5324

closes #6351
 2015-09-07 12:38:12 +02:00
zaziemo
c2c6ed5dea refactor moderator role and add specs 
#5324
 2015-09-07 12:32:09 +02:00
zaziemo
3a3c881735 add new role moderator analogue to admin role 
#5324
 2015-09-07 12:24:12 +02:00
Florian Staudacher
738413c65f fix some issues with pod-checking 
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
 2015-08-30 18:50:34 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network 
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
 2015-08-24 22:04:53 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
d28e03f053 use discovery from diaspora_federation gem 2015-08-21 14:21:43 +02:00
Jonne Haß
6ee3843449 Merge branch 'stable' into develop 2015-07-26 13:11:49 +02:00
theworldbright
2a3dde1ae5 Refactor PostService and extract its tests 
Squashed commits:

[ada0f09] Remove favorites from Posts table

closes #6208
 2015-07-26 13:10:24 +02:00
Jonne Haß
0e439f6c1c Merge branch 'stable' into develop 2015-07-16 11:12:16 +02:00
JoeBew42
e21dad780d Refactoring tests on photo saved with and without EXIF data 
closes #6183
 2015-07-16 11:12:12 +02:00
Dennis Schubert
201a3ec1cf Merge branch 'stable' into develop 2015-07-16 03:11:25 +02:00
realtin
d0b290ea4d refactor hash indentation and add double quotes 
this is the suggested styling according to hound/pronto/rubocop
(#6192)
 2015-07-16 03:08:34 +02:00
zaziemo
c5a2334fbe refactor tests to use let 
instead of before blocks creating instance variables
pronto checked

#6192
 2015-07-16 03:05:21 +02:00
realtin
8823bb01a2 refactor test to use let and better indentation 
(#6192)
 2015-07-16 03:05:20 +02:00
zaziemo
56e0d3d57d Remove one comment and change hash syntax 
#6192
 2015-07-16 03:05:20 +02:00
zaziemo
f52260ec68 Delete test because it didn't have an expectation 
and dipatch is also called in the following test
#6192
 2015-07-16 03:05:20 +02:00
realtin
62b375bb8e refactor test to use let 
instead of instance variables
(#6192)
 2015-07-16 03:05:20 +02:00
realtin
1503376fa6 refactor test to not use send method 
since dispatch method is not private
(#6192)
 2015-07-16 03:05:20 +02:00
realtin
880886bbad refactor test to use let instead of instance variables 2015-07-16 03:05:20 +02:00
zaziemo
5fba53a105 refactor even more tests 2015-07-16 03:05:20 +02:00
realtin
3ff33d355f refactor test to use let 2015-07-16 03:05:20 +02:00
zaziemo
e1e8856e8d refactor more specs 2015-07-16 03:05:20 +02:00
zaziemo
e3fe375849 correct indentation and use new hash syntax 2015-07-16 03:05:20 +02:00
zaziemo
fccb5dae23 refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests 2015-07-16 03:04:41 +02:00
realtin
a9919fabd1 refactor test to use let and rm unused variables 2015-07-16 03:00:08 +02:00
zaziemo
d86a768590 refactor test using let and subject instead of before 2015-07-16 03:00:08 +02:00
realtin
7f3737b13f refactor test to use let rather then instance variables 2015-07-16 03:00:08 +02:00
zaziemo
abf87889a0 refactor test by using let instead of before block when creating instance variables 2015-07-16 03:00:08 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-14 05:50:26 +02:00
Dennis Schubert
6b6bf84598 Merge pull request #6151 from SuperTux88/federation-gem 
Federation Gem Step 1: Webfinger/HCard generation
 2015-07-12 17:02:23 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-10 01:46:48 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. 
This also enables the podmin account to send messages
to any local user.

closes #6128
 2015-06-21 20:48:48 +02:00
Dennis Schubert
8a4ec1d4c6 Merge branch 'stable' into develop 2015-06-08 04:18:38 +02:00
Benjamin Neff
d42b5c128e update photos when received over public path 
closes #6082
 2015-06-08 04:18:31 +02:00
Benjamin Neff
e16b9af7e6 make public and private receiver work similar ... 2015-06-08 04:15:17 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Benjamin Neff
97153ad08b update tests for new twitter client 
closes #6083
 2015-06-08 04:08:46 +02:00
Dennis Schubert
0c6ca1d235 Merge branch 'stable' into develop 2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0 retry receive share-visibility when failed while receiving parallel 
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126)

closes #6068
 2015-06-08 00:58:00 +02:00
Dennis Schubert
e0420d733a Merge branch 'stable' into develop 2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
dimana
31d760867c Issue #4297: Updated color themes and testing 2015-06-07 19:57:37 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Jonne Haß
3850118e4e Merge branch 'stable' into develop 2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Dennis Schubert
ffc3cb711f Merge branch 'stable' into develop 2015-06-02 02:35:21 +02:00
Benjamin Neff
03dbb75dd5 don't save default avatars to the database 2015-06-02 02:32:01 +02:00
Jonne Haß
351f54d74f Merge branch 'stable' into develop 2015-05-28 11:24:34 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Jonne Haß
3e35ef0b63 Merge branch 'stable' into develop 2015-05-24 11:16:09 +02:00
Benjamin Neff
986ad0df14 fix validation for status-message when the author is missing 
closes #5986
 2015-05-24 11:16:05 +02:00
Jonne Haß
5a3b62d801 Merge branch 'stable' into develop 2015-05-19 10:42:44 +02:00
Benjamin Neff
9a4a7255e7 remove unused older and newer methods for posts 
last renamed in 8386179f16

closes #5970
 2015-05-19 10:42:39 +02:00
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
267a1df3c4 fix root_diaspora_id when root was deleted 2015-05-19 02:59:31 +02:00
Dennis Schubert
6a1ec27b3c Merge branch 'stable' into develop 2015-05-19 02:58:41 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email 
closes #5967
 2015-05-19 02:58:37 +02:00
Dennis Schubert
944c57f874 Merge branch 'stable' into develop 2015-05-18 03:23:43 +02:00
Benjamin Neff
7cccb6594f remove security hax comment 2015-05-18 03:23:15 +02:00
Jonne Haß
f257658e46 Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" 
This reverts commit 2c7848e3cb.
 2015-05-04 00:43:41 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" 
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
 2015-05-04 00:36:27 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Jonne Haß
65a738e604 bump rspec-rails 2015-03-25 02:33:56 +01:00
Martha
d4f1a5dbe8 added specs and validations for Role model 
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
 2015-03-18 09:16:15 -07:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Steffen van Bergerem
81cd1753e4 Improve link to original post in reshared polls 2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f disable poll voting for reshared post 2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts 
5041 total user statistic shouldnt include closed accounts
 2015-02-27 16:02:35 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
zachrab
f695b5d3e7 Set disable_mail to true 
Add #clear_account! disable mail spec

Add migration for disabling mail for all closed accounts

Change migration to use #update_all for disable_mail attribute

Add #clear_account! false fields spec
 2015-02-19 16:45:39 -08:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00