Commit graph

2519 commits

Author SHA1 Message Date
Raphael
e406426b81 select only profile on most Person queries 2010-12-09 15:04:40 -08:00
maxwell
b54a72c240 Revert "Revert "fixed commenting bug on current user's profile page""
This reverts commit 166202d0b2.
2010-12-09 13:57:43 -08:00
maxwell
5fb782a988 added post guid for local notifications 2010-12-09 13:56:53 -08:00
maxwell
166202d0b2 Revert "fixed commenting bug on current user's profile page"
This reverts commit 8264c58e3e.
2010-12-09 13:53:23 -08:00
danielvincent
8264c58e3e fixed commenting bug on current user's profile page 2010-12-09 13:42:11 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
Raphael
b8589c457d Refactor people edit page, now using form_tag 2010-12-09 13:03:30 -08:00
zhitomirskiyi
23d2a92bf1 pushing the profile to to all the contacts 2010-12-09 11:51:35 -08:00
danielvincent
fa9caf00ca added tooltip text to public icon 2010-12-08 19:07:08 -08:00
danielvincent
aa628c090d highlight public posts in the stream 2010-12-08 18:59:02 -08:00
danielvincent
cdd225c076 don't show new comment form on a non-contact's post 2010-12-08 18:23:30 -08:00
danielvincent
faf27fe05a Merge branch 'master' of github.com:diaspora/diaspora 2010-12-08 17:06:39 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
maxwell
10df61a504 order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page 2010-12-08 16:35:48 -08:00
maxwell
e4e3a7493c fixed a bug where reshare text was truncated 2010-12-08 15:09:41 -08:00
maxwell
d6c5a88836 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-08 14:34:31 -08:00
maxwell
1f8f07f48d added slightly better error message on aspect update failure 2010-12-08 14:21:14 -08:00
maxwell
3dbb80bf9f added slightly better error message on aspect update failure 2010-12-08 14:14:49 -08:00
maxwell
f659ba58ef limit the new aspect form name to be less than 20 char in the form 2010-12-08 13:58:16 -08:00
maxwell
5f1f28923f fixed a comment counting bug, and the show_all_comments message when the comment count was three 2010-12-08 13:44:57 -08:00
danielvincent
497dcccb8f merge email and mail queues in resque 2010-12-07 23:40:07 -08:00
Hexagon
5c1c31b2b2 Final fix, really 2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00 Putting document.ready back 2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5 Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
Raphael
18319f8e42 Hopefully cut down the stream rendering time by memoizing the new comment form 2010-12-07 09:28:11 -08:00
Raphael
f421f1327c Take nested queried out of aspects manage 2010-12-07 00:21:05 -08:00
danielvincent
d3483c1cd5 forgot to remove something... 2010-12-07 00:00:34 -08:00
danielvincent
de0ecff5b7 aspects first on home contact list. 2010-12-06 23:59:16 -08:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
14a9bc02f9 Move aspect_contacts in to aspects 2010-12-06 17:20:21 -08:00
Raphael
c034113a7c Refactor to aspect partial 2010-12-06 17:20:21 -08:00
Raphael
32a2264af5 Refactor peoplecontroller index 2010-12-06 13:36:20 -08:00
danielvincent
460081bc2f don't condense comments on show pages 2010-12-05 17:21:57 -08:00
Raphael
3ef5ac5252 Add some specs to Invitation, use I18n in InvitationsController 2010-12-05 14:37:43 -08:00
Raphael
4b1c36ca04 Timestamp services 2010-12-05 14:37:00 -08:00
Raphael
5a5bd13ceb Take out extra person.save 2010-12-05 12:46:05 -08:00
MrZYX
6a4351378b fixed bug in the mailer that caused a invalid To: header in the mail 2010-12-05 20:48:18 +01:00
MrZYX
4df13d56e1 made that latest change translatable 2010-12-05 16:02:52 +01:00
MrZYX
b84b6ea9e4 some fixes to translations 2010-12-05 16:02:52 +01:00
danielvincent
e9742acc32 reverting http_post to a working state 2010-12-05 02:08:29 -08:00
danielvincent
d7407b7aa6 request -> resource 2010-12-05 02:03:03 -08:00
danielvincent
737e6084df actually setting the timeout in restclient 2010-12-05 01:54:16 -08:00
danielvincent
648614aea5 add 4 sec timeout to restclient 2010-12-05 01:26:31 -08:00
maxwell
53b38a3bca fixing p-controller for real 2010-12-05 00:52:45 -08:00
maxwell
65c22020e8 fixing photo controllers spec 2010-12-05 00:45:13 -08:00
maxwell
2c09c35425 MS DG photos now delete sm if they are empty status messages, and status messages delete their photos 2010-12-05 00:45:13 -08:00
maxwell
a415ff5c5f fixed the build. made photos dependent destroy with parent status message 2010-12-05 00:45:13 -08:00
Raphael
c320dae589 Add a cuke for being invited by someone 2010-12-05 00:15:37 -08:00
maxwell
03a5514400 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 23:06:58 -08:00
maxwell
0a8af9e72b DG MS some fixes for getting started 2010-12-04 23:05:47 -08:00