Dennis Schubert
23c83b9447
Merge branch 'stable' into develop
2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0
Fix conversations view with no contacts
...
closes #6266
2015-07-29 12:08:35 +02:00
Steffen van Bergerem
6fafa731e6
Display locations on mobile devices
2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443
Display polls on mobile devices
2015-07-23 14:09:38 +02:00
Steffen van Bergerem
5fd89961c4
Use aria-labelledby for conversations
2015-07-22 13:02:16 +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
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
Jonne Haß
3d6ae08e84
Merge branch 'stable' into develop
2015-07-20 17:49:01 +02:00
Jonne Haß
c0a0f5e076
updated 24 locale files [ci skip]
2015-07-20 17:45:09 +02:00
Jonne Haß
3a4815996f
Merge branch 'stable' into develop
2015-07-17 20:21:19 +02:00
Rich**
48f5aed63e
Make default conversation subject translatable and properly capitalize it
...
closes #6206 , closes #6205
2015-07-17 20:20:00 +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
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ß
6b240199a8
Merge branch 'stable' into develop
2015-07-04 10:48:42 +02:00
Johan
1e0d81190b
updating es-VE locale
...
closes #6165
2015-07-04 10:48:35 +02:00
Steffen van Bergerem
049c8eb384
Bootstrap header rewrite
2015-06-20 00:38:40 +02:00
Steffen van Bergerem
078e7a722f
Merge branch 'stable' into develop
2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537
Add link to pod statistics in right navigation
...
closes #6117
2015-06-19 21:29:25 +02:00
fla
a7d88adde1
Improve services setting translation
2015-06-18 20:36:18 +02:00
Flaburgan
3e4b8500a4
Refactor Account settings page with bootstrap grid
2015-06-18 17:26:31 +02:00
fla
44a12e74b1
Improve mobile conversation design
2015-06-15 12:32:03 +02:00
Jonne Haß
1dee08843b
Merge branch 'stable' into develop
2015-06-14 17:42:00 +02:00
Jonne Haß
7052f2a63b
updated 12 locale files [ci skip]
2015-06-14 17:40:55 +02:00
Jonne Haß
38b32ca2c4
updated 73 locale files [ci skip]
2015-06-09 05:51:16 +02:00
Jonne Haß
aeeb6570d3
Merge branch 'stable' into develop
2015-06-08 13:52:53 +02:00
Jonne Haß
baafa9c51b
updated 73 locale files [ci skip]
2015-06-08 13:51:17 +02:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03:00
Steffen van Bergerem
676c0ab611
Add missing translation for lock account
2015-06-04 18:05:44 +02:00
Akash Agrawall
8c7aa38aba
Indicates in the setting that the email is not visibile to the other users #5315
2015-05-16 03:41:52 +02:00
goobertron
2668c487e7
Remove dupe line from en.yml [ci skip]
...
closes #5951
2015-05-12 14:20:03 +02:00
Steffen van Bergerem
40bb44eb96
Mobile: manage followed tags
...
closes #5945
2015-05-12 04:00:07 +02:00
Steffen van Bergerem
1428369849
Mobile: Add button to follow/unfollow tags
2015-05-10 01:59:50 +02:00
Steffen van Bergerem
06e6e1db78
Remove private post content of also commented mails
...
merges #5931
2015-05-07 04:10:21 +02:00
efstrian
63be9d57b6
Issue #5884 : Added link to diasporafoundation.org to invitation email (en)
2015-05-04 04:42:08 +02:00
Jonne Haß
8e2278b80d
Merge branch 'release/0.5.0.0-RC' into develop
2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2
updated 60 locale files [ci skip]
2015-05-03 15:43:35 +02:00
Benjamin Neff
84c3814b94
fix notification mails for limited posts
2015-04-22 19:59:08 +02:00
Jonne Haß
d959dd725b
Merge pull request #5850 from svbergerem/modal-for-new-aspect
...
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
Jonne Haß
85c376e591
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7
Update aspect edits text, reorder posting section
...
First iteration to update Help section
Changes from Fla
2015-04-19 15:57:21 +02:00
Jonne Haß
b3575ab56f
Merge branch 'release/0.5.0.0-RC' into develop
2015-04-14 15:42:33 +02:00
goobertron
a687a8dc01
Update help text for renaming an aspect
2015-04-14 15:40:58 +02:00
Steffen van Bergerem
895d38de21
Refactor available services settings
2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0
Use Bootstrap modal for new aspect form
2015-04-07 10:45:09 +02:00
Jonne Haß
4b841ef076
Merge pull request #5843 from margori/private_post_subject_content
...
Limited post content excluded from subject of comment email
2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c
Limited post content excluded from subject of comment email
2015-04-03 16:37:17 -03:00
