Jonne Haß
a1ca45b201
Update NodeInfo to final 1.0 schema
...
closes #6340
2015-08-23 14:45:20 +02:00
Steffen van Bergerem
eddfa7cb5c
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
...
Left and right navbar polishing
2015-08-23 11:29:51 +02:00
augier
450bf4f4ba
Refactor and minor styling
2015-08-23 09:59:12 +02:00
Steffen van Bergerem
40ef382a6e
Merge branch 'stable' into develop
2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448
Issue #6180 : Update stream faces block if somebody was blocked
...
closes #6320
2015-08-22 01:35:23 +02:00
Jonne Haß
d396d5555f
Merge branch 'stable' into develop
2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a
remove old webfinger/hcard code
...
closes #6310
2015-08-21 14:23:08 +02:00
Benjamin Neff
d28e03f053
use discovery from diaspora_federation gem
2015-08-21 14:21:43 +02:00
Benjamin Neff
21e5bd8697
add save callback for webfinger
2015-08-21 14:21:43 +02:00
Benjamin Neff
65b056341c
update federation gem
2015-08-21 14:21:42 +02:00
augier
281d1a9161
Rebasing and fixing tests
2015-08-11 18:12:02 +02:00
Steffen van Bergerem
8bc86eb98b
Replace jquery.autocomplete with typeahead.js
2015-08-10 22:55:05 +02:00
Jonne Haß
25be9ecfd2
Merge branch 'stable' into develop
2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae
Extract service from comments controller
...
closes #6307
2015-08-09 18:35:11 +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
Jonne Haß
480384a077
Merge branch 'stable' into develop
2015-08-06 22:56:30 +02:00
Steffen van Bergerem
dc576fb0d6
Check if person is nil in person_image_tag
...
closes #6286
2015-08-06 22:55:41 +02:00
augier
f917757b5b
Use entypo icons on mobile posts
2015-08-06 15:56:58 +02:00
Jonne Haß
4442616b0d
Merge branch 'stable' into develop
2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7
Move nsfw-shield to status-message
...
closes #6270
2015-07-30 12:00:48 +02:00
Steffen van Bergerem
e402bbdd3d
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
...
Fix nsfw author
2015-07-30 00:28:15 +02:00
augier
9a23c92f8e
Show author of NSFW post
2015-07-29 21:13:41 +02:00
Jonne Haß
4abc0c5988
Merge branch 'stable' into develop
2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465
Update backbone.js
...
closes #6262
2015-07-29 10:04:18 +02:00
Dennis Schubert
04135d7b28
Merge branch 'stable' into develop
2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777
Fix mobile photos index page
...
closes #6243
2015-07-27 01:59:26 +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
theworldbright
d724397168
Refactor posts controller
2015-07-26 12:58:42 +02:00
Dennis Schubert
e8297f8d6b
Merge pull request #6207 from jaywink/social-relay
...
Implement social relay requirements
2015-07-25 23:01:45 +02:00
Steffen van Bergerem
9ca8005b27
Fix percentage on mobile polls
2015-07-25 04:34:52 +02:00
Jonne Haß
11a8ac614c
Merge pull request #6240 from svbergerem/contact-page-update-counts
...
Update number of contacts on contact page when adding/removing contacts
2015-07-24 22:02:39 +02:00
Steffen van Bergerem
04191996a5
Add updates for 'only sharing' and 'all contacts'
2015-07-24 14:18:43 +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
Steffen van Bergerem
4a178e20e5
Update number of contacts on contact page when adding/removing contacts
2015-07-24 02:38:49 +02:00
Jonne Haß
5a5d595339
Merge pull request #6238 from svbergerem/mobile-location-polls
...
Add location and polls to mobile website
2015-07-23 20:02:11 +02:00
Steffen van Bergerem
79dfdfa224
Add integration tests for mobile polls and locations
2015-07-23 17:30:53 +02:00
Jonne Haß
f4e0785e96
Merge branch 'stable' into develop
2015-07-23 17:02:55 +02:00
cmrd Senya
e30293b9c1
Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser.
...
closes #6234
2015-07-23 17:02:52 +02:00
Steffen van Bergerem
44c370513e
Refactor publisher_view.js
2015-07-22 17:36:25 +02:00
Jonne Haß
0cbe7ec9a8
Merge branch 'stable' into develop
2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54
Remove correlations
...
closes #6223
2015-07-22 09:46:52 +02:00
Steffen van Bergerem
c8f482064c
Remove rake_helpers
2015-07-22 09:41:53 +02:00
Steffen van Bergerem
8f27e8fae8
Improve wording for admin dashboard
2015-07-21 20:43:18 +02:00
Steffen van Bergerem
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +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
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
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
edc3ac6908
write tests for federation callbacks
2015-07-14 05:50:26 +02:00
Benjamin Neff
804784ed3f
fix @pod_uri/@pod_url and add url_to to AppConfig
2015-07-14 05:50:26 +02:00
Benjamin Neff
8bf54e32ae
create temporary fixture tests and remove old tests
2015-07-14 05:50:26 +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
Benjamin Neff
1bf328d294
write tests for federation callbacks
2015-07-11 11:19:42 +02:00
Benjamin Neff
94fc378eb7
fix @pod_uri/@pod_url and add url_to to AppConfig
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
0fca8ceeaf
create temporary fixture tests and remove old tests
2015-07-10 01:46:48 +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
Spanti Nicola (RyDroid)
df440ed8d8
Very minor changes of some JS files
2015-07-08 19:09:08 +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
2294e59ee3
change public_url to atom_url and profile_url
2015-07-05 20:44:24 +02:00
Jonne Haß
202b6108e9
Merge branch 'stable' into develop [ci skip]
2015-07-05 12:22:35 +02:00
Mohammed Rashid
c652374787
typo in spec [ci skip]
...
closes #6167
2015-07-05 12:22:23 +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
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +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
Steffen van Bergerem
df12878371
Fix overflow with perfect scrollbar
2015-06-22 00:44:42 +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
