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
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 7784156e3b80cdcd4eddbcbc86e502
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
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
