Maxwell Salzberg
2c12b94e67
dont ban diasporahq stuff
2011-11-04 19:08:08 -07:00
Maxwell Salzberg
7417801886
Merge branch 'participants'
2011-11-04 18:46:58 -07:00
Maxwell Salzberg
b7d0ec7564
fix spelling and update job to use less obtrusive query
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
c3dc3d103b
include post author in participats
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
95c206df24
MS DG add participants
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
dfd1286521
dry up multi stream
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
abd211ba72
dry up multi stream
2011-11-04 18:45:51 -07:00
Maxwell Salzberg
5baaa6dae2
fix update public_tag_stream
2011-11-04 18:45:20 -07:00
Ilya Zhitomirskiy
41db42a7a4
displaying public tags in the multi stream
2011-11-04 18:14:34 -07:00
Maxwell Salzberg
016032cf95
do not pull back all tag ids; way to go maxwell :(
2011-11-04 16:54:34 -07:00
danielgrippi
39b6abaa88
do includes before last(3), as last() returns an array, not an AR object
2011-11-04 16:46:30 -07:00
Dan Hansen & Maxwell Salzberg
3cfa0c4602
use the stream element partials for testing the StreamElement widget instead of Aspects#index
2011-11-04 18:40:24 -05:00
danielgrippi
3296477531
eager load author and profile for comments
2011-11-04 16:40:14 -07:00
Ilya Zhitomirskiy
f3183a11e1
message explaining that we're populating things in the background
2011-11-04 16:20:51 -07:00
Maxwell Salzberg
2d4e6e4915
forgot to uncomment a line
2011-11-04 16:04:37 -07:00
Maxwell Salzberg
745e4dea8c
queue facebook lookup job, dont do it in process
2011-11-04 16:02:17 -07:00
Maxwell Salzberg
7784156e3b
retry less
2011-11-04 15:11:16 -07:00
Ilya Zhitomirskiy
ecd2a52553
added a password field before account closure
2011-11-04 10:25:19 -07:00
Maxwell Salzberg
9bdde0d9af
another hack
2011-11-04 00:49:30 -07:00
Maxwell Salzberg
91d940376f
small hack untill we can figure out more batching
2011-11-04 00:46:44 -07:00
Ilya Zhitomirskiy
ce199e770d
dk iz querying by id in status message tag_stream
2011-11-03 22:20:06 -07:00
Sarah Mei
f9a9654c86
Allow non-logged-in users to see public photos
2011-11-03 22:07:48 -07:00
danielgrippi
9ef0fbfe60
DG MS; fix last failing spec
2011-11-03 21:08:32 -07:00
danielgrippi
acf6936d7c
fix specs in contact
2011-11-03 20:48:02 -07:00
danielgrippi
bb19531195
require newrelic_rpm if newrelic is configured
2011-11-03 18:06:32 -07:00
Maxwell Salzberg
ff36b84df5
dont double query a slow query
2011-11-03 17:46:58 -07:00
Jonne Hass
b4e974161b
updated 135 locale files [ci skip]
2011-11-03 23:10:07 +01:00
danielgrippi
dca370d3ff
ignore publicscontroller in newrelic
2011-11-03 14:45:46 -07:00
danielgrippi
10ce4426a9
Merge branch 'block-user'
2011-11-03 12:31:32 -07:00
danielgrippi
b56dc9205b
added ignore text on user pages if it applies
2011-11-03 12:31:25 -07:00
danielgrippi
0ab23f337a
fixed all cukes; view bugs on streams
2011-11-03 12:31:24 -07:00
danielgrippi
1ac5c7af62
fixed some cukes
2011-11-03 12:31:24 -07:00
danielgrippi
07f713f46c
change 'mute' to 'ignore' for now; fix specs; repopulate cache upon
...
contact removal
2011-11-03 12:31:24 -07:00
danielgrippi
5df6bc1adf
block user now removes a contact if user is blocking a contact
2011-11-03 12:31:24 -07:00
danielgrippi
ee5bc25faf
DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself
2011-11-03 12:31:24 -07:00
danielgrippi
ae7944418c
DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams
2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
5b8365118d
Stream#posts no longer needs to call for_a_stream
...
exclude blocked users from all streams
2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
0eb33b371b
blocked users works for multi stream, cuke passes
...
fixed scoping stuff
2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9
wip
2011-11-03 12:31:24 -07:00
Raphael Sofaer
609894fb70
Fix personalized, closing #2308 . Thanks Pistos.
2011-11-03 15:20:58 -04:00
Daniel Grippi
debf382fac
Merge pull request #2306 from Pistos/issue-2298-following-dot-tags
...
Issue 2298 following dot tags
2011-11-02 21:29:48 -07:00
Pistos
78a96a18e4
This fixes issue #2298 .
...
Following a hashtag with a dot now no longer breaks the user's stream page.
All unacceptable hashtag chars are stripped out, and the given tag is
normalized before being followed.
2011-11-02 23:51:12 -04:00
Jonne Hass
3bbc34600b
rescue ArgumentError in websocket server for now to keep it running
2011-11-03 01:51:48 +01:00
Pistos
e885e8492f
Refactor / shuffle code in TagFollowingsController spec.
2011-11-02 20:46:04 -04:00
Jonne Hass
c4a4516369
hm why do we update gems so rarely? Lets do it for em-websocket
2011-11-03 01:08:53 +01:00
Jonne Hass
d0d31a6f78
updated 98 locale files [ci skip]
2011-11-02 23:07:52 +01:00
danielgrippi
995996add1
add spec & change syntax in http_multi
2011-11-02 15:00:30 -07:00
Daniel Grippi
ed029b2fbd
Merge pull request #2251 from manuels/retry_federations
...
Retry federation if remote pod is down
2011-11-02 14:09:30 -07:00
Daniel Grippi
73d3bf46b3
Merge pull request #2300 from Pistos/issue-2213-hashtag-markdown-em-collision
...
Issue 2213 hashtag markdown em collision
2011-11-02 13:23:55 -07:00
Maxwell Salzberg
6df5904e13
stop the catastrophic from happening"
2011-11-02 11:59:55 -07:00
