maxwell
|
919d7d23c0
|
MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays
|
2010-09-06 17:46:09 +02:00 |
|
Daniel Vincent Grippi
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -07:00 |
|
Daniel Grippi
|
de8450c7c5
|
line spacing adjustments.
|
2010-08-29 23:04:28 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
5babda044d
|
cleaned up group controller. added custom as_json to group model.
|
2010-08-29 21:56:10 -07:00 |
|
Raphael
|
b85333e52b
|
error.new
|
2010-08-28 18:36:49 -07:00 |
|
Raphael
|
d25e6017e3
|
Make a couple of generic errors ArgumentError
|
2010-08-28 14:53:08 -07:00 |
|
Raphael
|
aa22a0d5c8
|
Removing unused method
|
2010-08-28 14:38:22 -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
|
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 |
|
danielvincent
|
435db1ecb1
|
Pass the right url in websocketed photo json
|
2010-08-26 17:23:23 -07:00 |
|
Raphael
|
36342db7a8
|
logging statement in the user receive after parsing the person
|
2010-08-26 17:04:40 -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 |
|
Raphael
|
0e36d89711
|
Also set object.person
|
2010-08-26 15:09:54 -07:00 |
|
Raphael
|
94bb754c34
|
Changed parseing person from xml a little, using it for comments.
|
2010-08-26 15:06:39 -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
|
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 |
|
Raphael
|
36f265fa2f
|
Log safely
|
2010-08-26 11:11:30 -07:00 |
|
Raphael
|
a29a1bec3e
|
Add some logging to comments
|
2010-08-26 11:07:26 -07:00 |
|
Raphael
|
6d3d37b7c6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:20:37 -07:00 |
|
Raphael
|
ad67798004
|
User to_id on groups_with_post
|
2010-08-25 18:15:38 -07:00 |
|
maxwell
|
a26229223c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:07:49 -07:00 |
|
maxwell
|
b4174c664e
|
you can now reassign a peson's group
|
2010-08-25 18:07:31 -07:00 |
|
Raphael
|
50459d896c
|
Socket received comments
|
2010-08-25 17:34:12 -07:00 |
|
Raphael
|
00f8a3e628
|
removed ensure_bson in user. added to_id method to String and ObjectID classes
|
2010-08-25 17:11:57 -07:00 |
|
maxwell
|
22f63a4c44
|
MS IZ added the move friend method
|
2010-08-25 16:58:07 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
Raphael
|
559b6cd02f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 17:43:35 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
maxwell
|
326f17567e
|
bad signature valid hack
|
2010-08-24 17:34:13 -07:00 |
|
Raphael
|
41aa8ed10e
|
Specs pass again, need to make albums have a group
|
2010-08-24 17:12:27 -07:00 |
|
Raphael
|
c102e81b03
|
put the visible back in
|
2010-08-24 16:56:04 -07:00 |
|
maxwell
|
68bd5bf5f5
|
MS merging in master again
|
2010-08-24 16:21:20 -07:00 |
|
ilya
|
9db4838543
|
collecting the ids
|
2010-08-24 16:15:59 -07:00 |
|
ilya
|
f5ae090e9b
|
posting empty albums to people
|
2010-08-24 16:05:29 -07:00 |
|
Raphael
|
10bd40d1a2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:49:04 -07:00 |
|
Raphael
|
abafa03e92
|
Spec for posting to no group
|
2010-08-24 15:48:51 -07:00 |
|
maxwell
|
204c910f66
|
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
|
2010-08-24 15:47:44 -07:00 |
|
Raphael
|
72c41a5ff8
|
User post now requires a :to field
|
2010-08-24 15:42:24 -07:00 |
|
maxwell
|
46f062a5f3
|
fixing merge confilts
|
2010-08-24 14:50:01 -07:00 |
|
maxwell
|
f5316fb3c1
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:45:04 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
maxwell
|
4f63f60b03
|
MS merging, and added a dumb check for the email validating twice
|
2010-08-24 14:03:57 -07:00 |
|
Raphael
|
abf48cefd4
|
Putting back in both generate_key
|
2010-08-24 13:41:09 -07:00 |
|
Raphael
|
2814dfceb7
|
Deleted the wrong generate_key
|
2010-08-24 13:40:36 -07:00 |
|
Raphael
|
d1c540439e
|
Moved friending out to a lib file, specs all pass
|
2010-08-24 12:13:10 -07:00 |
|
Raphael
|
b5bb61a135
|
Merging master into production
|
2010-08-24 11:18:42 -07:00 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
maxwell
|
f172c9e1d2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 18:45:31 -07:00 |
|
maxwell
|
a37b5ae09b
|
IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method
|
2010-08-23 18:45:20 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
Raphael
|
511f571ae5
|
Specs mostly pass again
|
2010-08-23 15:01:39 -07:00 |
|
Raphael
|
76f2aa98ac
|
Push to multiple groups
|
2010-08-23 14:45:13 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
Raphael
|
364cdfed22
|
Allowed email checking no longer so ridiculous
|
2010-08-23 10:20:19 -07:00 |
|
Raphael
|
8e253a6d49
|
Left in a merge marker
|
2010-08-19 16:20:38 -07:00 |
|
Raphael
|
f66b5f4006
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/controllers/users_controller.rb
app/models/user.rb
config/sprinkle/provision.rb
|
2010-08-19 16:09:08 -07:00 |
|
ilya
|
7eb1bb5a00
|
removing the sanity check
|
2010-08-19 14:36:15 -07:00 |
|
ilya
|
542c1769f9
|
doing a sanity check, that not requiring serialized key passes the validation
|
2010-08-19 14:25:34 -07:00 |
|
ilya
|
f7608f6292
|
RS IZ trying to create user through instantiate in seed script
|
2010-08-19 14:12:52 -07:00 |
|
maxwell
|
02da9bf634
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 12:00:21 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
ilya
|
b723c5997e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:49:18 -07:00 |
|
ilya
|
54afb1bad4
|
Rolling assign_key into setup_person
|
2010-08-19 10:49:04 -07:00 |
|
maxwell
|
9942aef5d4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:46:58 -07:00 |
|
maxwell
|
5d25861dc6
|
IZ MS person profile page now displays only posts a user can see
|
2010-08-19 10:46:47 -07:00 |
|
ilya
|
9b47e67a15
|
call the right method in before_validation_on_create
|
2010-08-19 10:23:40 -07:00 |
|
ilya
|
9e78c9b64c
|
removing setup person
|
2010-08-18 21:58:29 -07:00 |
|
ilya
|
0a3277d306
|
maybe the instantiate method will help
|
2010-08-18 21:51:51 -07:00 |
|
ilya
|
0f6ec71dcd
|
we need assign key as well
|
2010-08-18 21:45:41 -07:00 |
|
ilya
|
0c9f041f28
|
we need do bad things in the user for seeding the database
|
2010-08-18 21:42:37 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
Raphael
|
701bec670f
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 20:50:28 -07:00 |
|
ilya
|
ef15cddf19
|
RS, IZ a slash
|
2010-08-18 18:13:17 -07:00 |
|
ilya
|
5cae2b21b1
|
RS, IZ fixed the url for the image
|
2010-08-18 18:06:13 -07:00 |
|
ilya
|
f6892b88d6
|
photo.remote_photo is relative
|
2010-08-18 17:50:13 -07:00 |
|
ilya
|
76b4b55e98
|
Added spec for remote photo url setting to photos
|
2010-08-18 17:39:38 -07:00 |
|
ilya
|
4019e4425a
|
Checking for failing to set url in photo
|
2010-08-18 17:12:28 -07:00 |
|
ilya
|
b279d6582b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:59:52 -07:00 |
|
ilya
|
803de25cc0
|
DG IZ albums are now posts
|
2010-08-18 16:59:19 -07:00 |
|
Raphael
|
5a2b42e4e5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:37:12 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|