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

2910 commits

Author SHA1 Message Date
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
Raphael
ff1cad6e63 raw import for requests 2011-01-05 17:38:00 -08:00
Raphael
0d80ded2d3 Raw import for post_visibilities 2011-01-05 17:25:11 -08:00
zhitomirskiyi
ce470e74ee notification calls email notification 2011-01-05 17:21:55 -08:00
Raphael
b34acfd4eb Add contact raw import, fixtures have no comments 2011-01-05 16:40:16 -08:00
Raphael
e4ef2641f8 raw import of aspects and aspect memberships 2011-01-05 15:40:04 -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
Sarah Mei
7f86a9e1ba ImportToMysql now loads users.csv. Spec currently failing on datetime conversion. 2011-01-04 22:43:32 -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
Raphael
16d7ccdf0b fix youtube title stting 2011-01-04 11:48:02 -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
Sarah Mei
e2804dbbcb Replace old references to request.from with request.sender 2010-12-28 22:56:53 -08:00
zhitomirskiyi
bd05e97c29 requiring the websocket lib file 2010-12-28 19:53:45 -08:00
zhitomirskiyi
ddf95e2750 couple more passing cucumber stories, changed the queries on request and notification 2010-12-28 19:14:47 -08: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
Raphael
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
zhitomirskiyi
be9101b51f Merge branch 'mysql' of github.com:diaspora/diaspora into mysql 2010-12-27 22:23:58 -08:00
zhitomirskiyi
11153cf2ca a couple more passing specs 2010-12-27 22:23:41 -08:00
Sarah Mei
787d550a1f Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly. 2010-12-27 21:48:51 -08:00
Nick van der Burgt
e6127c6aa9 Included ie.js into the layout 2010-12-27 17:33:50 +01:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831 Fix a couple more specs in mysql 2010-12-26 20:52:15 -08:00
Raphael
a6dcaa2327 Photo specs passing, 9 failures left in mysql 2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a 14 failures after updating mysql branch to master 2010-12-26 17:25:07 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08: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
Michael Sofaer and Raphael Sofaer
7175200779 Fix a spec, need to move to a computer with firefox. 2010-12-24 15:17:24 -08:00
Michael Sofaer and Raphael Sofaer
30d60021f4 11 Controller specs remain in mysql. ALMOST DONE 2010-12-24 14:12:55 -08: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
Michael Sofaer and Raphael Sofaer
82b226712f Posting spec green 2010-12-24 09:58:11 -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
Michael Sofaer and Raphael Sofaer
426651d827 Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see 2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01 Fix retraction related failures in mysql 2010-12-23 23:04:04 -08:00
zhitomirskiyi
7796776135 vimeo works, does not yet fetch the title 2010-12-23 15:36:29 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
Sarah Mei
2b7eeffd5b Fix searching in mysql. It now does one query for all tokens. And person_spec is green! 2010-12-22 22:24:04 -08:00
Raphael
924bcca0e2 Isolated problem in status message marshalling, mysql 2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04 33 failures left in mysql 2010-12-22 16:37:41 -08:00
Raphael
55492535c6 Fix some more specs, aspects controller is green in mysql 2010-12-22 14:15:45 -08:00
zhitomirskiyi
1bc168d075 focusing a publisher on reshare 2010-12-22 09:51:50 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
danielvincent
9b6d40544c fixed _comments bug on show pages 2010-12-21 17:36:14 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
danielvincent
dae5906b6a ownership render bug fixed on photoshow 2010-12-21 16:56:32 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
maxwell
ec826e8c05 Revert "fix for js selector" 
This reverts commit 0da4466da2.
 2010-12-21 12:56:38 -08:00
maxwell
c2c6c00db8 a bad fix for a 500 on notification show when the post is deleted 2010-12-21 12:55:07 -08:00
maxwell
0da4466da2 fix for js selector 2010-12-21 12:55:07 -08:00
danielvincent
a0e85dfea2 added missing translations to photo#show 2010-12-21 12:49:40 -08:00
danielvincent
2150cb505e fixed person_photo_path 2010-12-21 12:44:33 -08:00
danielvincent
a6c5f420fa giving more pixels to photos on their show pages 2010-12-21 12:39:37 -08:00
MrZYX
e10af7fc8a made "Notifications" translatable 2010-12-21 19:18:29 +01:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
maxwell
6d4696faf0 MS DG notifications are now pretty decent 2010-12-20 18:05:31 -08:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01:00
Raphael
dcf630fd9a Request spec passes, no more scope on requests 2010-12-20 13:59:46 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
maxwell
e0883fb176 remove object_id for notifications thx sarahmei for pointing out my evil ways 2010-12-20 12:06:50 -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
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
danielvincent
6c12a4c562 photo show page shows more photo. 2010-12-19 21:53:57 -08:00
zhitomirskiyi
e3f7bd319b 25 more passing tests 2010-12-19 21:41:46 -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
Raphael
51083e9659 Another 50 passes in mysql 2010-12-19 13:57:46 -08:00
Raphael
0c67e271df Services are in mysql, contact_for and add_contact_to_aspect work again 2010-12-19 13:11:41 -08:00
Raphael
232de40457 Only service hasn't been migrated, there are a good 100 passing examples in mysql 2010-12-19 12:27:32 -08:00
MrZYX
b52718e913 small translation fix 2010-12-19 14:41:47 +01:00
MrZYX
1b6f341348 made linking more robust, this fixes #732 2010-12-19 13:49:46 +01:00
danielvincent
bb0375d2f8 uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages. 2010-12-18 22:40:42 -08:00
zhitomirskiyi
4425c3df83 reshare now works as expected opens the publisher and has the share button 2010-12-18 22:30:12 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
danielvincent
01e557ba7a put ajax:success for publisher where it belongs 2010-12-18 20:31:02 -08:00
danielvincent
d5916c9287 removed comment button from sight 2010-12-18 20:26:27 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
danielvincent
a42a773d3d dim service icons when not public. remove 'make public' label, now checkbox title. 2010-12-18 20:00:13 -08:00
danielvincent
ee9e187e5c fixed build, add photos has a solid border 2010-12-18 19:45:50 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
Raphael
36b622c998 Fix build 2010-12-18 15:22:56 -08:00
MrZYX
c3a79f7298 some fixes to translations 2010-12-18 15:25:21 +01:00
maxwell
f1ae312e75 changes for person show page 2010-12-18 02:10:00 -08:00
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
Raphael
a64fa0839f Hide notifications link until we take out queries from it 2010-12-17 20:19:02 -08:00
maxwell
427cf18324 fix birthday spec 2010-12-17 19:41:42 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
maxwell
b3c63a3cc0 you can now unset the year of your birthday" 2010-12-17 18:05:13 -08:00
maxwell
96b907122b only show profile fields if they are filled out. 2010-12-17 17:40:08 -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
Raphael
b8648f631a Use ree in the chef scripts, might revert later 2010-12-17 12:49:44 -08:00
maxwell
3c3e03993a make the two links on comment notifications clearer 2010-12-17 11:48:08 -08:00
maxwell
5763b441be fixing order of Notification.for 2010-12-17 11:37:33 -08:00
maxwell
39deac62fb in words is not a helper 2010-12-17 11:05:58 -08:00
maxwell
0bdb6aaab5 more notification stuff 2010-12-16 19:00:32 -08:00
maxwell
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
danielvincent
a41f45b846 contact count on home page 2010-12-16 18:21:06 -08:00
danielvincent
bc9352eabd fix id/string error in receive local job 2010-12-16 18:21:06 -08:00
maxwell
b8a0abd122 updating notification views 2010-12-16 18:07:43 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
danielvincent
2758ea1625 fixed issue with diaspora handles not displaying in streams 2010-12-16 17:24:25 -08:00
Raphael
4da97be84b Add benchmarks and logging to resque jobs 2010-12-16 16:48:36 -08:00
danielvincent
f3ced6d96c randomize collections of similar contacts on people#show 2010-12-16 16:37:13 -08:00
danielvincent
b4b6189321 time out a user session via devise after 10 minutes of inactivity 2010-12-16 15:50:00 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -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
f00e0ada78 do a bad thing in the helper to get comment links 2010-12-16 11:23:57 -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
cb5982704e dont url escape, xml escape 2010-12-15 17:43:46 -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
4256ea34b6 rename aspect on the aspect show page 2010-12-15 14:15:07 -08:00
maxwell
9555fae33d no notifications on retractions 2010-12-15 13:14:46 -08:00
maxwell
61b2bbbd7d Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 12:28:09 -08:00
maxwell
d5edc9b477 CGI::escaping for proper, good juju activity streams 2010-12-15 12:27:52 -08:00
zhitomirskiyi
2abcd8d147 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 12:11:58 -08:00
maxwell
a7d36615e6 adding basic notification class 2010-12-15 12:11:37 -08:00
Maxwell Salzberg
555542da31 remove extra slash 2010-12-15 12:01:20 -08:00
zhitomirskiyi
1212b34706 fadeOut on delete 2010-12-15 11:58:38 -08:00
Maxwell Salzberg
f8c2f15bb1 use the full pod_url in the template 2010-12-15 11:48:13 -08:00
Dan Hansen & Sarah Mei
82e2f23f91 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3 Fix request validations, build. 2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa added vimeo method, still needs support from lib/youtube_titles.rb. updated locales 2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88 Refactored the markdownify method. 2010-12-15 01:00:20 -05:00
danielvincent
2cf332e120 Remove sent boolean from requests, finish migration 2010-12-14 19:27:18 -08:00
danielvincent
dea8d248e2 user only pushes to non-pending contacts 2010-12-14 19:11:35 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
maxwell
d24be269f2 small refactor of admin mail. don't call deliver in the method 2010-12-14 17:36:26 -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
maxwell
c38fbd27e4 prevent gifs thru getting through javascript uploader 2010-12-14 13:31:06 -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
fd9d1332fc break service http into its own queue 2010-12-14 11:43:26 -08:00
maxwell
0bd13ec106 use blank instead of empty for the person#name helper 2010-12-14 11:30:06 -08:00
maxwell
2bc849fa90 only show permalink if the post is infact public. also, make destroy delete 2010-12-13 18:45:54 -08:00
maxwell
e3e3fd13e5 no trailing slash on pod url on login page. it just looks weird 2010-12-13 18:21:50 -08:00
zhitomirskiyi
7e3b2c6afd removed the query from the contact list partial 2010-12-13 17:53:27 -08:00
maxwell
8ba619029e adding about text on invite accept page 2010-12-13 17:24:33 -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
maxwell
c2ad170506 re add 'remember me' button 2010-12-13 17:05:35 -08:00
Raphael
d44df7e977 put remove contact link under aspect membership 2010-12-13 16:40:05 -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
maxwell
42c22cedf9 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-13 14:38:47 -08:00
maxwell
d9f25473d2 fix a bug with the notifier and attachment 2010-12-13 14:28:21 -08:00
maxwell
8eb9ab1781 making image names more generic 2010-12-13 14:02:11 -08:00
MrZYX
2ac54eeffe Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email 2010-12-13 22:48:58 +01:00
MrZYX
3a13657087 fix for #557 2010-12-13 22:23:19 +01:00