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
|
c3bcb9c962
|
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
|
2011-08-18 16:48:20 -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 |
|
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
|
7d9b1636c0
|
dont raise runtime error if invitation token is not found
|
2011-08-18 14:14:24 -07: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 |
|
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
|
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 |
|
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 |
|
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 |
|
Raphael Sofaer
|
a2f7fed8f4
|
Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy.
|
2011-08-14 17:45:50 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
3f1e8f0b6e
|
added the check for open invitations
|
2011-08-14 16:06:25 -07:00 |
|
Andrej Kacian
|
8dc1b70621
|
Use tipsy for post scope tooltip
|
2011-08-15 00:54:27 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
ba11bb6d89
|
you are now able to invite friends from the mobile site
|
2011-08-14 15:40:07 -07:00 |
|
Andrej Kacian
|
657a9f96ef
|
Fix error when accessing a tag page without being signed in.
|
2011-08-14 23:51:53 +02:00 |
|
Andrej Kacian
|
4fe61892e1
|
Added list of followed tags also to tags view, as suggested in issue #1632
|
2011-08-14 21:34:56 +02:00 |
|
Raphael Sofaer
|
3a18044821
|
Fix infinite scroll on search... some kind of weird thing with rails responding with json even when request.format is html, with a mime type of html
|
2011-08-13 09:59:17 -07:00 |
|
Raphael Sofaer
|
f60ce932b1
|
Localize string
|
2011-08-13 09:44:40 -07:00 |
|
Raphael Sofaer
|
f0583de36c
|
Some optimizations to ServicesController#finder. Apparently setting an association on an unsaved record to an empty array hits the database.
|
2011-08-13 09:40:31 -07:00 |
|
Andrej Kacian
|
b85df7303b
|
After opening a conversation, remove its unread message count from inbox
|
2011-08-13 05:27:54 +02:00 |
|
Gonzalo Rodriguez
|
2326206586
|
Refactor conversations creation
|
2011-08-12 23:07:01 -03:00 |
|
danielgrippi
|
1c5f61fb78
|
dropdown images as embedded assets and not 2 separate image tags
|
2011-08-12 18:18:58 -07: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
|
75f3accd37
|
moved facebook friend inviter/finder into contacts layout & re-added search
|
2011-08-12 17:05:01 -07:00 |
|
danielgrippi
|
a8d37fb3fc
|
Move Facebook inviter view into the contacts layout, rather than a facebox
|
2011-08-12 17:05:01 -07:00 |
|
danielgrippi
|
7b85dcec9c
|
dg rs; seed bob with facebook friends & fixed invitation view
|
2011-08-12 17:05:00 -07:00 |
|
Raphael Sofaer
|
38a8962945
|
Fix 500 on photo destroy
|
2011-08-12 15:58:42 -07:00 |
|
Raphael Sofaer
|
3831c13a4a
|
Move the app/models/jobs folder to match the name of the module
|
2011-08-12 15:56:26 -07:00 |
|
Raphael Sofaer
|
8b743e7e3b
|
Fix stack level too deep error on reshares
|
2011-08-12 13:20:25 -07:00 |
|