Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Jonne Haß
e39d024ba1
Merge branch 'stable' into develop
2015-06-04 11:31:43 +02:00
Jonne Haß
bb24b8bedb
bump BUNDLED WITH [ci skip]
...
See https://github.com/bundler/bundler/issues/3697
2015-06-04 11:27:37 +02:00
Jonne Haß
f9ce41bae4
bump fixture_builder
2015-06-04 10:58:01 +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
Benjamin Neff
b6c46b3fc4
add logging mixin and replace federation-logger
2015-06-04 04:16:03 +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
Benjamin Neff
03dbb75dd5
don't save default avatars to the database
2015-06-02 02:32:01 +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
Dennis Schubert
ee890310d3
Merge branch 'stable' into develop
2015-06-01 04:44:49 +02:00
Jonne Haß
ea63343b69
bump oauth related dependencies
...
closes #5924
2015-06-01 04:44:45 +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
Jonne Haß
b2faf20d18
Merge branch 'stable' into develop
2015-05-31 15:49:54 +02:00
Jonne Haß
59bbbeba14
update bundled with to 1.10.2 for now [ci skip]
...
See https://github.com/bundler/bundler/issues/3697
2015-05-31 15:48:42 +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
Benjamin Neff
604ffb445a
optimized sprites
...
- move mobile icons to mobile-folder, so they aren't included in the
icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
big other branding-images
- delete duplicate images
closes #6004
2015-05-29 11:39:30 +02:00
Benjamin Neff
247e9efe49
remove unused branding images
2015-05-29 11:39:01 +02:00
Benjamin Neff
bd8888291d
remove more old assets
2015-05-29 11:39:01 +02:00
Benjamin Neff
a22be8a4cb
remove unused social media logos and add attribution
2015-05-29 11:39:01 +02:00
Benjamin Neff
36b1568d32
remove old unused icons (mostly replaced by entypo)
2015-05-29 11:39:00 +02:00
Jonne Haß
c85fe3872e
Replace DB environment variable with optional bundler groups
...
See the changes to the changelog for more details
2015-05-29 01:33:12 +02:00
Jonne Haß
351f54d74f
Merge branch 'stable' into develop
2015-05-28 11:24:34 +02:00
Sandip Trivedi
36d6c5d2ba
Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
...
closes #6001
2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c
Replaces the zipzip gem with the rubyzip gem
2015-05-28 11:23:57 +02:00
Dennis Schubert
44919233c0
Merge branch 'stable' into develop
2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658
handle when the diaspora xml parser returns nil
...
closes #5991
2015-05-28 01:34:24 +02:00
Dennis Schubert
04df6c115d
Merge branch 'stable' into develop
2015-05-28 01:28:19 +02:00
Steffen van Bergerem
6206bb9920
Update markdown-it-hashtag
...
closes #5998
2015-05-28 01:28:15 +02:00
Dennis Schubert
d34878df55
Merge branch 'stable' into develop
2015-05-28 01:26:53 +02:00
Benjamin Neff
5655eead7c
make the logrotation configurable
...
closes #5994
2015-05-28 01:26:48 +02:00
Dennis Schubert
8c408a57ae
Merge branch 'stable' into develop
2015-05-26 05:25:43 +02:00
