maxwell
|
34cb15c423
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-27 13:33:39 -07:00 |
|
maxwell
|
d1bac3e078
|
MS added a log route for easy access
|
2010-08-27 13:33:28 -07:00 |
|
Raphael
|
7b36ae7009
|
Move back link out of big_text
|
2010-08-27 12:28:39 -07:00 |
|
Raphael
|
7223d21721
|
Add singular move friend route, it must be eliminated later
|
2010-08-27 12:27:16 -07:00 |
|
Raphael
|
5ff1bdae90
|
Groups can now be batch edited
|
2010-08-27 12:23:20 -07:00 |
|
Raphael
|
5ef442d93f
|
RS, IZ; Socket spec now more realistic, visible_person_by_id fixed
|
2010-08-27 10:48:14 -07:00 |
|
Raphael
|
f309299e22
|
Take out remove friend button on stranger, there should be an add friend
|
2010-08-27 10:26:03 -07:00 |
|
Raphael
|
e1d6c9ce03
|
fixing person show on stranger
|
2010-08-27 10:24:42 -07:00 |
|
Raphael
|
39380c3c06
|
check if you are friends before displaying group list
|
2010-08-27 10:22:58 -07:00 |
|
Raphael
|
831609ad15
|
Make a stranger that you receive a comment from visible
|
2010-08-27 10:19:10 -07:00 |
|
Raphael
|
c629c23232
|
Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document
|
2010-08-27 10:05:14 -07:00 |
|
Raphael
|
ba4468f9cc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 19:15:42 -07:00 |
|
Raphael
|
2dd2f38442
|
Attempting to make comments from unknown users save
|
2010-08-26 19:15:22 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
5ba2fec5c5
|
Adding a .pairs file
|
2010-08-26 17:55:09 -07:00 |
|
danielvincent
|
390bf24e14
|
Don't try to put yourself in any groups
|
2010-08-26 17:34:06 -07:00 |
|
danielvincent
|
435db1ecb1
|
Pass the right url in websocketed photo json
|
2010-08-26 17:23:23 -07:00 |
|
danielvincent
|
b8fb228d2f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 17:16:48 -07:00 |
|
Raphael
|
84e2800c7d
|
added a logger statement to the diaspora person parser
|
2010-08-26 17:16:11 -07:00 |
|
danielvincent
|
007b4e4ff0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 17:10:37 -07:00 |
|
danielvincent
|
81438678cd
|
Refactored more photo js out to photos.js. That should be it for that refactor
|
2010-08-26 17:10:19 -07:00 |
|
Raphael
|
36342db7a8
|
logging statement in the user receive after parsing the person
|
2010-08-26 17:04:40 -07:00 |
|
danielvincent
|
81edef9b8a
|
Fading out every form tag on photo upload was a bad idea
|
2010-08-26 17:00:45 -07:00 |
|
Raphael
|
977786aa65
|
remove the raise from the top of user receive
|
2010-08-26 16:31:57 -07:00 |
|
Raphael
|
9d48b45ee4
|
merge conflict line
|
2010-08-26 16:28:34 -07:00 |
|
Raphael
|
3ed191e972
|
MS IZ testing on remote
|
2010-08-26 16:27:01 -07:00 |
|
Raphael
|
c3e199a00a
|
Also set object.person
|
2010-08-26 15:36:56 -07:00 |
|
danielvincent
|
dba8e2efe6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:13:48 -07:00 |
|
danielvincent
|
a886b8ddbc
|
made photos for album previews 200x200, small thumbnails now at 50x50
|
2010-08-26 15:13:33 -07:00 |
|
Raphael
|
0e36d89711
|
Also set object.person
|
2010-08-26 15:09:54 -07:00 |
|
Raphael
|
40957b5370
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:06:50 -07:00 |
|
Raphael
|
94bb754c34
|
Changed parseing person from xml a little, using it for comments.
|
2010-08-26 15:06:39 -07:00 |
|
danielvincent
|
1d515e7b7e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:02:29 -07:00 |
|
danielvincent
|
239ae048cc
|
group names are now editable
|
2010-08-26 15:02:13 -07:00 |
|
Raphael
|
1ce34bc6fc
|
Parenthases
|
2010-08-26 14:42:16 -07:00 |
|
Raphael
|
73d8317534
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 14:38:22 -07:00 |
|
Raphael
|
31f79be068
|
Save the person on receiving a comment
|
2010-08-26 14:38:06 -07:00 |
|
ilya
|
915144e08b
|
size 30 by 30
|
2010-08-26 12:32:14 -07:00 |
|
ilya
|
df74020a16
|
small thumbnail
|
2010-08-26 12:27:10 -07:00 |
|
ilya
|
3554de48d8
|
trying image url
|
2010-08-26 12:24:53 -07:00 |
|
ilya
|
1d69b88e2e
|
to id so that change of group works
|
2010-08-26 12:17:35 -07:00 |
|
Raphael
|
6a48c07c90
|
Return if nil
|
2010-08-26 12:10:22 -07:00 |
|
Raphael
|
5a92f9e8a8
|
Do some logging
|
2010-08-26 12:07:35 -07:00 |
|
Raphael
|
f3c20bf3c0
|
accept comments from strangers
|
2010-08-26 12:01:11 -07:00 |
|
Raphael
|
c7974f8046
|
Save comment's person in receive
|
2010-08-26 11:53:32 -07:00 |
|
Raphael
|
c3fe3bf443
|
RS, IZ, check against self.person, not self in user receive
|
2010-08-26 11:48:34 -07:00 |
|
Raphael
|
9f11a474d8
|
Take out some logging, put in log user on receive
|
2010-08-26 11:46:04 -07:00 |
|
Raphael
|
7feb30e3e1
|
RS, IZ, try saving the comment
|
2010-08-26 11:41:16 -07:00 |
|
Raphael
|
958627cc1c
|
RS IZ object.post
|
2010-08-26 11:32:33 -07:00 |
|
Raphael
|
a65f512fa3
|
verify post creator signature in receive
|
2010-08-26 11:29:06 -07:00 |
|
Raphael
|
f186dd98c8
|
SIGNATOR
|
2010-08-26 11:13:44 -07:00 |
|