David Thompson
b3c859bcd5
Check for nil before splitting contact_ids param.
2013-06-15 17:14:30 -04:00
Jonne Haß
ed36786edc
Merge pull request #4217 from svbergerem/4041-loading-indicator
...
Add loading indicator on tag pages, remove second one from profile page
Conflicts:
Changelog.md
2013-06-14 18:23:39 +02:00
Jonne Haß
69db16ab34
Merge pull request #4221 from svbergerem/4123-fix-login-short-password
...
Fix login for short passwords
2013-06-14 09:21:43 -07:00
Jonne Haß
d475a7d935
Merge pull request #4222 from rivendale2010/patch-1
...
Update robots.txt comments
2013-06-14 09:21:08 -07:00
rivendale
9aaf7ed422
Update robots.txt comments
...
clarify comments and update permanently moved URL
2013-06-14 12:58:02 -03:00
Jonne Haß
c6d2c714e9
never pass nil to image_tag
...
In production that results in a not precompiled error
2013-06-14 14:47:54 +02:00
Steffen van Bergerem
4cbab628c9
Fix login for short passwords
2013-06-14 12:02:44 +02:00
Steffen van Bergerem
a8ade65e1a
Add loading indicator on tag pages, remove the second one from the profile page
2013-06-14 01:25:36 +02:00
Jonne Haß
6948462f66
fix changelog [ci skip]
2013-06-13 21:46:32 +02:00
Jonne Haß
c6d158bd81
move asset_sync require to the earliest point possible
2013-06-13 20:57:38 +02:00
Jonne Haß
dfef6ee598
Do not load environment when precompiling assets
2013-06-13 20:57:10 +02:00
Sean Tilley
ea743b4b55
Updated Wiki sources in README
2013-06-12 22:26:16 -05:00
Jonne Haß
aaa8a44611
Merge pull request #4216 from svbergerem/4196-remove-alpha-branding
...
Remove alpha branding
2013-06-12 14:35:12 -07:00
Steffen van Bergerem
21ef1c8e41
Remove alpha branding
2013-06-12 23:08:13 +02:00
Jonne Haß
c7909a39cb
add gem updates to changelog [ci skip]
2013-06-12 20:40:15 +02:00
Jonne Haß
37e59facad
Merge pull request #4213 from svbergerem/3828-unify-hide-ignore
...
unify ignore and hide #bugmash #monday
2013-06-12 07:49:00 -07:00
Jonne Haß
b8db623aa4
update reference to postgres? in the migrations too
2013-06-12 16:44:19 +02:00
Steffen van Bergerem
a02fdc6e45
unify ignore and hide #bugmash #monday
2013-06-12 14:11:06 +02:00
Jonne Haß
d07073cf8e
Merge pull request #4179 from diaspora/update_gems
...
Update gems
2013-06-11 15:51:41 -07:00
Jonne Haß
339dba1aeb
bump crack
2013-06-12 00:23:47 +02:00
Jonne Haß
6720f6b3f7
bump fuubar
2013-06-12 00:23:47 +02:00
Jonne Haß
178b92d8ad
bump rack-cors
2013-06-12 00:23:47 +02:00
Jonne Haß
7323c9c0fc
bump twitter
2013-06-11 23:17:08 +02:00
Jonne Haß
0786a3d6b7
bump mobile-fu
2013-06-11 23:17:08 +02:00
Jonne Haß
b2b16ee3ab
bump gon
2013-06-11 23:17:08 +02:00
Jonne Haß
d3fe58407c
bump json
2013-06-11 23:17:08 +02:00
Jonne Haß
31b3100141
bump redis-namespace
2013-06-11 23:17:08 +02:00
Jonne Haß
5841793d78
bump raindrops
2013-06-11 23:17:08 +02:00
Jonne Haß
277f07d41b
bump rails_autolink
2013-06-11 23:17:08 +02:00
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
