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
