Pistos
39f876824a
Specify a fixture path relative to Rails.root to appease the Travis.
2011-11-07 00:32:18 -05:00
Pistos
02fa065571
Whitespace cleanup.
2011-11-07 00:32:17 -05:00
Sarah Mei
f1d669a024
Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those.
2011-11-06 21:29:22 -08:00
Sarah Mei
0fc43b580b
Remove some empty files. If you're gonna scaffold, plz remove empty files before committing kkthx.
2011-11-06 20:27:36 -08:00
Sarah Mei
dbc68e69b7
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-06 20:20:36 -08:00
Sarah Mei
4fba9a6989
get rid of all pending specs except the one that is actually pending
2011-11-06 20:20:27 -08:00
Pistos
14842c1b43
Merge remote-tracking branch 'johnedmonds/issue1144'
2011-11-06 22:21:53 -05:00
Sarah Mei
53dbbfbb15
Fix order-dependent test that would sometimes fail on postgres
2011-11-06 19:10:26 -08:00
Sarah Mei
db223b2a3f
Rename and make pending the spec for populating the cache
2011-11-06 12:52:01 -08:00
Jonne Hass
af1558831b
Improved reshare receive
...
- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times
2011-11-06 18:26:10 +01:00
Jonne Hass
9ffeef9d20
Merge branch 'new_user_language' of https://github.com/alda519/diaspora
2011-11-06 15:17:05 +01:00
Jonne Hass
7556dccb91
test that photosController#index succeeds without any photos
2011-11-06 14:47:28 +01:00
Sarah Mei
c30e3ee362
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-05 19:58:25 -07:00
Sarah Mei
2143e0f9ba
Refactor regular expression used to find tags so that it supports unicode in both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN.
2011-11-05 19:57:51 -07:00
danielgrippi
c9f069d000
Revert "add participant_users to conversations"
...
This reverts commit 655558cb95f85a047f6fcde12ec232a552fc80c02c12b94e677417801886abd211ba72
2011-11-05 18:08:32 -07:00
Sarah Mei
3e70398c40
Run ostatus builder spec that sometimes causes nokogiri to segfault
2011-11-05 16:06:27 -07:00
Sarah Mei
92c28857b3
Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory.
2011-11-05 16:05:13 -07:00
Sarah Mei
1ecdba9bae
Fix facebook spec
2011-11-04 22:22:39 -07:00
Sarah Mei
0b329bf385
Fix notify local users spec
2011-11-04 22:16:55 -07:00
Sarah Mei
d17ecd6101
Fix user controller spec
2011-11-04 22:06:56 -07:00
Maxwell Salzberg
f85a047f6f
MS DG; for real this time?
2011-11-04 19:56:53 -07:00
Maxwell Salzberg
a552fc80c0
fix small commenting email bug #oops
2011-11-04 19:24:48 -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
Ilya Zhitomirskiy
41db42a7a4
displaying public tags in the multi stream
2011-11-04 18:14:34 -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
Ilya Zhitomirskiy
ecd2a52553
added a password field before account closure
2011-11-04 10:25:19 -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
b56dc9205b
added ignore text on user pages if it applies
2011-11-03 12:31:25 -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
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
Pistos
e885e8492f
Refactor / shuffle code in TagFollowingsController spec.
2011-11-02 20:46:04 -04: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
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
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
