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

3936 commits

Author SHA1 Message Date
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
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +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ß
b7064677ff Collapse StatisticsController into NodeInfoController 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