Dan Hansen
|
6b040c7b4a
|
clean up websocket receiver, add specs to content updater
|
2011-08-22 20:03:38 -05:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
7fd7fa968c
|
fixed the email from header issues and backfilled few tests
|
2011-08-22 17:38:40 -07:00 |
|
Andrej Kacian
|
59ba3f85e6
|
Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives
|
2011-08-22 20:18:02 +02:00 |
|
Andrej Kacian
|
9fd4432e5a
|
Fix a jasmine test in CommentToggler
|
2011-08-22 20:05:18 +02:00 |
|
Dan Hansen
|
4a64a172d1
|
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
spec/javascripts/stream-spec.js
|
2011-08-21 20:57:01 -05:00 |
|
Dan Hansen
|
545611fffa
|
green?
|
2011-08-21 20:45:51 -05:00 |
|
Sarah Mei
|
163ac103cd
|
Haven't figured out why reset password email body is blank, but I pulled it into a controller test so we can figure it out there instead of in a cucumber feature.
|
2011-08-21 16:45:53 -07:00 |
|
Andrej Kacian
|
395df041db
|
Made toggleComments jasmine test aware that there are more posts in the fixture
|
2011-08-22 00:38:34 +02:00 |
|
Andrej Kacian
|
2a52face12
|
Add jasmine test for ajax spinner display
|
2011-08-22 00:38:34 +02:00 |
|
Dan Hansen
|
3ed50cab94
|
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
app/views/status_messages/bookmarklet.html.haml
config/assets.yml
db/schema.rb
public/javascripts/contact-edit.js
public/javascripts/publisher.js
public/javascripts/view.js
|
2011-08-20 14:40:56 -05:00 |
|
Gonzalo Rodriguez
|
234af2a15b
|
Fixing some tests that weren't testing correctly
These assertions were always returning true even if you dont populate
the flash, because nil.should_not be_empty returns true
|
2011-08-19 23:57:33 -03:00 |
|
Raphael Sofaer
|
a74080e27d
|
Fix ServicesController spec
|
2011-08-19 16:52:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
834c75894c
|
jasmine is green again
|
2011-08-19 14:42:28 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
96d183a041
|
fixed private message emails not including the message
|
2011-08-19 11:33:55 -07:00 |
|
Maxwell Salzberg
|
6beeecefd8
|
add better messages telling a user that they sent share requests if they try and email exsisting users
|
2011-08-18 18:27:37 -07:00 |
|
Raphael Sofaer
|
60e9fd54e2
|
Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile
|
2011-08-18 16:05:14 -07:00 |
|
Raphael Sofaer
|
31584eed84
|
It turns out find_for_database_authentication calls find_for_authentication, not the other way around.
|
2011-08-18 16:05:14 -07:00 |
|
Raphael Sofaer
|
c7331230bc
|
Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of ="
This reverts commit b11bd23da2.
|
2011-08-18 12:06:04 -07:00 |
|
danielgrippi
|
b11bd23da2
|
Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of =
This reverts commit 7969b52035.
|
2011-08-18 11:20:49 -07:00 |
|
danielgrippi
|
7969b52035
|
Revert "remove uploaded test images after running the specs/cucumber"
This reverts commit a6eb275c7a.
|
2011-08-18 11:11:08 -07:00 |
|
danielgrippi
|
a6eb275c7a
|
remove uploaded test images after running the specs/cucumber
|
2011-08-18 11:08:57 -07:00 |
|
Gonzalo Rodriguez
|
2d54d9a97e
|
Validate presence of message text on conversations. Closes #1329.
|
2011-08-17 23:52:31 -03:00 |
|
danielgrippi
|
a99e69edd6
|
down to 2 failures in postgres
|
2011-08-17 16:51:54 -07:00 |
|
Maxwell Salzberg
|
ad1b122e20
|
test batch_invite
|
2011-08-17 16:28:21 -07:00 |
|
Maxwell Salzberg
|
e0fb8a08cb
|
set the user email if inviting by email
|
2011-08-17 16:28:21 -07:00 |
|
Maxwell Salzberg
|
19eb549889
|
fixed up update controller action and building users #scary #gladsofaerisstillhere
|
2011-08-17 16:28:21 -07:00 |
|
Maxwell Salzberg
|
e039aabeef
|
senders must now own aspects
|
2011-08-17 16:28:21 -07:00 |
|
danielgrippi
|
eb8c540ac1
|
MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots
|
2011-08-17 16:28:21 -07:00 |
|
danielgrippi
|
bf0eb3dac3
|
4 failures left in postgres
|
2011-08-17 14:18:51 -07:00 |
|
Raphael Sofaer
|
88b317f0c1
|
Fix jasmine spec for aspectFilters
|
2011-08-17 10:17:14 -07:00 |
|
Maxwell Salzberg
|
a06f25b297
|
Merge pull request #1763 from grzuy/conversation-creation-refactor
Refactor conversations creation
|
2011-08-16 10:26:54 -07:00 |
|
danielgrippi
|
511517b3c7
|
cleaned up and documented Invitation. moved an action into a User before_create callback
|
2011-08-15 16:44:37 -07:00 |
|
danielgrippi
|
32ae21a213
|
removed user invite counter, as it was already depricated
|
2011-08-15 15:15:43 -07:00 |
|
danielgrippi
|
669cd8578e
|
scoped invite_user_by_email job into Mail module
|
2011-08-15 12:35:32 -07:00 |
|
Gonzalo Rodriguez
|
2326206586
|
Refactor conversations creation
|
2011-08-12 23:07:01 -03:00 |
|
Raphael Sofaer
|
565d71a0cd
|
Bad solution for making sure that an invited facebook user is marked immediately as having been invited
|
2011-08-12 17:32:52 -07:00 |
|
danielgrippi
|
7b85dcec9c
|
dg rs; seed bob with facebook friends & fixed invitation view
|
2011-08-12 17:05:00 -07:00 |
|
Raphael Sofaer
|
8b743e7e3b
|
Fix stack level too deep error on reshares
|
2011-08-12 13:20:25 -07:00 |
|
Raphael Sofaer
|
cd640e1ac6
|
Pending spec for statusnet linkback plugin
|
2011-08-12 10:37:24 -07:00 |
|
Raphael Sofaer
|
3c34749dd7
|
Put a select limit on the person query on contactsController index, since we know exactly what we're doing with the data
|
2011-08-12 10:13:29 -07:00 |
|
Raphael Sofaer
|
9a77d3518f
|
Mobile authorizations index view
|
2011-08-11 16:39:39 -07:00 |
|
Raphael Sofaer
|
7f69714d08
|
Fix paul.elicker link, refactor people_helper
|
2011-08-11 16:26:14 -07:00 |
|
danielgrippi
|
08f12ee348
|
fixed the 'a post' bug in notification emails
|
2011-08-11 14:40:45 -07:00 |
|
Raphael Sofaer
|
7021cd79c8
|
Select distinct people in contacts index
|
2011-08-11 11:56:23 -07:00 |
|
Dan Hansen
|
2e9040e227
|
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
|
2011-08-10 23:57:33 -07:00 |
|
danielgrippi
|
db645e8da8
|
merged publics/show and posts/show
|
2011-08-10 18:07:38 -07:00 |
|
Raphael Sofaer
|
90a5cd2254
|
Get rid of error on aspect_memberships destroy if someone has noscript on or something
|
2011-08-10 17:40:38 -07:00 |
|
Raphael Sofaer
|
8086b9a9d4
|
Eliminate 500 errors on also_commented emails, the copy there is terrible
|
2011-08-10 16:58:35 -07:00 |
|
Raphael Sofaer
|
350a4b4f6d
|
Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations?
|
2011-08-10 16:42:08 -07:00 |
|
Raphael Sofaer
|
3431cd94fb
|
Make resque job specs specific about what error should be raised; fix expectation on hoptoad notifier
|
2011-08-10 16:36:42 -07:00 |
|