Daniel Vincent Grippi
|
7e909d4034
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 16:38:52 -07:00 |
|
Daniel Vincent Grippi
|
f9c2e0e76d
|
moved publisher down.wn. header is now a dark grey instead of black.
|
2010-08-31 13:07:11 -07:00 |
|
ilya
|
12f7d16c0b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 10:48:29 -07:00 |
|
ilya
|
98db03d36e
|
the group edit resets the data started to reset the from id attr
|
2010-08-31 10:46:49 -07: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
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -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 |
|
Daniel Grippi & Raphael Sofaer
|
cf161cb8cf
|
publisher box back up top
|
2010-08-27 16:09:10 -07:00 |
|
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 |
|
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
|
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 |
|
Raphael
|
7911357210
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 11:11:40 -07:00 |
|
Raphael
|
36f265fa2f
|
Log safely
|
2010-08-26 11:11:30 -07:00 |
|
danielvincent
|
d2b471a58d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 11:09:07 -07:00 |
|
danielvincent
|
39551a0162
|
fixed comments not showing for photos in stream
|
2010-08-26 11:08:03 -07:00 |
|
Raphael
|
a29a1bec3e
|
Add some logging to comments
|
2010-08-26 11:07:26 -07:00 |
|
Raphael
|
19e8aa5c35
|
Refactored view js
|
2010-08-26 11:06:35 -07:00 |
|
maxwell
|
9b690b863a
|
droping things
|
2010-08-25 21:53:04 -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
|
e714e0d457
|
Comment sets now pop open on receiving a new comment
|
2010-08-25 18:00:53 -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
|
3a91858bcf
|
Don't alert
|
2010-08-25 16:47:11 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
maxwell
|
c9e64ae209
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 13:54:27 -07:00 |
|
maxwell
|
6a613c3304
|
addded the draggable javascript
|
2010-08-25 13:53:53 -07:00 |
|
Raphael
|
17636f4fd2
|
View modifications, refactored stream javascript to another file
|
2010-08-25 13:51:16 -07:00 |
|
Raphael
|
3121cf57d3
|
Refactored top nav haml, added non-functional gear link next to group
|
2010-08-25 11:35:50 -07:00 |
|
danielvincent
|
8497586547
|
linked group titles on group pages
|
2010-08-25 10:09:39 -07:00 |
|
danielvincent
|
90ce31173a
|
fixed errors on album/photo pages
|
2010-08-25 09:59:18 -07:00 |
|
danielvincent
|
f4b3a2eb3a
|
more cleaning up of comment box. javascript stuff.
|
2010-08-24 20:49:32 -07:00 |
|
danielvincent
|
d87f330369
|
added titles for columns in layout
|
2010-08-24 19:46:57 -07:00 |
|
Raphael
|
f9dd462957
|
Check for current user again
|
2010-08-24 19:32:38 -07:00 |
|
Raphael
|
174dbc069b
|
Fix publisher checkboxes on index
|
2010-08-24 19:25:38 -07:00 |
|
Raphael
|
5ac5f58679
|
Tabs on the top aren't all selected on group select, some other view tweaks
|
2010-08-24 19:22:43 -07:00 |
|
Raphael
|
d3c10f8777
|
made left column in layout a little wider
|
2010-08-24 19:02:00 -07:00 |
|
Raphael
|
008c450f66
|
Add friend button resized
|
2010-08-24 18:52:50 -07:00 |
|
Raphael
|
5779610659
|
messed with the views
|
2010-08-24 18:31:16 -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 |
|
ilya
|
385472351d
|
not going through user.post
|
2010-08-24 16:25:12 -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
|
0f04cad670
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 16:05:43 -07:00 |
|
ilya
|
f5ae090e9b
|
posting empty albums to people
|
2010-08-24 16:05:29 -07:00 |
|
Raphael
|
de3044fa0a
|
Remove publisher selection remnants, fix posting
|
2010-08-24 15:55:35 -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
|
ec3d902c36
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:48:02 -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 |
|
ilya
|
f3f2eb5abf
|
Made it green now making it clean
|
2010-08-24 15:43:53 -07:00 |
|
Raphael
|
72c41a5ff8
|
User post now requires a :to field
|
2010-08-24 15:42:24 -07:00 |
|
ilya
|
1aef262165
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:24:18 -07:00 |
|
ilya
|
82d140aa80
|
trying to redeploy to get photos working
|
2010-08-24 15:23:58 -07:00 |
|
maxwell
|
92a2df5c77
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:23:02 -07:00 |
|
maxwell
|
2a28607bc6
|
Moved some prod changes into master
|
2010-08-24 15:22:48 -07:00 |
|
maxwell
|
51b2737dde
|
fixed some album stuff
|
2010-08-24 15:21:27 -07:00 |
|
maxwell
|
46f062a5f3
|
fixing merge confilts
|
2010-08-24 14:50:01 -07:00 |
|
ilya
|
19e2c8f898
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:48:41 -07:00 |
|
ilya
|
17080730f8
|
opening the file in the set photo
|
2010-08-24 14:48:26 -07:00 |
|
maxwell
|
f5316fb3c1
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:45:04 -07:00 |
|
Raphael
|
03abd1ac21
|
Remove statuS MESsages new page. TaKE New OUt OF ROutes
|
2010-08-24 14:44:32 -07:00 |
|
Raphael
|
ef9cf8fc52
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:41:04 -07:00 |
|
maxwell
|
13253d3591
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:40:50 -07:00 |
|
maxwell
|
de335e7366
|
MS messed with the temporary group picker thing: whatever, it is less annoying
|
2010-08-24 14:37:47 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
ilya
|
27de7f930a
|
forgot the backer number set photo
|
2010-08-24 14:29:05 -07:00 |
|
ilya
|
d92ae1c871
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:22:47 -07:00 |
|
ilya
|
a70132fcdc
|
IZ we update profile in zombie friends accept
|
2010-08-24 14:22:21 -07:00 |
|
maxwell
|
cc1f1e2f24
|
removed the plus button from the all people add a friend page
|
2010-08-24 14:16:54 -07:00 |
|
maxwell
|
4f63f60b03
|
MS merging, and added a dumb check for the email validating twice
|
2010-08-24 14:03:57 -07:00 |
|
maxwell
|
b4ab91043a
|
MS added check for current user
|
2010-08-24 13:45:38 -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
|
ebfe77fc6d
|
Making warzombie work again
|
2010-08-24 12:17:06 -07:00 |
|
Raphael
|
d1c540439e
|
Moved friending out to a lib file, specs all pass
|
2010-08-24 12:13:10 -07:00 |
|
danielvincent
|
c3cf135a3f
|
tabs on top
|
2010-08-24 11:33:20 -07:00 |
|
Raphael
|
b5bb61a135
|
Merging master into production
|
2010-08-24 11:18:42 -07:00 |
|
danielvincent
|
85c268b5eb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 11:12:04 -07:00 |
|
Raphael
|
fb33d955c9
|
Fix group show controller/view and haml error in nav
|
2010-08-24 11:11:25 -07:00 |
|
danielvincent
|
4ffb8e7fa3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 11:07:56 -07:00 |
|
danielvincent
|
86146d195f
|
moving stuff around to the header
|
2010-08-24 11:07:39 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -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 |
|
danielvincent
|
562656e96a
|
added edit link for group
|
2010-08-23 18:42:30 -07:00 |
|
Raphael
|
ab4ad249df
|
Forgot to return in that rescue
|
2010-08-23 17:09:20 -07:00 |
|
Raphael
|
21e2b323d0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 17:05:33 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
danielvincent
|
2b125fdc66
|
fixed left friends bar a bit
|
2010-08-23 17:00:40 -07:00 |
|
danielvincent
|
f9a19e679f
|
made header shorter
|
2010-08-23 15:27:34 -07:00 |
|
Raphael
|
dbb16faed1
|
Photo filename is now better
|
2010-08-23 15:10:19 -07:00 |
|
Raphael
|
0cff5a45a2
|
Deleting gridfs controller
|
2010-08-23 15:02:28 -07:00 |
|
Raphael
|
511f571ae5
|
Specs mostly pass again
|
2010-08-23 15:01:39 -07:00 |
|
Raphael
|
48959b3ded
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:45:20 -07:00 |
|
Raphael
|
76f2aa98ac
|
Push to multiple groups
|
2010-08-23 14:45:13 -07:00 |
|
danielvincent
|
fb7e945fc2
|
removed useless if/else
|
2010-08-23 14:19:16 -07:00 |
|
danielvincent
|
60b7c30a8a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:17:26 -07:00 |
|
danielvincent
|
d874ba3b38
|
dropdown menu for user
|
2010-08-23 14:17:05 -07:00 |
|
Raphael
|
5a02f92448
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 13:58:46 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
danielvincent
|
d9c091d3f8
|
search box in top nav
|
2010-08-23 12:43:12 -07:00 |
|
Raphael
|
0092069372
|
Take signed in check out of websocket js
|
2010-08-23 11:57:29 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
danielvincent
|
37a67b29a4
|
left/right arrow keys on photo show page go to prev/next
|
2010-08-23 11:22:55 -07:00 |
|
danielvincent
|
2355947d8e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 11:05:36 -07:00 |
|
danielvincent
|
2d21ac0460
|
moving things around
|
2010-08-23 11:05:28 -07:00 |
|
Raphael
|
dc1dd07720
|
Don't crash on requesting a non-existent email address
|
2010-08-23 11:04:57 -07:00 |
|
Raphael
|
364cdfed22
|
Allowed email checking no longer so ridiculous
|
2010-08-23 10:20:19 -07:00 |
|
Raphael
|
15b2c23b51
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-23 09:50:38 -07:00 |
|
maxwell
|
361adda6cd
|
added group picker. sends the right params, but posts only have one group right now so thats a bummer
|
2010-08-22 22:20:34 -07:00 |
|
ilya
|
643c52fd62
|
making a clear text on the user index page
|
2010-08-19 18:10:55 -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
|
501d62f215
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 14:13:27 -07:00 |
|
ilya
|
f7608f6292
|
RS IZ trying to create user through instantiate in seed script
|
2010-08-19 14:12:52 -07:00 |
|
danielvincent
|
36b2445a11
|
added title to search page
|
2010-08-19 13:41:48 -07:00 |
|
maxwell
|
35f6856380
|
MS search and index works
|
2010-08-19 12:40:50 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
maxwell
|
c98c52ad14
|
MS IZ renamed the array
|
2010-08-19 12:17:29 -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
|
2e463c0e69
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:23:48 -07:00 |
|
ilya
|
9b47e67a15
|
call the right method in before_validation_on_create
|
2010-08-19 10:23:40 -07:00 |
|
maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
maxwell
|
8131e413a4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 22:59:18 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -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
|
7ce8f94d58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:10:48 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
ilya
|
36c06349c5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 20:59:18 -07:00 |
|
ilya
|
284601c6b1
|
got moved photo.image.stuff to photo.url[:stuff]
|
2010-08-18 20:59:01 -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 |
|
Raphael
|
0459631d47
|
Show debug
|
2010-08-18 20:49:06 -07:00 |
|
ilya
|
3243435015
|
the album create doesn't crash the app
|
2010-08-18 20:14:31 -07:00 |
|