Steffen van Bergerem
295c8533a1
Fix profile visibility icon
2015-07-17 14:37:22 +02: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
Jonne Haß
99aa354052
Merge branch 'stable' into develop
2015-07-16 10:47:36 +02:00
Dennis Schubert
e7a2775cb5
Bump redcarpet
2015-07-16 10:45:32 +02: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
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
Dennis Schubert
13845a96f3
Merge pull request #6196 from Flaburgan/6121-terms-of-use
...
Update Changelog to improve terms changes indication.
2015-07-16 02:32:18 +02:00
Augier
adef7ee37c
Better display for stream faces
2015-07-15 20:31:40 +02:00
Jonne Haß
63e1448193
Merge branch 'stable' into develop
2015-07-15 15:49:40 +02:00
Jonne Haß
9b3ff1a416
Use commit_subject for Travis IRC notifications
...
commit_message has newlines which break the rather naive
IRC client Travis uses
2015-07-15 15:48:41 +02:00
Dennis Schubert
0401de0e8a
Merge branch 'stable' into develop
2015-07-15 01:38:45 +02:00
Benjamin Neff
0c8651d703
fix federation-gem for ruby 2.0
2015-07-15 01:33:36 +02:00
Jason Robinson
f413d20e27
Merge branch 'stable' into develop
2015-07-14 22:06:26 +03:00
Rich
0c3323088d
Rephrase 'Enter an email'
...
One does not simply 'enter an email' (should I enter a random email from my Inbox?), instead one enters ones own email address.
closes #6191
2015-07-14 22:05:34 +03:00
fla
7a474f2b7c
Update Changelog to improve terms changes indication.
2015-07-14 11:44:23 +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
Dennis Schubert
0e19603384
Merge pull request #6122 from Flaburgan/6121-terms-of-use
...
Add a ToS design change mention in the changelog, close #6121
2015-07-14 08:33:32 +02:00
Dennis Schubert
eca4fff6c1
Merge branch 'stable' into develop
2015-07-13 23:54:03 +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
Jonne Haß
c538cc22d7
Add pronto for easier local code linting [ci skip]
...
Run with bin/pronto run --commit=develop inside your feature branch
2015-07-11 13:25:05 +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
