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
Dennis Schubert
828ae5994d
Merge branch 'stable' into develop
2015-06-09 05:49:34 +02:00
Dennis Schubert
1aa802c07c
Merge branch 'release/0.5.1.0-RC' into stable
2015-06-09 05:48:53 +02:00
Dennis Schubert
2837e58903
Remove listen note from the readme
...
this is not included in 0.5.1.0.
[ci skip]
2015-06-09 05:48:29 +02:00
Jonne Haß
72bb85eeba
Merge branch 'stable' into develop
2015-06-08 16:59:31 +02:00
Steffen van Bergerem
5516926b74
Update perfect-scrollbar
...
closes #6085
2015-06-08 16:59:27 +02:00
Dennis Schubert
a5eb7d5d1e
Merge branch 'stable' into develop
2015-06-08 04:33:30 +02:00
Dennis Schubert
b80785e06e
Update Changelog for the upcoming 0.5.2.0
2015-06-08 04:32:29 +02:00
Dennis Schubert
80db18805c
Merge branch 'stable' into develop
2015-06-08 04:26:43 +02:00
Dennis Schubert
ebd12430ea
Add note regarding production.server.listen changes
...
[ci skip]
2015-06-08 04:26:13 +02:00
Dennis Schubert
8a4ec1d4c6
Merge branch 'stable' into develop
2015-06-08 04:18:38 +02:00
Benjamin Neff
d42b5c128e
update photos when received over public path
...
closes #6082
2015-06-08 04:18:31 +02:00
Dennis Schubert
ad52eaf6d7
Merge branch 'stable' into develop
2015-06-08 04:09:57 +02:00
Benjamin Neff
97153ad08b
update tests for new twitter client
...
closes #6083
2015-06-08 04:08:46 +02:00
Dennis Schubert
0c6ca1d235
Merge branch 'stable' into develop
2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0
retry receive share-visibility when failed while receiving parallel
...
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126closes #6068
2015-06-08 00:58:00 +02:00
Dennis Schubert
e0420d733a
Merge branch 'stable' into develop
2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019
refactor: iterate over visiblities
...
closes #6060
2015-06-08 00:45:16 +02:00
Jonne Haß
1c834d49d8
Merge branch 'stable' into develop
2015-06-07 21:14:51 +02:00
Benjamin Neff
735d692ac0
fix selected week on weekly stats page
...
closes #6079
2015-06-07 21:14:47 +02:00
Jonne Haß
bb9a15ceac
Merge pull request #6033 from ATSE-TheBeginners/4297-color-themes
...
Issue #4297 : Color themes
2015-06-07 21:11:33 +02:00
Jonne Haß
7bfa0f857c
Merge branch 'stable' into develop
2015-06-06 15:23:44 +02:00
Jonne Haß
6c71d9f257
Only strip text direction markers around hashtags for now
...
Fixes #6067
2015-06-06 15:23:12 +02:00
Steffen van Bergerem
0a0c3f48f2
Merge pull request #6057 from AugierLe42e/drawer-fix
...
Fixed variable drawer width
2015-06-05 00:21:36 +02:00
Jonne Haß
432f99e001
Merge pull request #6055 from jhass/bootstrap3
...
Port to Bootstrap3 (rebased)
2015-06-04 19:40:55 +02:00
Dennis Schubert
b41007fae7
Merge branch 'stable' into develop
2015-06-04 04:18:34 +02:00
Benjamin Neff
27b4a44e4a
replace Rails.logger with logging-logger
...
closes #6041
2015-06-04 04:17:15 +02:00
Jonne Haß
3850118e4e
Merge branch 'stable' into develop
2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e
Set default for post title truncation to 70 characters
...
closes #6022
2015-06-02 12:14:35 +02:00
Dennis Schubert
0fdf624690
Merge branch 'stable' into develop
...
[ci skip]
2015-06-02 02:47:28 +02:00
Jason Robinson
d2e0b3ceae
Fix Facebook scopes for cross-posting
...
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).
closes #6019 [ci skip]
2015-06-02 02:47:20 +02:00
Dennis Schubert
ffc3cb711f
Merge branch 'stable' into develop
2015-06-02 02:35:21 +02:00
Benjamin Neff
b8a6af2742
add db migration to cleanup default avatar image-urls
...
closes #6014
2015-06-02 02:34:32 +02:00
Jonne Haß
b722a75a44
Merge branch 'stable' into develop
2015-06-02 00:44:56 +02:00
Benjamin Neff
a7fa3eabcb
Disable autocorrect/autocapitalize for the username
...
and cleanup the code so it follows the code guidelines
closes #5955
closes #6028
2015-06-02 00:44:47 +02:00
Dennis Schubert
70da822d69
Merge branch 'stable' into develop
2015-06-01 04:55:32 +02:00
Steffen van Bergerem
35e75b3c64
Atom feed: set post title length to 50 and use configured pod name in the feed title
...
closes #6020
2015-06-01 04:55:27 +02:00
Jonne Haß
c196ef11bb
Merge branch 'stable' into develop
2015-05-31 20:40:18 +02:00
theworldbright
45a5e3d1c5
Change markdown-content hr style #5987
...
The <hr> tag in the markdown-content was #eee,
and thus almost invisible. It has been changed to
$border-gray (currently #ddd) to be consistent
with the other <hr> tags.
Adjust markdown-content hr style further
The hr tag is now centered at 85% width. It also
adds a default vertical margin that is equivalent
to the 0.8em the paragraph tags provide.
Refactor scss for markdown-content hr
Closes #6016
2015-05-31 20:39:55 +02:00
Dennis Schubert
7401808e3f
Merge branch 'stable' into develop
2015-05-31 01:49:43 +02:00
Benjamin Neff
76ca4fdc70
use image_url for the logo in mails
...
closes #6013
2015-05-31 01:49:38 +02:00
Dennis Schubert
8c4bcd8bd3
Merge branch 'stable' into develop
2015-05-31 01:47:09 +02:00
Steffen van Bergerem
fdad348898
Fix tag rendering in emails
...
closes #6009
2015-05-31 01:47:05 +02:00
Dennis Schubert
b2dbdb3706
Merge branch 'stable' into develop
2015-05-30 03:08:30 +02:00
Jonne Haß
ac52cef546
Only return the current_users participation for post interactions
...
closes #6007
2015-05-30 03:08:25 +02:00
Dennis Schubert
807b4f72bd
Merge pull request #6003 from jhass/remove_db_hack
...
Replace DB environment variable with optional bundler groups
2015-05-30 03:04:33 +02:00
Jonne Haß
146f7eea52
Merge branch 'stable' into develop
2015-05-29 11:42:03 +02:00
Sandip Trivedi
b026a2afe8
Replaces facebox vendored asset with rails gem #5194
...
closes #6005
2015-05-29 11:41:57 +02:00
Jonne Haß
6581c580f8
Merge branch 'stable' into develop
2015-05-29 11:39:36 +02:00
