maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -08:00 |
|
maxwell
|
5e58eba240
|
new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times
|
2011-01-05 17:43:25 -08:00 |
|
Raphael
|
d64fd2d222
|
Don't redirect to root_url on aspect destroy
|
2011-01-04 18:00:49 -08:00 |
|
Raphael
|
83d6b95c46
|
Merge remote branch 'nickvdb/763-notifications-paginate'
|
2011-01-04 16:18:46 -08:00 |
|
Raphael
|
0e55b0bf44
|
Merge remote branch 'tomk/721-wrong-person-link-when-creating-comment'
|
2011-01-04 16:14:39 -08:00 |
|
zhitomirskiyi
|
d3daa32558
|
mark a notification as read when you ignore a request
|
2011-01-04 11:27:25 -08:00 |
|
danielvincent
|
055fbe3e00
|
stream is now a div. generalized some partial extentions for mobile site.
|
2011-01-01 23:09:18 -05:00 |
|
Thomas R. Koll
|
5c7d39505a
|
Fixes #721 when creating a comment (ajax) the link to your own profile is fucked up and instead it linked to the user id
|
2010-12-30 00:48:43 +01:00 |
|
Nick van der Burgt
|
b33056f72b
|
Fixed a small mistake
|
2010-12-28 22:03:13 +01:00 |
|
Nick van der Burgt
|
c7f3a9abfd
|
Pagination for the notifications
|
2010-12-28 21:54:41 +01:00 |
|
Sarah Mei
|
1f67cc2485
|
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
|
2010-12-24 12:31:09 -08:00 |
|
danielvincent
|
a6c5f420fa
|
giving more pixels to photos on their show pages
|
2010-12-21 12:39:37 -08:00 |
|
maxwell
|
6d4696faf0
|
MS DG notifications are now pretty decent
|
2010-12-20 18:05:31 -08:00 |
|
maxwell
|
ed0e739ac3
|
updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with
|
2010-12-20 11:22:52 -08:00 |
|
Sarah Mei
|
c1bfbd358e
|
Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know.
|
2010-12-20 02:50:38 -08:00 |
|
maxwell
|
c22894ff2a
|
limit number of notifications in notifications#index
|
2010-12-19 19:05:45 -08:00 |
|
danielvincent
|
6d63a5d3c5
|
fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller.
|
2010-12-19 17:50:07 -08:00 |
|
MrZYX
|
c3a79f7298
|
some fixes to translations
|
2010-12-18 15:25:21 +01:00 |
|
maxwell
|
84c041ba6a
|
aspects streams now ajax
|
2010-12-17 19:41:42 -08:00 |
|
maxwell
|
2e85a9fe66
|
notifications now can be read
|
2010-12-17 17:06:49 -08:00 |
|
maxwell
|
c749d81fe9
|
putting a link to notifications, make them unread in the controller when you view the index
|
2010-12-17 17:06:48 -08:00 |
|
maxwell
|
807187ded9
|
/notifications is now pretty cool
|
2010-12-17 17:06:48 -08:00 |
|
maxwell
|
5763b441be
|
fixing order of Notification.for
|
2010-12-17 11:37:33 -08:00 |
|
danielvincent
|
2758ea1625
|
fixed issue with diaspora handles not displaying in streams
|
2010-12-16 17:24:25 -08:00 |
|
danielvincent
|
f3ced6d96c
|
randomize collections of similar contacts on people#show
|
2010-12-16 16:37:13 -08:00 |
|
Raphael
|
d2199fa1eb
|
Profile of requestor should be visible; no outgoing request instance variable needed
|
2010-12-16 14:09:55 -08:00 |
|
Raphael
|
eb56521a66
|
Don't query inside of loops...
|
2010-12-16 12:25:31 -08:00 |
|
danielvincent
|
f821f49db1
|
added similar contacts to contact pages
|
2010-12-16 11:49:08 -08:00 |
|
maxwell
|
20ca2e2e93
|
make Notification.for return a query, not evaluate.. also limit notifications pulled back to 25
|
2010-12-16 11:16:09 -08:00 |
|
maxwell
|
1274dbbf5d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-16 10:16:39 -08:00 |
|
maxwell
|
1451db6cd8
|
fixed rspec build
|
2010-12-16 10:15:16 -08:00 |
|
danielvincent
|
43810907f5
|
show all contacts in edit aspect pane
|
2010-12-16 10:00:18 -08:00 |
|
maxwell
|
d5ba34f245
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 18:05:54 -08:00 |
|
Raphael
|
e881edab96
|
Fix missing partials on last commit, you can now accept a request from the requestor's profile page
|
2010-12-15 18:05:18 -08:00 |
|
Raphael
|
3b727dc887
|
Add share_with fancybox on search page, fix a couple of queries
|
2010-12-15 17:45:12 -08:00 |
|
maxwell
|
8ec85d3b12
|
basic notifications
|
2010-12-15 17:31:36 -08:00 |
|
Raphael
|
b22398951e
|
Send requests from the aspect list on the person show page
|
2010-12-15 14:48:14 -08:00 |
|
Raphael
|
80a9b97f8d
|
add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids
|
2010-12-15 14:48:14 -08:00 |
|
zhitomirskiyi
|
d34964651c
|
if aspect is not dropped it redirects back for consistency
|
2010-12-15 14:44:10 -08:00 |
|
zhitomirskiyi
|
1212b34706
|
fadeOut on delete
|
2010-12-15 11:58:38 -08:00 |
|
danielvincent
|
2cf332e120
|
Remove sent boolean from requests, finish migration
|
2010-12-14 19:27:18 -08:00 |
|
danielvincent
|
f1ee32145d
|
Remove pending_requests from user, just use Request.from and Request.to.
|
2010-12-14 19:00:03 -08:00 |
|
danielvincent
|
aef5abf631
|
Correct some queries, look at incoming requests in search, explicit pending false in activate_contact
|
2010-12-14 17:33:07 -08:00 |
|
danielvincent
|
b1c0facfe6
|
initiating a request now just creates a pending contact instead of persisting a request
|
2010-12-14 17:11:43 -08:00 |
|
Raphael
|
06b7b1c99a
|
WIP pending contacts
|
2010-12-14 17:11:42 -08:00 |
|
Raphael
|
d3850292d5
|
Don't query current_user.contacts on every action
|
2010-12-14 12:38:48 -08:00 |
|
Raphael
|
e63a8a4bfa
|
Take contact.person query out of the views, only query people once in hashes_for_aspects
|
2010-12-14 12:11:36 -08:00 |
|
danielvincent
|
d6bb5291bc
|
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
|
2010-12-13 17:16:56 -08:00 |
|
Raphael
|
02d76441e4
|
Merge branch 'aspect-list-on-profile'
|
2010-12-13 16:12:29 -08:00 |
|
Raphael
|
baa04ceac7
|
Add aspect list to contact page
|
2010-12-13 15:58:08 -08:00 |
|