Daniel Grippi
0d41c9c5f3
update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner)
2011-12-05 19:53:03 -08:00
Gonzalo Rodriguez
3c74f3d848
Failing spec for empty search bug #2427
2011-12-03 21:19:58 -02:00
Johannes Hackel
4b25545e82
fix sql error
2011-12-02 15:03:15 +01:00
Sarah Mei
4db288bc65
Check order of generation and use of host-meta fixture on travis
2011-11-30 20:55:59 -08:00
Sarah Mei
2518987538
Try doing join differently for travis
2011-11-30 20:23:48 -08:00
Pistos
aa0aaa2f92
Revert "Merge pull request #2428 from geckoxx/comment_stream"
...
This reverts commit 8a27568273 , reversing
changes made to 31ef2d60f7 .
Conflicts:
app/helpers/stream_helper.rb
app/views/aspects/index.html.haml
config/locales/diaspora/en.yml
config/routes.rb
spec/lib/stream/comments_spec.rb
2011-11-30 22:22:32 -05:00
Daniel Grippi
cec1f09202
specs green
2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd
Merge pull request #2426 from geckoxx/like_stream
...
Like stream
2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61
Merge pull request #2433 from geckoxx/2274-empty-tag
...
Fix Bug 2274, empty tag
2011-11-30 09:07:30 -08:00
Johannes Hackel
23fa7a0a3e
like stream new
2011-11-29 17:27:09 +01:00
danielgrippi
09d8726555
fix spelling error in spec
2011-11-28 10:02:06 -08:00
Johannes Hackel
ef28e89809
people_controller_spec
2011-11-23 23:45:09 +01:00
Johannes Hackel
0c1be5002d
end
2011-11-23 08:00:08 +01:00
Johannes Hackel
66acd7db14
specs, stay on page
2011-11-22 12:54:19 +01:00
Johannes Hackel
7368bb9e62
comment_stream
2011-11-20 18:37:10 +01:00
Manuel
1c9a96e2aa
Fixed relayable specs
2011-11-20 01:06:45 +01:00
danielgrippi
6be778b9b2
change root_path and root_url to multi_path
2011-11-14 18:01:09 -08:00
Sarah Mei & Tim Frazer
a6f11e86dc
Merge branch 'master' of https://github.com/diaspora/diaspora
2011-11-14 17:42:14 -08:00
Sarah Mei & Tim Frazer
409a6aebc7
Fix invitation controller spec on postgres
2011-11-14 17:41:54 -08:00
danielgrippi
6408105917
Revert "auto follow back feature"
...
This reverts commit 226554becf .
Conflicts:
config/locales/diaspora/en.yml
2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85
Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button.
...
Get rid of 500 error on the "view this invitation in your browser" link
2011-11-14 17:02:13 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a
Background sending password reset instructions.
2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf
auto follow back feature
2011-11-14 20:25:11 +01:00
Pistos
05b1e2fc19
Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag.
...
e.g. if "test" exists and you try to follow "Test".
2011-11-13 23:26:53 -05:00
Jonne Hass
b3142ac208
redirect to sign in page from photo#show on a private photo when user isn't signed in
2011-11-10 22:44:12 +01:00
Jonne Hass
4f993b3d24
fix jasmine spec
2011-11-10 18:15:23 +01:00
Pistos
31b43f315e
Corrected the message length spec.
2011-11-09 21:35:16 -05:00
Pistos
e5d37c7949
Whitespace cleanup.
2011-11-09 21:35:08 -05:00
Daniel Grippi
319d72deb9
Merge pull request #2345 from 21echoes/higher_post_limit
...
higher post limits
2011-11-09 16:11:39 -08:00
Maxwell Salzberg
57989cb98e
fix final tag stream spec
2011-11-08 13:56:34 -08:00
Jonne Hass
0a29408497
fixed order dependent spec
2011-11-08 12:03:17 +01:00
David Kettler
74bcc6f06e
now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit
2011-11-07 21:21:36 -08:00
Maxwell Salzberg
fe3fe0f5cc
MS SM save sync cache if you have some sort of contacts
2011-11-07 19:52:48 -08:00
danielgrippi
6f7c9e9301
Remove resque_rescheduler as it was killing our app servers (receiving
...
http requests).
Revert "retry less"
This reverts commit 7784156e3b .
Revert "supress resque retries"
This reverts commit 80cdcd4edd .
Revert "Retry federation if remote pod is down"
This reverts commit bcbc86e502 .
Conflicts:
app/models/jobs/http_multi.rb
2011-11-07 12:50:02 -08:00
danielgrippi
b53df6dd4d
repopulating the redis cache should clear the entire set first
2011-11-07 11:28:29 -08:00
danielgrippi
fd76cfd4c5
fix construct_shareable_from_others_query to only include posts from contacts within your aspects
2011-11-07 10:52:31 -08:00
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