Fabián Rodríguez
|
8c6b539224
|
update changelog
|
2013-01-29 10:02:46 -02:00 |
|
Fabián Rodríguez
|
8b4aab0780
|
change #count to #size in notifications_helper to reduce queries
|
2013-01-29 10:01:09 -02:00 |
|
Fabián Rodríguez
|
d4d3bf8af6
|
fix translation in contacts_helper
|
2013-01-29 10:01:08 -02:00 |
|
Fabián Rodríguez
|
649844ea6a
|
Refactor contacts/index
|
2013-01-29 10:01:08 -02:00 |
|
Jonne Haß
|
099b4063d2
|
Merge pull request #3932 from marpo60/improve-tags-query
don't join the tags table here, it makes the query slower
|
2013-01-29 03:56:49 -08:00 |
|
Jonne Haß
|
6ded1238c7
|
bump configurate
|
2013-01-29 12:54:35 +01:00 |
|
Fabián Rodríguez
|
130e4cfbd2
|
update changelog
|
2013-01-28 19:24:27 -02:00 |
|
Fabián Rodríguez
|
4fa04e88ac
|
don't join the tags table here, it makes the query slower
|
2013-01-28 18:57:26 -02:00 |
|
Jonne Haß
|
74613b0b15
|
Merge branch 'hotfix/0.0.2.3' into develop
Conflicts:
Changelog.md
Gemfile.lock
|
2013-01-28 20:41:25 +01:00 |
|
Jonne Haß
|
8a8ee42ebc
|
Update Devise to 2.1.3
http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
|
2013-01-28 20:38:30 +01:00 |
|
Jonne Haß
|
6653684f64
|
Merge pull request #3920 from asphxia/3906-left-side-panel-ui-changes
Side panel ui changes
|
2013-01-27 08:24:47 -08:00 |
|
Jonne Haß
|
dc2d403ae1
|
Merge pull request #3930 from divout/feature/2339-rtl-usernames
fix #2339: set unicode-bidi property to prevent username to overlay the pubdate [ci skip]
|
2013-01-27 05:39:33 -08:00 |
|
Ivan K
|
549aa29cf1
|
fix #2339: set unicode-bidi property to prevent username to overlay the pubdate
|
2013-01-27 18:49:42 +06:00 |
|
Asphyxia
|
6ee921235e
|
Side panel ui changes
|
2013-01-27 08:04:33 -03:00 |
|
fhsdi2
|
931e4c4f41
|
Fix uncapitalization of a word
|
2013-01-26 16:09:34 -02:00 |
|
Jonne Haß
|
b654fb2d02
|
one unicorn worker should be enough for development
|
2013-01-26 13:28:40 +01:00 |
|
Jonne Haß
|
946121f672
|
Merge pull request #3827 from diasp/feature/1338-links-sidebar
Show links in sidebar #1338
|
2013-01-26 04:09:22 -08:00 |
|
Jonne Haß
|
8944d5668f
|
Merge pull request #3818 from diasp/feature/3793-scaled-full-images
#3793 resize full scaled image to a specific width
|
2013-01-26 04:04:04 -08:00 |
|
Diaspora Europe
|
6d4e577676
|
show links in sidebar #1338
|
2013-01-26 11:59:15 +01:00 |
|
Diaspora Europe
|
e8d86f09bb
|
resize full scaled image to a specific width #3793
|
2013-01-26 11:36:01 +01:00 |
|
Jonne Haß
|
d5de50c255
|
Merge pull request #3861 from movilla/user-controls
Excesive padding "user-controls" in single post view - Only 0.0.3.0 -
|
2013-01-25 08:51:13 -08:00 |
|
movilla
|
5d3e9f5c3d
|
Excesive padding with "user-controls" in single post view
|
2013-01-25 17:34:23 +01:00 |
|
Jonne Haß
|
cb640b91b3
|
Merge pull request #3880 from Ruxton/feature/oembed_providers
Oembed Update - Added instagram, better display for rich/photo
|
2013-01-25 07:50:24 -08:00 |
|
Ruxton
|
e8decc200e
|
Adding jasmine coverage for oEmbed updates
|
2013-01-25 23:47:49 +08:00 |
|
Ruxton
|
60024d7e20
|
Someone isn't a StarWars fan.
|
2013-01-25 22:43:56 +08:00 |
|
Ruxton
|
40fdf3819b
|
Added DailyMotion & Twitter oEmbeds
|
2013-01-25 22:31:44 +08:00 |
|
Jonne Haß
|
aadbd95215
|
Markerb got a release so we can get rid of another gem pulled from git \o/
|
2013-01-25 13:26:19 +01:00 |
|
Jonne Haß
|
ed2258a294
|
Merge pull request #3849 from asphxia/feature/3806-overflow-comment-textarea
Issue #3806: Overflow comment textarea
|
2013-01-25 03:24:34 -08:00 |
|
Jonne Haß
|
49cabca34b
|
Merge pull request #3884 from malavbhavsar/develop
Fix services index view
|
2013-01-25 03:22:18 -08:00 |
|
malavbhavsar
|
4629afb1f5
|
Fix services index view.
|
2013-01-24 23:00:53 -05:00 |
|
Asphyxia
|
f2c67b0d8a
|
Overflow comment textarea
|
2013-01-24 22:52:14 -03:00 |
|
Ruxton
|
89042078ca
|
Oembed Update - Added instagram, better display for rich/photo
|
2013-01-22 22:37:36 +08:00 |
|
Jonne Haß
|
31849e1442
|
Merge pull request #3878 from asphxia/3874-distorted-profile-image
Issue #3874: Distorted profile thumbnail
|
2013-01-22 02:09:48 -08:00 |
|
Asphyxia
|
7f34c7af7a
|
Issue #3874: Distorted profile thumbnail
|
2013-01-21 22:43:48 -03:00 |
|
Jonne Haß
|
bbaa94f3a5
|
Merge pull request #3835 from asphxia/3828-unify-tooltip-format-streams
streamline / unify "hide" and "ignore" option
|
2013-01-18 11:14:50 -08:00 |
|
Asphyxia
|
1af0f4bf2d
|
Issue #3828: Unify hide and ignore options
|
2013-01-18 16:08:02 -03:00 |
|
Jonne Haß
|
9ff9364cae
|
Merge pull request #3858 from asphxia/feature/3851-profile-pictures-not-centered
Issue #3851: Profile pictures not centered
|
2013-01-18 10:55:05 -08:00 |
|
Asphyxia
|
d6a9818632
|
Issue #3851: Profile pictures not centered
|
2013-01-18 15:51:59 -03:00 |
|
Jonne Haß
|
2708198a89
|
Merge pull request #3848 from asphxia/feature/3846-wrong-message-on-mobile
Issue #3846: Wrong message on mobile
|
2013-01-18 10:42:36 -08:00 |
|
Asphyxia
|
5a6090a0fb
|
Issue #3846: Wrong message on mobile
|
2013-01-18 15:40:00 -03:00 |
|
Jonne Haß
|
3a3a56b539
|
Merge pull request #3860 from asphxia/feature/3840-extra-blank-on-streams
Issue #3840: Fix extra blank on streams
|
2013-01-18 10:29:41 -08:00 |
|
Asphyxia
|
284c40b4da
|
Issue #3840: Fix extra blank on streams
|
2013-01-18 15:25:01 -03:00 |
|
Jonne Haß
|
8d72447d47
|
Merge pull request #3832 from asphxia/logged-out-user-streams-options
Logged out user streams options
|
2013-01-18 10:12:13 -08:00 |
|
Asphyxia
|
c0dd888e61
|
Issue #3832: Logged-out users stream options
|
2013-01-18 15:10:13 -03:00 |
|
Jonne Haß
|
86e0addd62
|
Merge pull request #3725 from diaspora/update_gems
Update gems
|
2013-01-17 04:22:15 -08:00 |
|
Jonne Haß
|
d6bc226e27
|
update changelog for gem changes
|
2013-01-17 13:19:50 +01:00 |
|
Jonne Haß
|
cf01b33b5f
|
bump will_paginate
|
2013-01-17 02:00:20 +01:00 |
|
Jonne Haß
|
ac2fa74ac8
|
bump foreman
|
2013-01-17 02:00:20 +01:00 |
|
Jonne Haß
|
3023fbdee3
|
bump ffi
|
2013-01-17 02:00:20 +01:00 |
|
Jonne Haß
|
fe7a49226c
|
bump asset_sync
|
2013-01-17 02:00:20 +01:00 |
|