nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8436 commits 4 branches 0 tags 121 MiB
Commit graph

8436 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
danielgrippi
159fce3ef2 refactor wip 2011-08-17 16:28:21 -07:00
danielgrippi
bf0eb3dac3 4 failures left in postgres 2011-08-17 14:18:51 -07:00
danielgrippi
4d4d11b90b upgrade selenium-webdriver to 2.4 for FF6 support 2011-08-17 12:49:07 -07:00
MrZYX
1da481d362 updated locales 2011-08-17 21:26:59 +02:00
Raphael Sofaer
88b317f0c1 Fix jasmine spec for aspectFilters 2011-08-17 10:17:14 -07:00
Raphael Sofaer
97ab077e04 Abort old aspectFilters requests, close issue 1759. 2011-08-16 15:31:02 -07:00
Raphael Sofaer
a5d9d6d212 Remove reference to invites counter from db seeds, close #1778 2011-08-16 15:07:25 -07:00
Raphael Sofaer
f2e079f532 Revert "Move the include of splunklogging into the appconfig check" 
This reverts commit 25752e9f93.
 2011-08-16 15:04:51 -07:00
Raphael Sofaer
89639edb3a Use the Contact#in_aspect? helper in aspect_membership_dropdown 2011-08-16 15:01:48 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
140268365c Simplify aspect dropdown views 2011-08-16 12:43:08 -07:00
Raphael Sofaer
25752e9f93 Move the include of splunklogging into the appconfig check 2011-08-16 12:26:57 -07:00
Raphael Sofaer
1bd7e1314f Make the signs up feature more robust 2011-08-16 11:34:34 -07:00
MrZYX
1e53261606 updated locales 2011-08-16 19:43:57 +02: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