Maxwell Salzberg
|
735a37ffe0
|
really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects
|
2011-08-19 15:57:10 -07:00 |
|
Maxwell Salzberg
|
bb5ada6533
|
create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers
|
2011-08-19 15:57:10 -07:00 |
|
Maxwell Salzberg
|
e4062bf5fd
|
now functionally correct
|
2011-08-19 15:56:32 -07:00 |
|
Maxwell Salzberg
|
70fe2cf10f
|
wip
|
2011-08-19 15:56:31 -07:00 |
|
Raphael Sofaer
|
32368a16dd
|
Make latest migration postgres compatible
|
2011-08-19 15:55:27 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
834c75894c
|
jasmine is green again
|
2011-08-19 14:42:28 -07:00 |
|
Maxwell Salzberg
|
e100032244
|
add all in the query, to be more pedantic
|
2011-08-19 13:59:41 -07:00 |
|
Maxwell Salzberg
|
3cee589397
|
show only invites from a user
|
2011-08-19 13:58:22 -07:00 |
|
Maxwell Salzberg
|
fe78a69161
|
combine invitation emails
|
2011-08-19 12:15:11 -07:00 |
|
Maxwell Salzberg
|
6f20e11a67
|
better invite emails wip
|
2011-08-19 12:15:11 -07:00 |
|
MrZYX
|
f2e25c5fc5
|
updated locales
|
2011-08-19 20:39:26 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
96d183a041
|
fixed private message emails not including the message
|
2011-08-19 11:33:55 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
ecf38305b4
|
added a visible style for missing translations in development and production modes
|
2011-08-19 11:05:48 -07:00 |
|
Gonzalo Rodriguez
|
3d7297ba5e
|
Closes #1753. Render thats_you message instead of dropdown for your hovercard
|
2011-08-19 00:47:26 -03: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 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2c47262d54
|
manually pulled in manuels latest commits
|
2011-08-18 16:49:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c3bcb9c962
|
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
|
2011-08-18 16:48:20 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
a54ad95e87
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-08-18 16:16:38 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
a407f12463
|
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
|
2011-08-18 16:16:14 -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 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2777f16f4f
|
Merge branch 'issue1586-aspectdropdown-when-posting'
|
2011-08-18 16:02:09 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
064ae972b3
|
the cucumber is now passing & renamed the partial to conform with convention
|
2011-08-18 15:38:27 -07:00 |
|
Maxwell Salzberg
|
8b278adff6
|
migration to fix old invites for resend
|
2011-08-18 14:51:15 -07:00 |
|
Maxwell Salzberg
|
7d9b1636c0
|
dont raise runtime error if invitation token is not found
|
2011-08-18 14:14:24 -07:00 |
|
Maxwell Salzberg
|
947dfaacf7
|
make profile photo auto so it does not get smooshed
|
2011-08-18 14:09:50 -07:00 |
|
Andrej Kacian
|
e033eda5d1
|
Use live binding for tipsy tooltips within stream elements, so that elements loaded by the infiniscroll get them too
|
2011-08-18 22:28:36 +02:00 |
|
Andrej Kacian
|
f59275adb4
|
Actually add the comment delete link to list of tipsified elements
|
2011-08-18 22:22:47 +02:00 |
|
Andrej Kacian
|
f5e93c3e83
|
Comment delete icon should also have a tipsy tooltip
|
2011-08-18 22:12:09 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
b1e95def4a
|
Merge branch 'master' into issue1586-aspectdropdown-when-posting
|
2011-08-18 12:59:00 -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 |
|
Maxwell Salzberg
|
0473037d1b
|
fix notification links
|
2011-08-18 11:12:58 -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 |
|
Raphael Sofaer
|
2c65593579
|
Add quick option to mysqldump
|
2011-08-18 10:33:27 -07:00 |
|
Raphael Sofaer
|
f3932132d3
|
Let the next backup job overwrite the sqldump
|
2011-08-18 08:34:34 -07:00 |
|
danielgrippi
|
fca2be5c5d
|
facebox overlay dark again, with a faint spotlight
|
2011-08-17 22:43:58 -07:00 |
|
Maxwell Salzberg
|
419707412a
|
update jasmine to destroy deprication warnings in the tests
|
2011-08-17 20:57:11 -07:00 |
|
Gonzalo Rodriguez
|
2d54d9a97e
|
Validate presence of message text on conversations. Closes #1329.
|
2011-08-17 23:52:31 -03:00 |
|
Raphael Sofaer
|
8231ce2239
|
Don't log big xml things
|
2011-08-17 18:59:25 -07:00 |
|
danielgrippi
|
a99e69edd6
|
down to 2 failures in postgres
|
2011-08-17 16:51:54 -07:00 |
|
Maxwell Salzberg
|
57ee4cd8a9
|
Merge branch 'invite-refactor' note: this requires you to migrate your
database
|
2011-08-17 16:29:06 -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
|
4ed684491d
|
MS RS fix view params from invitations#new
|
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 |
|
Maxwell Salzberg
|
cc6618d294
|
some progress
|
2011-08-17 16:28:21 -07:00 |
|