Pistos
b4c182b29a
Moved unused SVG files to a new graphics/ folder.
2011-11-04 09:29:29 -04:00
Pistos
db94689dfa
Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice.
2011-11-03 23:56:56 -04:00
Pistos
a6d27e2bb5
Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice."
...
This reverts commit 5c8ddc3ea6
2011-11-03 23:54:23 -04:00
Pistos
5c8ddc3ea6
Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice.
2011-11-03 23:44:46 -04: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
Maxwell Salzberg
98b093be11
ugh
2011-11-02 11:43:58 -07:00
Maxwell Salzberg
10575a8b78
this is getting dumb
2011-11-02 11:30:19 -07:00
Maxwell Salzberg
e9a5904ee6
try and fix it again
2011-11-02 11:25:10 -07:00
Maxwell Salzberg
3e20dcd3ba
another chance at fixing emails
2011-11-02 11:21:16 -07:00
Maxwell Salzberg
e505163334
fix message bus mailer problem
2011-11-02 10:51:08 -07:00
Ilya Zhitomirskiy
640733e3d3
fixed the photo index for person
2011-11-02 10:47:50 -07:00
Ilya Zhitomirskiy
22bf404344
saving instead of emailing retention stats
2011-11-02 10:15:40 -07:00
Pistos
0bb65e8718
Added extra spec to cover alleged bug case given in issue #2245 .
2011-11-02 09:23:05 -04:00
Pistos
3567423d98
Whitespace cleanup.
2011-11-02 09:22:49 -04:00
Pistos
db4bfb73a9
Fix issue #2213 : multi-underscore hashtags no longer get Markdown <em>phasis applied.
2011-11-01 23:35:34 -04:00
Pistos
e912bf3eda
Whitespace cleanup.
2011-11-01 23:35:21 -04:00
danielgrippi
a61fd16a77
fix publisher spec
2011-11-01 17:07:57 -07:00
danielgrippi
7ffeeb142b
don't ajax in the multi stream
2011-11-01 15:30:27 -07:00
Dan Hansen & Maxwell Salzberg
697ad1e84f
add new here to right section
2011-11-01 17:19:05 -05:00
danielgrippi
64c0591eac
added first_name to csv task
2011-11-01 14:20:37 -07:00
danielgrippi
9de67aaee8
added rake task for generating a CSV of top actives from cohorts
2011-11-01 13:46:06 -07:00
Daniel Grippi
bfb4ac4bb4
Merge pull request #2296 from Pistos/issue-2264-fix-tag-parsing
...
Issue 2264 fix tag parsing
2011-10-31 22:43:28 -07:00
Pistos
b3853f48ed
Way more test coverage for Taggable.format_tags .
2011-11-01 01:27:36 -04:00
Pistos
73c79bdc0d
Make Taggable.format_tags more readable.
2011-11-01 00:41:56 -04:00
Pistos
24702b9f6a
Add many more hashtag regexp specs for Taggable#tag_strings . Make them pass.
2011-11-01 00:28:04 -04:00
