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

7970 commits

Author SHA1 Message Date
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
Dennis Schubert
0f51d89ba5 Merge pull request #6200 from AugierLe42e/fix-stream-faces 
Better display for stream faces
 2015-07-16 03:39:21 +02:00
Augier
adef7ee37c Better display for stream faces 2015-07-15 20:31:40 +02:00
Jonne Haß
9229f1dfd2 Merge branch 'stable' into develop 2015-07-14 09:58:59 +02:00
Alex Chvatal
634aa7b09a capitalize Wiki in the links sidebar. closes #6188 
closes #6193
 2015-07-14 09:58:43 +02:00
Benjamin Neff
e4ca9f01e2 fix jsxc_helper_spec and use new url_to in jsxc_helper 
closes #6151
 2015-07-13 23:52:13 +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
Benjamin Neff
0ffe513b40 fix jsxc_helper_spec and use new url_to in jsxc_helper 2015-07-11 11:19:42 +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
Jonne Haß
84d5a13ce1 Merge branch 'stable' into develop 2015-07-11 00:17:19 +02:00
realtin
9eadc251ae added post guid to the post_serializer 
closes #6185
 2015-07-11 00:17:01 +02:00
zaziemo
787c1cfce9 add spec and code to include guid in comment's export 
#6115
 2015-07-11 00:16:24 +02: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
Dennis Schubert
aa86003cf9 Keep the hacky scope workaround in comments.js 
because we still are supporting browsers without .bind() and I do not
want to break the patterns here.

Follow up to #6171 - I wanted to avoid feedback loop delays for that
little change.
 2015-07-09 03:24:15 +02:00
Spanti Nicola (RyDroid)
df440ed8d8 Very minor changes of some JS files 2015-07-08 19:09:08 +02:00
Dennis Schubert
c703cadf9b Merge branch 'stable' into develop 2015-07-07 02:51:38 +02:00
Dennis Schubert
b5b5f1f028 Revert "Issue #6145: Set a fixed body-height" for global side effects 
This reverts commit 990c678cd3.
 2015-07-07 02:50:30 +02:00
Dennis Schubert
eecceacd46 Merge branch 'stable' into develop 2015-07-07 02:46:39 +02:00
Haidy777
990c678cd3 Issue #6145: Set a fixed body-height 
closes #6169
 2015-07-07 02:46:34 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +02:00
Benjamin Neff
b0a9a6342f add url_to 
closes #6168
 2015-07-05 20:46:18 +02:00
Benjamin Neff
f45e053316 remove unused publics_helper 
the Subscriber stuff was removed in 2010:
f97218c005
 2015-07-05 20:44:24 +02:00
Benjamin Neff
540b8df1b8 don't get url from hcard, is already set from webfinger 
prepare for federation refactoring
 2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
Jonne Haß
69974bdc13 Merge pull request #6161 from svbergerem/fix-conversation-modal 
Fix two modal issues
 2015-07-03 20:26:31 +02:00
Steffen van Bergerem
61edda0fca Aspect creation modal now creates an aspect when pressing enter 2015-07-03 18:20:32 +02:00
Steffen van Bergerem
db00bd1b03 Fix conversation modal on contacts page 2015-07-03 17:44:12 +02:00
Steffen van Bergerem
aeda8e37e3 Remove aspects-dropdown.js 2015-07-03 16:56:25 +02:00
Jonne Haß
7d32000bd0 Merge branch 'stable' into develop 2015-07-03 16:34:18 +02:00
cmrd Senya
fe3ff10e07 Add new daily job to clean cache in public/tmp (as suggested in #5946). 2015-07-03 16:34:01 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Dennis Schubert
e0782437b8 Merge branch 'stable' into develop 2015-07-03 05:26:01 +02:00
theworldbright
d410d2ee76 Fix bug where flash error reappeared #6136 
closes #6146
closes #6136
 2015-07-03 05:25:22 +02:00
Jonne Haß
1cd2562572 Merge branch 'stable' into develop 2015-07-02 11:12:16 +02:00
Jonne Haß
6601576149 Merge branch 'master' into stable 2015-07-02 11:11:58 +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
Dennis Schubert
8b773c89e1 Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments 
Fix for #5483 and #5757 (mobile stream comments)
 2015-06-27 04:43:50 +02:00
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79 
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
 2015-06-24 04:01:15 +02:00
Jonne Haß
0b6dc320cb Merge pull request #6132 from svbergerem/fix-perfect-scrollbar 
Fix overflow with perfect scrollbar
 2015-06-22 01:29:40 +02:00
Steffen van Bergerem
df12878371 Fix overflow with perfect scrollbar 2015-06-22 00:44:42 +02:00
Steffen van Bergerem
d6ddbbe4af Navbar background color for autocomplete results 2015-06-21 21:13:57 +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
Jonne Haß
79c5202a5b Merge pull request #6109 from svbergerem/bootstrap-header-rewrite 
Bootstrap header rewrite
 2015-06-21 19:46:07 +02:00
SansPseudoFix
57ac37cd2d Fix broken avatar getting start page 
Update add contact page

BS3

Fix syntax
 2015-06-21 16:38:12 +02:00
Steffen van Bergerem
8d5794a2a4 Fix autoresize default height for comment box 2015-06-21 04:40:56 +02:00
Steffen van Bergerem
b3c535bab4 Add color theme support for new header 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00