maxwell
|
153c4925d6
|
test for pubsubhububb jobs
|
2011-01-06 17:19:13 -08:00 |
|
maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -08:00 |
|
zhitomirskiyi
|
0c8e6b0ba1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 15:56:20 -08:00 |
|
zhitomirskiyi
|
3fae950905
|
also commented notification and sending ids into resque so that it works
|
2011-01-06 15:56:03 -08:00 |
|
danielvincent
|
8074e481a3
|
stream fix on aspects/show
|
2011-01-06 13:51:59 -08:00 |
|
maxwell
|
5818227904
|
adding job for posting to services
|
2011-01-06 13:13:09 -08:00 |
|
maxwell
|
27d8cc8003
|
added sync pubsubhubbub publisher client. we now should not longer require eventmachine, (in the server process, the websocket still requires it). this should also be in a job
|
2011-01-05 19:02:43 -08:00 |
|
maxwell
|
8b3a193156
|
added copyright notice to jobs
|
2011-01-05 18:52:43 -08:00 |
|
maxwell
|
beaeac2d42
|
comment out debug
|
2011-01-05 17:52:21 -08:00 |
|
maxwell
|
a7d651236f
|
make the postman work across everything. remove lots of now useless methods
|
2011-01-05 17:44:08 -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 |
|
maxwell
|
7ea6b4dd8d
|
more cleanup
|
2011-01-05 17:43:25 -08:00 |
|
maxwell
|
8819d288c4
|
i am greeen
|
2011-01-05 17:43:25 -08:00 |
|
maxwell
|
3fe30cde12
|
removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out
|
2011-01-05 17:43:25 -08:00 |
|
zhitomirskiyi
|
ce470e74ee
|
notification calls email notification
|
2011-01-05 17:21:55 -08:00 |
|
zhitomirskiyi
|
67be774b7a
|
setting the comment
|
2011-01-05 15:35:40 -08:00 |
|
zhitomirskiyi
|
82852db5ec
|
added the files this time
|
2011-01-05 15:04:28 -08:00 |
|
zhitomirskiyi
|
7254db5cbc
|
Revert "Revert "added comment on post mail method""
This reverts commit c9b3066599.
|
2011-01-05 14:59:15 -08:00 |
|
zhitomirskiyi
|
c9b3066599
|
Revert "added comment on post mail method"
This reverts commit c00226238b.
|
2011-01-05 14:56:04 -08:00 |
|
zhitomirskiyi
|
c00226238b
|
added comment on post mail method
|
2011-01-05 14:55:17 -08:00 |
|
zhitomirskiyi
|
2f06ec1dca
|
don't display notificatification badge div if there is no notification count (permalink works)
|
2011-01-05 10:07:22 -08:00 |
|
zhitomirskiyi
|
c7ecab4933
|
the new request email links back to the pod
|
2011-01-05 09:35:47 -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 |
|
Raphael
|
8d5dc5d27b
|
Merge remote branch 'tomk/ui-cosmetics'
|
2011-01-04 16:02:11 -08:00 |
|
Raphael
|
6102217a88
|
Don't display the invitations link unless the user has invitations, thanks Pasta
|
2011-01-04 15:59:53 -08:00 |
|
Raphael
|
06d7ddbe0d
|
Hopefully get rid of some problems with deleted accounts moving forward
|
2011-01-04 15:36:42 -08:00 |
|
zhitomirskiyi
|
d3daa32558
|
mark a notification as read when you ignore a request
|
2011-01-04 11:27:25 -08:00 |
|
zhitomirskiyi
|
20efe06ad5
|
capturing mousedown instead of click to handle open in other tab
|
2011-01-01 21:14:36 -08:00 |
|
danielvincent
|
055fbe3e00
|
stream is now a div. generalized some partial extentions for mobile site.
|
2011-01-01 23:09:18 -05:00 |
|
Alec Leamas
|
3f2d48b26e
|
handling http/https references
See discussion in c92f80b2eb
|
2010-12-30 23:22:43 +01: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 |
|
Thomas R. Koll
|
869cbdf9e9
|
* Localizeable "Rename aspect" button
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
|
2010-12-29 17:00:08 +01:00 |
|
Nick van der Burgt
|
e0f583d7d3
|
Fixed mistake of running will_paginate on @people instead of @notifications
|
2010-12-29 10:51:42 +01:00 |
|
Alec Leamas
|
c92f80b2eb
|
Cleaning up some paths.
Handling root_url if not ending w /, using http: for all cross-site
references.
|
2010-12-29 10:10:26 +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 |
|
Nick van der Burgt
|
e6127c6aa9
|
Included ie.js into the layout
|
2010-12-27 17:33:50 +01:00 |
|
MrZYX
|
74b5281a75
|
Merge branch '761-aspect-name-double-escaped-in-page-title' of https://github.com/Dorian/diaspora into dorian
|
2010-12-26 21:44:04 +01:00 |
|
MrZYX
|
f92eb1735f
|
Merge branch '756-status-not-formatted-in-photo-page' of https://github.com/Dorian/diaspora into dorian
|
2010-12-26 21:43:23 +01:00 |
|
Dorian
|
346217ea46
|
Bug #761 : Aspect name double escaped in page title
|
2010-12-26 03:59:15 +01:00 |
|
Dorian
|
89ce11456a
|
Markdownify message in photo page
|
2010-12-26 03:06:19 +01:00 |
|
Dorian
|
d6e72cd2bb
|
Escape person.name in comment
|
2010-12-26 02:16:53 +01:00 |
|
danielvincent
|
7827968b52
|
removing <p> from statusmessage partial
|
2010-12-25 19:18:42 -05:00 |
|
danielvincent
|
0fb102a2ec
|
right/left arrow keys functional on photo#show
|
2010-12-25 19:14:24 -05:00 |
|
danielvincent
|
30dd11b9fa
|
mark notifications as read and update badge
|
2010-12-25 16:27:09 -05:00 |
|
danielvincent
|
4ff9622bfc
|
notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.
|
2010-12-25 16:07:31 -05: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 |
|
Dorian
|
293445225a
|
Don't let user put HTML in alt and title image attribute of avatar
|
2010-12-24 15:33:04 +01:00 |
|