Commit graph

66 commits

Author SHA1 Message Date
Jonne Haß
0f1295718f Merge branch 'stable' into develop 2015-09-13 12:25:18 +02:00
Steffen van Bergerem
ebad0961a9 Show private profile info if contact is sharing 2015-09-13 12:16:25 +02:00
Jonne Haß
2bf6c87964 Merge branch 'stable' into develop 2015-08-23 22:49:51 +02:00
theworldbright
335b1c32aa Refactor post presenter 2015-08-23 22:49:12 +02:00
Steffen van Bergerem
89a3ea6d20 Merge branch 'stable' into develop 2015-08-23 14:45:33 +02:00
Jonne Haß
a1ca45b201 Update NodeInfo to final 1.0 schema
closes #6340
2015-08-23 14:45:20 +02:00
Jason Robinson
cb909c0d70 Strip leading/trailing whitespace from pod tags list in social relay well known
Closes #6303
2015-08-09 00:33:35 +03:00
Dennis Schubert
e8297f8d6b Merge pull request #6207 from jaywink/social-relay
Implement social relay requirements
2015-07-25 23:01:45 +02:00
Jonne Haß
d68b3f02bd Expose whether chat is enabled as NodeInfo metadata
related to #6211
2015-07-24 04:16:54 +02:00
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +02:00
Jonne Haß
b7064677ff Collapse StatisticsController into NodeInfoController 2015-07-24 03:51:31 +02:00
Jonne Haß
c928d6c117 Expose whether chat is enabled as NodeInfo metadata
related to #6211
2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Jason Robinson
bdf6c71772 Implement social relay functionality
* .well-known/social-relay - to serve subscription preferences to relays
* Workers.deferred_dispatch relay carbon copy functionality for outbound sending

See discussion here: https://www.loomio.org/d/9vpoe0UR/public-post-federation#comment-730911 and spec here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts
2015-07-18 21:29:31 +03: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
Jonne Haß
1cd2562572 Merge branch 'stable' into develop 2015-07-02 11:12:16 +02:00
Dennis Schubert
e92c8000ba Do not leak private profile fields in JSON format
Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>
2015-07-02 10:07:59 +02:00
fla
7f6609d17b Remove old service keys in statistics.json 2015-06-13 11:03:47 +02:00
Jonne Haß
ac52cef546 Only return the current_users participation for post interactions
closes #6007
2015-05-30 03:08:25 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
2015-05-25 04:18:38 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person
closes #5936
2015-05-09 23:48:59 +02:00
Benjamin Neff
344b198900 use camo for medium and small avatars 2015-04-24 03:10:48 +02:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
6432bbe67b fix 2015-02-27 16:29:49 +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
Augier
55d258c5ac Fix registrations displaying 2015-01-30 18:00:22 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Jonne Haß
a7c702d631 Merge pull request #5308 from Flaburgan/add-network-key-to-statistics
Add network key to statistics.json

Conflicts:
	Changelog.md
2014-10-14 13:25:16 +02:00
flaburgan
adc839d620 Add network key to statistics.json, close #5042 2014-10-08 01:16:54 +02:00
Alex Nordlund
acc7377e5f Removed setting for statistics, showing both instead. 2014-10-05 01:45:48 +02:00
Alex Nordlund
03f3c74cee Moved services to a JSON list.
Added AppConfig.privacy.statistics.deprecated_format to toggle showing the old style format.
2014-10-05 01:07:30 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Jonne Haß
66c2f7f869 Fix statistics_presenter_spec 2014-10-04 01:01:19 +03:00
Jason Robinson
309e690a66 Fix services in statistics.json.
Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
2014-10-03 23:54:42 +03:00
Florian Staudacher
a5da2ca48c small fixes and more jasmine specs 2014-09-15 01:37:24 +02:00
Florian Staudacher
be86014540 rspec should now be running a green build 2014-09-15 01:37:23 +02:00
Florian Staudacher
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +02:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
damzcodes
de069962b3 Service have been added to /statistics.json
Services have been added to /statistics.json

tidying up

edits
2014-08-15 14:02:03 +01:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03:00
Hincu Petru
2ae4d41db3 Fixed 4903 and not render vote form when user is not logged 2014-04-05 14:29:07 +00:00
Jonne Haß
8280556a47 Introduce message renderer
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00
Jannik Streek
d603ff818c added comment count to statistic to calculate posts/comments ratios
fixeds tests for comment count in statistics

added changelog entry and default entry
2014-02-21 12:25:23 +01:00
Jonne Haß
32b9caa08c replace stub and mock deprecations with doubles 2014-01-13 12:25:38 +01:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code
Drop spv old code
2013-12-11 07:41:51 -08:00
Jason Robinson
2c83d0e846 Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
Fabian Rodriguez
d7b8cb2997 remove #next_post_path and #previous_post_path from postpresenter 2013-12-01 20:55:48 -02:00
Damien
f4b3f2fd1e Consider Markdown header content as post title
clarify regexp and correct some bad backtracking

add specs

rewrite regex

convert mardown style title to plain text title

fix bad indentation

add jasmine test for post-viewer.js

tries to fix bad jasmine test
2013-07-31 14:59:02 +02:00
Fabián Rodríguez
f978a75b8c bootstrap my_aspects data 2013-01-16 19:33:20 -02:00
Jonne Haß
1a93ccd548 don't error out if the root of a reshare of a reshare got deleted, fixes #3546 2012-10-24 19:51:31 +02:00