Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2708b0b695
|
added back the tooltip explaining username constatrains on the accept invite flow
|
2011-08-24 17:35:27 -07:00 |
|
Raphael Sofaer
|
7f0677ab16
|
connect wip
|
2011-08-23 16:37:51 -07:00 |
|
Raphael Sofaer
|
dec10e3de9
|
Finish setting up sesssions#new prefill when logged out by authorizationsControlelr
|
2011-08-23 16:37:51 -07:00 |
|
Raphael Sofaer
|
a63d1ad4ae
|
Sign out the signed in user if a different uid is passed to AuthorizationsController#new
|
2011-08-23 16:37:50 -07:00 |
|
Raphael Sofaer
|
6b88a75174
|
Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user
|
2011-08-23 16:37:50 -07:00 |
|
danielgrippi
|
a7d9bbed84
|
wip
|
2011-08-23 16:37:50 -07:00 |
|
danielgrippi
|
27049e52b5
|
connect logic
|
2011-08-23 16:37:50 -07:00 |
|
Maxwell Salzberg
|
e7071fd74c
|
fix admin inviter
|
2011-08-23 08:43:42 -07: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 |
|
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 |
|
Maxwell Salzberg
|
6f20e11a67
|
better invite emails wip
|
2011-08-19 12:15:11 -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
|
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 |
|
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 |
|
Maxwell Salzberg
|
0473037d1b
|
fix notification links
|
2011-08-18 11:12:58 -07:00 |
|
Gonzalo Rodriguez
|
2d54d9a97e
|
Validate presence of message text on conversations. Closes #1329.
|
2011-08-17 23:52:31 -03:00 |
|
Maxwell Salzberg
|
ad1b122e20
|
test batch_invite
|
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 |
|
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
|
cc3eeac98e
|
Merge the aspect dropdown in the publisher with master, some things are still broken
|
2011-08-16 14:59:53 -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
|
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 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
ba11bb6d89
|
you are now able to invite friends from the mobile site
|
2011-08-14 15:40:07 -07: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 |
|
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
|
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 |
|
Raphael Sofaer
|
38a8962945
|
Fix 500 on photo destroy
|
2011-08-12 15:58:42 -07:00 |
|
Andrej Kacian
|
1062cc5bf6
|
Fix contact count displayed on the right for good. Also use only one randomization when selecting the random contacts to display.
|
2011-08-12 22:04:53 +02: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 |
|
danielgrippi
|
7df883eaf0
|
added summary text per user on stats
|
2011-08-11 18:52:31 -07:00 |
|
danielgrippi
|
673397508f
|
added segments to stats
|
2011-08-11 18:34:26 -07:00 |
|
danielgrippi
|
5c6441f6db
|
add basic graph to stats view
|
2011-08-11 17:58:57 -07:00 |
|
danielgrippi
|
2d9b9270cb
|
go off of yesterday's stats (full day comparison)
|
2011-08-11 17:27:20 -07:00 |
|
danielgrippi
|
190332308b
|
started on the real stats page
|
2011-08-11 17:15:33 -07:00 |
|
Raphael Sofaer
|
d9904ecd30
|
InvitationsController update has an error, and our non-specific error catching is messing up knowing what our problems are
|
2011-08-11 14:50:43 -07:00 |
|
Raphael Sofaer
|
7900f291e4
|
Try to get rid of the googlebot error on posts/show
|
2011-08-11 14:26:01 -07:00 |
|
ticho
|
d63251e6a8
|
Merge pull request #1703 from ticho/fix-right-bar-target-contact-count
Show correct contact count in right bar when changing target aspect.
|
2011-08-11 14:09:34 -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 |
|