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
Benjamin Neff
804784ed3f
fix @pod_uri/@pod_url and add url_to to AppConfig
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
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
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
Jonne Haß
18c1dcc26a
Merge branch 'stable' into develop
2015-07-09 09:02:11 +02:00
Benjamin Neff
2df4a1cc5c
add logfile-appender in test environment
...
closes #6175
2015-07-09 09:02:04 +02: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
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +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
fap
073f028f88
Adds welcome message options to config
2015-06-21 20:48:20 +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
Steffen van Bergerem
b3a5e92eca
Remove all faceboxes
2015-06-15 14:09:24 +02:00
Jonne Haß
8a6706337a
Merge branch 'stable' into develop
2015-06-15 13:47:01 +02:00
Benjamin Neff
beb06bc42d
precompile images from facebox gem
...
regression from #6005
closes #6105
2015-06-15 13:46:07 +02:00
fla
44a12e74b1
Improve mobile conversation design
2015-06-15 12:32:03 +02:00
Jonne Haß
15aa40631e
Merge pull request #6104 from svbergerem/jquery-autosize
...
Replace jquery.autoresize with autosize
2015-06-14 22:20:35 +02:00
Steffen van Bergerem
92a3dd53f0
Replace jquery.autoresize with autosize
2015-06-14 20:03:15 +02:00
Jonne Haß
1dee08843b
Merge branch 'stable' into develop
2015-06-14 17:42:00 +02:00
Jonne Haß
5a63d201a3
Merge branch 'release/0.5.1.0-RC' into stable
2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b
updated 12 locale files [ci skip]
2015-06-14 17:40:55 +02:00
Jonne Haß
1be1bec9c9
Merge branch 'stable' into develop
2015-06-09 22:55:23 +02:00
Benjamin Neff
ce380d78c9
make sql and federation debug-logging configurable
...
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.
closes #6090
2015-06-09 22:55:16 +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ß
dd1cea9665
Merge branch 'release/0.5.0.0-RC' into stable
2015-06-08 13:52:42 +02:00
Jonne Haß
baafa9c51b
updated 73 locale files [ci skip]
2015-06-08 13:51:17 +02:00
Dennis Schubert
b80785e06e
Update Changelog for the upcoming 0.5.2.0
2015-06-08 04:32:29 +02:00
Dennis Schubert
ad52eaf6d7
Merge branch 'stable' into develop
2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69
upgrade Twitter gem - fixes Faraday deprecation warning
2015-06-08 04:08:02 +02:00
efstrian
69c3a4100d
Issue #4297 : Color themes can override bootstrap variables
2015-06-07 19:58:54 +03:00
efstrian
d64ea15891
Issue #4297 : Style fixes - Default theme is configurable
2015-06-07 19:58:14 +03:00
dimana
31d760867c
Issue #4297 : Updated color themes and testing
2015-06-07 19:57:37 +03:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03:00
Jonne Haß
63554e222d
Fix production override for listen setting
2015-06-04 22:03:07 +02:00
Steffen van Bergerem
676c0ab611
Add missing translation for lock account
2015-06-04 18:05:44 +02:00
Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Dennis Schubert
b41007fae7
Merge branch 'stable' into develop
2015-06-04 04:18:34 +02:00
