Jonne Haß
802656030f
bump hashie
2013-06-11 23:17:08 +02:00
Jonne Haß
8bd78493a9
bump ffi
2013-06-11 23:17:08 +02:00
Jonne Haß
06ca713d38
bump uglifier
2013-06-11 23:17:08 +02:00
Jonne Haß
c1635b34d6
bump slim
2013-06-11 23:17:08 +02:00
Jonne Haß
5859ceb5ea
bump rspec-rails
2013-06-11 23:17:08 +02:00
Jonne Haß
d3953720a8
bump rails_admin
2013-06-11 23:17:08 +02:00
Jonne Haß
d9b63b26ea
bump mini_magick
2013-06-11 23:17:07 +02:00
Jonne Haß
061bca7ca5
bump haml
2013-06-11 22:49:35 +02:00
Jonne Haß
858f447512
bump guard
2013-06-11 22:49:35 +02:00
Jonne Haß
fc3da627fb
bump fog
2013-06-11 22:49:32 +02:00
Jonne Haß
0a127a9076
bump database_cleaner
2013-06-11 22:15:45 +02:00
Jonne Haß
3bdb078dfc
bump cucumber
2013-06-11 22:15:45 +02:00
Jonne Haß
6467ee1962
bump acts-as-taggable-on
2013-06-11 22:15:45 +02:00
Florian Staudacher
fd2917271c
it appears autoload in production doesn't pick up the new
...
"Diaspora::Mentionable" module
2013-06-10 13:57:49 +02:00
Jonne Haß
32146fa660
Merge pull request #4161 from Raven24/issue_4160
...
evil mentions
2013-06-09 11:08:20 -07:00
Florian Staudacher
4ee5d5f19c
replace mentions of out-of-aspect people in limited posts with just a
...
markdown link to their profile (fixes #2516 )
add failing spec for #4160 / #2516
extend the spec a bit more
refactor mention handling in a status message
add method for filtering mentions by aspects
wire mention filtering into the status message model, adapt a few tests to
work properly
cosmetic changes
shorten helper methods
add changelog entry
2013-06-09 19:16:40 +02:00
Jonne Haß
3231133b60
Merge pull request #4195 from svbergerem/3999-no-hovercard-for-current-user
...
Don't show hovercards for current user in comments
2013-06-09 04:16:40 -07:00
Steffen van Bergerem
bcd43cbfee
Don't show hovercards for current user in comments
2013-06-09 12:31:18 +02:00
Jonne Haß
c60738654c
Merge pull request #4187 from jaywink/2758-twitter-crossposting
...
Fix Twitter crossposting by correctly calculating URL shortening
2013-06-08 12:20:14 -07:00
Jason Robinson
3fa9f6414d
Fix Twitter crossposting ( #2758 ). Refactor some service posting related code.
2013-06-08 17:38:07 +03:00
Jonne Haß
a561544905
Merge pull request #4203 from svbergerem/hovercard-medium-avatar
...
show medium avatar in hovercard
2013-06-07 05:12:12 -07:00
Steffen van Bergerem
17876d1de6
show medium avatar in hovercard
2013-06-07 11:23:28 +02:00
Florian Staudacher
653f7566df
fix failing conversations cuke
2013-06-05 01:07:05 +02:00
Jonne Haß
9cbfee9408
bump configurate
2013-06-04 22:58:20 +02:00
Florian Staudacher
f694a40992
use tooltip plugin to display the name under the avatar
...
(temporary solution until the proposed solution from the
[pull request](https://github.com/diaspora/diaspora/pull/4149 ) is
implemented)
2013-06-04 17:14:00 +02:00
Florian Staudacher
c2a9cb55ef
Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview
2013-06-04 17:12:38 +02:00
Florian Staudacher
b7b4edeeb0
Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897
2013-06-04 16:43:16 +02:00
Florian Staudacher
bcb1214f99
Merge pull request #4162 from MrZYX/typhoeus
...
bump Typhoeus and refactor HydraWrapper
2013-06-04 03:36:39 -07:00
Jonne Haß
5760f177ea
fix stupid heredoc usage in script/server
2013-06-02 20:25:10 +02:00
Juan Azambuja
3f3fe3ecc7
Add participants preview con conversations
2013-06-01 12:14:16 -03:00
Jonne Haß
619ffa9d74
Merge pull request #4191 from svbergerem/4185-BackToTop-other-streams
...
Add back-to-top button on tag and user pages
2013-05-31 04:56:06 -07:00
Steffen van Bergerem
272cf60788
Add back-to-top button on tag and user pages
2013-05-31 02:02:14 +02:00
Florian Staudacher
608a316bdd
remove ["a", "b", "C"] from the void of nothingness [wtf]
2013-05-30 17:24:49 +02:00
Jonne Haß
fc9229430c
Merge pull request #4186 from marpo60/fix_issue_4180_deletelabel_after_sprites
...
Fix icons-deletelabel styles
2013-05-30 08:00:03 -07:00
Juan Azambuja
e59066bd66
Fix icons-deletelabel styles
2013-05-27 10:25:04 -03:00
Aruna Herath
7803df5ecd
Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter
...
Fixes reopened #3897
2013-05-27 17:08:39 +05:30
Liane Nakamura
5f25a52676
Fix post iframe src url
...
Add test for posts helper
2013-05-26 20:49:56 +02:00
Jonne Haß
cae70d8194
Merge pull request #4133 from diaspora/fix_tags_ordering
...
Fix tags ordering in chrome
2013-05-25 11:55:53 -07:00
Fabián Rodríguez
aed81c1b3b
Fix tags ordering in chrome
2013-05-25 15:44:53 -03:00
Jonne Haß
3b03a7cdde
strip trailing newlines from stripped markdown
2013-05-25 15:55:20 +02:00
Jonne Haß
234ebdb2e9
bump redcarpet, should fix #4104
2013-05-25 15:21:17 +02:00
Jonne Haß
d331242d94
Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop
...
Conflicts:
Changelog.md
2013-05-25 13:50:28 +02:00
Jonne Haß
272f405ab7
Merge pull request #4177 from svbergerem/4157-post-preview-tag-page
...
Fix #4157 : post preview from tag pages
2013-05-25 04:46:58 -07:00
Jonne Haß
009209d939
bump Typhoeus and refactor HydraWrapper
2013-05-25 13:45:37 +02:00
Jonne Haß
f2f7800b30
drop fallback donation form
2013-05-25 13:37:17 +02:00
Steffen van Bergerem
7f596cfd36
Fix #4157 : post preview from tag pages
2013-05-25 12:39:01 +02:00
Dennis Schubert
cdb4be14ce
Merge branch 'hotfix/v0.1.0.1' into develop
2013-05-20 21:29:17 +02:00
Dennis Schubert
1661615fe6
Changelog and version number for the hotfix
2013-05-20 21:28:10 +02:00
Jonne Haß
286e948054
federate location
2013-05-20 21:26:04 +02:00
Dennis Schubert
e33f4e68a8
Fix 500 caused by deleted reshares
2013-05-20 21:25:58 +02:00
