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 |
|
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 |
|
ilya
|
516a667ce4
|
going back to showing the first group on the index page
|
2010-08-18 16:35:11 -07:00 |
|
ilya
|
5de9362933
|
DG IZ setting group id to nil and changing the deploy script for renaming of the repo
|
2010-08-18 16:27:08 -07:00 |
|
ilya
|
d0b2a23fcb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:17:00 -07:00 |
|
ilya
|
21f70c643d
|
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
|
2010-08-18 16:15:10 -07:00 |
|
Raphael
|
ac694eda8c
|
A bunch of dumb checks to make the group index publisher pass tests
|
2010-08-18 15:42:06 -07:00 |
|
ilya
|
1ab21fe8b1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 15:25:23 -07:00 |
|
ilya
|
08739ad23d
|
DG IZ; retractions remove post references in group objects
|
2010-08-18 15:23:46 -07:00 |
|
Raphael
|
70247f987b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-18 15:04:30 -07:00 |
|
Raphael
|
a52077b176
|
Redirect to the group you put someone in after adding them as friends
|
2010-08-18 14:57:53 -07:00 |
|
Raphael
|
61c906a9d3
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 14:45:41 -07:00 |
|
Raphael
|
f570199d17
|
Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly
|
2010-08-18 14:30:16 -07:00 |
|
Raphael
|
0cc5cc5487
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/user.rb
|
2010-08-18 12:20:07 -07:00 |
|
ilya
|
034755368b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-18 12:17:23 -07:00 |
|
Raphael
|
9b2f2bbddf
|
Move socketing out to method from receive
|
2010-08-18 12:14:47 -07:00 |
|
ilya
|
f5811df5b7
|
DG IZ; added info text to add new friend button
|
2010-08-18 11:59:20 -07:00 |
|
Raphael
|
5e439bdb28
|
Ensure_bson on groups_with_person
|
2010-08-18 11:56:11 -07:00 |
|
Raphael
|
b7d648e173
|
Validate presence of name on group
|
2010-08-18 11:54:44 -07:00 |
|
Raphael
|
4cd46abaac
|
render nothing at the top
|
2010-08-18 11:48:32 -07:00 |
|
Raphael
|
10aef7a0a3
|
Begin rescue on publics controller to make the post for nonexistent user error more readable
|
2010-08-18 11:46:28 -07:00 |
|
ilya
|
4d86933f4a
|
DG IZ; user's visible posts method queries group objects for their posts
|
2010-08-18 11:40:02 -07:00 |
|
Raphael
|
d640c0672f
|
switch deploy branch to actually be one we are working on
|
2010-08-18 10:56:09 -07:00 |
|
ilya
|
055c222fc2
|
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
|
2010-08-18 10:53:43 -07:00 |
|
ilya
|
b0088c73d8
|
DG IZ; user's own post gets referenced in group model
|
2010-08-18 10:37:33 -07:00 |
|
Raphael
|
1685e0c28b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-18 10:13:25 -07:00 |
|
Raphael
|
045878de64
|
call ensure_bson once in visible_person_by_id and group_by_id
|
2010-08-18 10:12:22 -07:00 |
|
Raphael
|
b99a86e6bd
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-18 10:10:20 -07:00 |
|
Raphael
|
9a188fd9f0
|
Don't try to unsocket albums
|
2010-08-18 10:08:38 -07:00 |
|
Raphael
|
36f8289522
|
Fixing retractions on albums, adding back remove_from_view
|
2010-08-18 10:03:37 -07:00 |
|
danielvincent
|
2409fd3f20
|
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
|
2010-08-18 02:40:53 -07:00 |
|
Raphael
|
539316a235
|
Removing posts relation from person
|
2010-08-17 23:50:07 -07:00 |
|
Raphael
|
98a0a3032a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 23:28:00 -07:00 |
|
Raphael
|
42cc1da9f6
|
Removing posts array from person
|
2010-08-17 23:27:17 -07:00 |
|
ilya
|
501bcdd197
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 23:25:33 -07:00 |
|
ilya
|
c501707f80
|
DG IZ posts_for to visible posts
|
2010-08-17 23:24:42 -07:00 |
|
Raphael
|
4a4686ce6e
|
refactored signature validation got specs passing
|
2010-08-17 23:21:00 -07:00 |
|
ilya
|
55b4d4758f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
|
2010-08-17 22:58:46 -07:00 |
|
Raphael
|
cb152ea3c3
|
Shortened user receive, moderated groups.first in the socketing
|
2010-08-17 22:34:01 -07:00 |
|
Raphael
|
55d84b3288
|
Broke up user spec, put user update back in routes
|
2010-08-17 22:03:45 -07:00 |
|
Raphael
|
82f53663ab
|
remove user index
|
2010-08-17 20:39:05 -07:00 |
|
Raphael
|
9285839296
|
Merging in socket-group
|
2010-08-17 20:30:30 -07:00 |
|
Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
9fcc02a580
|
Ensure bson on visible person
|
2010-08-17 19:56:21 -07:00 |
|
Raphael
|
9f9395bc9c
|
visible_person_by_id should check against self.person.id
|
2010-08-17 19:51:29 -07:00 |
|
Raphael
|
456e9e9634
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-17 19:34:19 -07:00 |
|
Raphael
|
48756e77f3
|
Friend_by_id changed to visible_person_by_id
|
2010-08-17 19:32:42 -07:00 |
|
Raphael
|
eb84b39f93
|
change before to after
|
2010-08-17 19:11:59 -07:00 |
|
Raphael
|
e8e141b24e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 19:04:03 -07:00 |
|
Raphael
|
2b8e637934
|
no names in publisher
|
2010-08-17 19:03:47 -07:00 |
|
Raphael
|
f75ff0b680
|
Remove links from publisher
|
2010-08-17 18:57:26 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
Raphael
|
4fe6a54c09
|
seed groups
|
2010-08-17 18:54:27 -07:00 |
|
Raphael
|
1c91faa2c5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 18:52:35 -07:00 |
|
Raphael
|
43160496c9
|
Tommy
|
2010-08-17 18:52:15 -07:00 |
|
Raphael
|
d554b3ef1a
|
flashsocket
|
2010-08-17 18:49:23 -07:00 |
|
ilya
|
2614cb5add
|
DG IZ; find_all_by instead of find_by
|
2010-08-17 18:37:08 -07:00 |
|
Raphael
|
ffc9b00489
|
taking group seed out
|
2010-08-17 18:35:33 -07:00 |
|
Raphael
|
07549ed17e
|
Start with a group'
|
2010-08-17 18:30:08 -07:00 |
|
Raphael
|
8619584834
|
things mostly working
|
2010-08-17 18:27:50 -07:00 |
|
ilya
|
f4f377e7e7
|
DG IZ finding albums by person_id
|
2010-08-17 18:26:48 -07:00 |
|
ilya
|
daf08cd9f9
|
DG IZ posts by the user get websocketed on the group page and albums
get signed?
|
2010-08-17 18:06:35 -07:00 |
|
Raphael
|
6901b4f83e
|
Devise routes
|
2010-08-17 17:54:20 -07:00 |
|
Raphael
|
7186f3537a
|
Move back paragraph tag in confirmations view
|
2010-08-17 17:48:00 -07:00 |
|
ilya
|
f15b3c46b2
|
DG IZ; reverted to before removing latest message methods
|
2010-08-17 17:40:48 -07:00 |
|
Raphael
|
bb85c46be1
|
syntax error
|
2010-08-17 17:28:17 -07:00 |
|
Raphael
|
244023ac47
|
Infield labels on sign in
|
2010-08-17 17:26:37 -07:00 |
|
Raphael
|
6f24a454c8
|
merge
|
2010-08-17 17:23:37 -07:00 |
|
Raphael
|
fb84daf68a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 17:21:38 -07:00 |
|
Raphael
|
1aefaedda1
|
merge
|
2010-08-17 17:21:10 -07:00 |
|
Raphael
|
08de5caf97
|
make signup page look better
|
2010-08-17 17:20:29 -07:00 |
|
ilya
|
054dafdf99
|
couple more
|
2010-08-17 17:16:11 -07:00 |
|
ilya
|
c1ff8544d3
|
removed a couple of js lines
|
2010-08-17 17:04:37 -07:00 |
|
ilya
|
e5036862f6
|
DG IZ removed the latest message javascript as well as the hash
|
2010-08-17 16:49:58 -07:00 |
|
Raphael
|
26a892ab4c
|
putting email verification back in
|
2010-08-17 16:43:54 -07:00 |
|
ilya
|
d211abb1bc
|
DG IZ on page for group js method now returns true
|
2010-08-17 16:32:14 -07:00 |
|
ilya
|
d5d1a2d00f
|
DG IZ; javascript variable misnamed
|
2010-08-17 16:29:51 -07:00 |
|
Raphael
|
ba83cb9d29
|
Index on email
|
2010-08-17 16:24:52 -07:00 |
|
ilya
|
5e95650ae3
|
DG IZ logger info
|
2010-08-17 16:11:25 -07:00 |
|
ilya
|
f70cf4a60a
|
DG IZ first group for now, added logging statements
|
2010-08-17 16:09:55 -07:00 |
|
ilya
|
7d68089c8b
|
DG IZ using group_id when passing the id around the app
|
2010-08-17 16:02:12 -07:00 |
|
ilya
|
87bc9dad1d
|
DG IZ added group id to the action hash
|
2010-08-17 15:27:12 -07:00 |
|
Raphael
|
88cb7aaa8b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 14:52:17 -07:00 |
|
ilya
|
fd539926c2
|
DG IZ; changed variable 'c' to 'comment'
|
2010-08-17 13:59:58 -07:00 |
|
Raphael
|
063164fea2
|
comma
|
2010-08-17 13:59:57 -07:00 |
|
Raphael
|
0fdb337076
|
Confirmable
|
2010-08-17 13:57:45 -07:00 |
|
ilya
|
b5c6bbd1df
|
DG IZ; moved commenting methods into User (from Person).
|
2010-08-17 13:56:52 -07:00 |
|
Raphael
|
771c594814
|
Take out pivotal only for a second
|
2010-08-17 13:49:18 -07:00 |
|
Raphael
|
e6768cb5c8
|
helper method
|
2010-08-17 13:21:29 -07:00 |
|
Raphael
|
1d6e132a9f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 13:07:26 -07:00 |
|
Raphael
|
d5c608c7ae
|
Removing welcome home line
|
2010-08-17 13:07:11 -07:00 |
|
Raphael
|
842b321dfa
|
User email checking, routes working again
|
2010-08-17 13:02:42 -07:00 |
|
ilya
|
2a90e59f1e
|
DG IZ the group should view the posts for the group (and yourself) w
|
2010-08-17 12:22:14 -07:00 |
|
ilya
|
2af41a0ea9
|
DG IZ; posts_for :group method in User
|
2010-08-17 12:14:02 -07:00 |
|
Raphael
|
ccbbf40584
|
validation lambda out to method
|
2010-08-17 11:48:59 -07:00 |
|
Raphael
|
015940b60e
|
Pass to the lambda
|
2010-08-17 11:45:47 -07:00 |
|
ilya
|
4f8b8ad3c5
|
DG IZ saving the post
|
2010-08-17 11:03:31 -07:00 |
|
Raphael
|
453cb06691
|
changing settings and deploy scripts, validating email
|
2010-08-17 11:01:30 -07:00 |
|
ilya
|
7316c6073c
|
DG IZ local person bug
|
2010-08-17 10:58:50 -07:00 |
|
ilya
|
0af6f7b0e5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:48:47 -07:00 |
|
ilya
|
5dff3369ad
|
DG IZ; removed puts statements.
|
2010-08-17 10:48:40 -07:00 |
|
ilya
|
a9c9619a54
|
DG IZ; posting from a user includes adding to the many posts association in said user
|
2010-08-17 10:43:18 -07:00 |
|
Raphael
|
72559cbce1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:37:18 -07:00 |
|
Raphael
|
50919ef491
|
Requesting now searches the local server by email for a matching person.
|
2010-08-17 10:37:09 -07:00 |
|
ilya
|
5761d5db36
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:35:37 -07:00 |
|
ilya
|
dea6551374
|
DG IZ; moved post() into User from Person.
|
2010-08-17 10:35:25 -07:00 |
|
Raphael
|
e32315b6c6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:25:11 -07:00 |
|
Raphael
|
2c1c5df281
|
Moved search specs, renamed method
|
2010-08-17 10:24:59 -07:00 |
|
ilya
|
fc7f59bdfc
|
DG IZ stream for the current user's posts
|
2010-08-17 10:13:23 -07:00 |
|
danielvincent
|
7e5ace7cbc
|
minor cleanup in models
|
2010-08-16 22:44:22 -07:00 |
|
ilya
|
1d92d11841
|
DG IZ; user refs are incremented as well as decremented for Posts
|
2010-08-16 20:39:24 -07:00 |
|
ilya
|
74c70d9410
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/user.rb
spec/lib/diaspora_parser_spec.rb
|
2010-08-16 18:18:30 -07:00 |
|
ilya
|
b5594ad6bc
|
DG IZ; post user refs started (permissions)
|
2010-08-16 18:11:23 -07:00 |
|
Raphael
|
eae4053902
|
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
|
2010-08-16 17:23:54 -07:00 |
|
Raphael
|
fbee1aabb1
|
Special casing comments from people that you are not friends with so it accepts them
|
2010-08-16 16:32:20 -07:00 |
|
Raphael
|
3ff4387cd8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-16 16:22:55 -07:00 |
|
Raphael
|
ad07521e07
|
Made a few more tests pass
|
2010-08-16 16:22:46 -07:00 |
|
ilya
|
b3d8f59c77
|
removed many posts association within group model
|
2010-08-16 15:51:31 -07:00 |
|
Raphael
|
3a591b0713
|
Merging in friend-refactor...
|
2010-08-16 15:35:14 -07:00 |
|
ilya
|
16a4cbc4e2
|
DG IZ redirect to requests on error
|
2010-08-16 15:21:45 -07:00 |
|
Raphael
|
6bb8c52dc4
|
Syntax error in requests
|
2010-08-16 15:16:29 -07:00 |
|
ilya
|
7e7b71efd4
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 15:08:36 -07:00 |
|
ilya
|
33ed838b79
|
DG IZ added an error message on request delete
|
2010-08-16 15:08:05 -07:00 |
|
Raphael
|
2e3066d82d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 15:04:20 -07:00 |
|
Raphael
|
b0537e2f34
|
Comments pushing in the right directions
|
2010-08-16 15:04:09 -07:00 |
|
ilya
|
4a36df29e5
|
DG IZ now the links are of button style
|
2010-08-16 14:59:23 -07:00 |
|
ilya
|
92aa72447f
|
DG IZ fixed the css in selector
|
2010-08-16 14:57:30 -07:00 |
|
ilya
|
373321beef
|
DG IZ made the selector box going to the right thing by passing only the id
|
2010-08-16 14:52:59 -07:00 |
|
ilya
|
97e5468cea
|
adding the user to the correct group
|
2010-08-16 14:46:15 -07:00 |
|
ilya
|
6a3eb97fd4
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 14:43:13 -07:00 |
|
ilya
|
b1c29083df
|
changed the link data-method
|
2010-08-16 14:34:16 -07:00 |
|
Raphael
|
fa2e621b0f
|
Syntax error
|
2010-08-16 14:24:30 -07:00 |
|
Raphael
|
e4af2ccb1f
|
Rename send_comment to dispatch_comment, simplify it
|
2010-08-16 14:22:14 -07:00 |
|
Raphael
|
71aaa9240c
|
only socket if the object isn't yours
|
2010-08-16 14:18:08 -07:00 |
|
Raphael
|
b463958f0d
|
Check ownership on the comment's post
|
2010-08-16 14:06:52 -07:00 |
|
Raphael
|
deeb4832c1
|
Error: insufficient parenthases
|
2010-08-16 14:02:26 -07:00 |
|
Raphael
|
1f40ea23b6
|
logging is awesome
|
2010-08-16 13:58:05 -07:00 |
|
Raphael
|
91b0a1e8f9
|
PAAAARSER
|
2010-08-16 13:51:49 -07:00 |
|
Raphael
|
f8e2e6bf2d
|
Infinite loops are the best
|
2010-08-16 13:49:48 -07:00 |
|
Raphael
|
598c646b07
|
Hack to get comments working for now
|
2010-08-16 12:56:02 -07:00 |
|
Raphael
|
e2d5bf909f
|
Call right method in dev_utilities, clear junk out of comments helper
|
2010-08-16 12:45:31 -07:00 |
|
Raphael
|
1f0ca49ce5
|
url, not user.url
|
2010-08-16 12:29:26 -07:00 |
|
Raphael
|
fb8d3b3e85
|
Check for local person before destroying accepted request
|
2010-08-16 12:26:15 -07:00 |
|
Raphael
|
d7a9c3c087
|
Take out another couple friends.first and replace with friend_by_id
|
2010-08-16 12:18:36 -07:00 |
|
Raphael
|
4f22222b30
|
Splitting accept_friend_request into two methods
|
2010-08-16 12:10:23 -07:00 |
|
ilya
|
2bc9d0156d
|
2 arguments in the hidden field
|
2010-08-16 11:59:13 -07:00 |
|
Raphael
|
b37b8303d3
|
Check for friending yourself in requests helper
|
2010-08-16 11:55:32 -07:00 |
|
ilya
|
9df38199ab
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 11:50:51 -07:00 |
|
Raphael
|
00a9bd820b
|
Parser confused :(
|
2010-08-16 11:50:43 -07:00 |
|
ilya
|
122da43058
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 11:50:04 -07:00 |
|
Raphael
|
a8b402636a
|
Shorten ensure_bson
|
2010-08-16 11:47:23 -07:00 |
|
Raphael
|
f4d6a04f4f
|
Get objects by bson id
|
2010-08-16 11:46:36 -07:00 |
|
ilya
|
0ee03afe1d
|
DG IZ selector box on request page
|
2010-08-16 11:39:33 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
6ae4c31e05
|
Person show should be scoped through user
|
2010-08-16 11:18:52 -07:00 |
|
Raphael
|
99fb383dc0
|
BSONify ids in by_id methods
|
2010-08-16 11:13:00 -07:00 |
|
Raphael
|
eb793ea129
|
Took out a couple more references to User.owner
|
2010-08-16 11:07:18 -07:00 |
|
Raphael
|
3efa36587a
|
Took out a bunch of user.owner references
|
2010-08-16 11:01:58 -07:00 |
|
Raphael
|
26abc68236
|
Use group_by_id or friend_by_id, no querying on friends or groups
|
2010-08-16 10:50:38 -07:00 |
|
Raphael
|
0e67ef8d7e
|
Inspect the friend before calling unfriended by
|
2010-08-16 10:38:36 -07:00 |
|
Raphael
|
ad2d8f8b46
|
Specify id field in the query whose result is passed to unfriended_by
|
2010-08-16 10:37:07 -07:00 |
|
Raphael
|
e84b25b3f5
|
Log the xml again
|
2010-08-16 10:31:39 -07:00 |
|
ilya
|
053ed9176d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 10:00:25 -07:00 |
|
ilya
|
d0c02859e6
|
DG IZ got one more log statement in the user person retraction
|
2010-08-16 10:00:04 -07:00 |
|
danielvincent
|
f1f827120b
|
intentional failing test in user for tomorrow.
|
2010-08-15 21:03:19 -07:00 |
|
danielvincent
|
80b81c1ae1
|
comment now validates presence of text. also, removed unused method overriding ==.
|
2010-08-15 19:28:59 -07:00 |
|
danielvincent
|
18cd4b858a
|
broke out group index and show
|
2010-08-14 00:27:43 -07:00 |
|
danielvincent
|
c81ea5a632
|
minor changes
|
2010-08-14 00:21:10 -07:00 |
|
danielvincent
|
a7eab9e50c
|
minor section header tweaks (album stuff)
|
2010-08-13 23:20:39 -07:00 |
|
ilya
|
22910ef4ce
|
Check retraction signature on person retraction
|
2010-08-13 19:09:55 -07:00 |
|
ilya
|
99c8869b8f
|
Removing a friend now deletes them from the group(s) they are in
|
2010-08-13 18:56:33 -07:00 |
|
ilya
|
ac40f7974e
|
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
|
2010-08-13 18:37:09 -07:00 |
|
ilya
|
bd271b7bec
|
RS, IZ; Refactored the user unfriend and unfriended_by
|
2010-08-13 17:33:26 -07:00 |
|
ilya
|
c1d2f271d9
|
RS, IZ; close the file after writing the backer number
|
2010-08-13 12:43:27 -07:00 |
|
ilya
|
7e377fc292
|
RS, IZ; adding set backer number to routes, not authenticating it
|
2010-08-13 12:37:49 -07:00 |
|
ilya
|
23c57c653f
|
RS, IZ; Trying to speed up cap db reset
|
2010-08-13 12:34:24 -07:00 |
|
ilya
|
5c9a96d245
|
That last commit was dumb, including the right module
|
2010-08-13 12:11:10 -07:00 |
|
ilya
|
0b23b959b4
|
Adding parser methods to devutilities, these should probably be in controller helpers
|
2010-08-13 12:06:29 -07:00 |
|
ilya
|
99eec04265
|
Using webfinger in dev_utilities
|
2010-08-13 11:59:54 -07:00 |
|
ilya
|
339f1a65e2
|
Removing friends check on zombiefriends
|
2010-08-13 11:50:43 -07:00 |
|
ilya
|
085dd61607
|
RS, IZ; changed zombiefriends to use webfinger
|
2010-08-13 11:43:30 -07:00 |
|
ilya
|
ef97b4f19d
|
RS, IZ; updated DB seed to have a group, zombiefriend with a group
|
2010-08-13 11:36:59 -07:00 |
|
ilya
|
7bd1193c5e
|
RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions
|
2010-08-13 11:19:20 -07:00 |
|
ilya
|
1fcb033b68
|
RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass
|
2010-08-13 10:55:18 -07:00 |
|
ilya
|
23fc799b4d
|
Turning up logging on friend request receive
|
2010-08-13 10:04:33 -07:00 |
|
ilya
|
af6c70db47
|
RS, IZ; hack to test requests, accepted friends go into the first group.
|
2010-08-13 09:56:18 -07:00 |
|
ilya
|
3d57fb7f78
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-13 09:47:29 -07:00 |
|
ilya
|
5e33de7e56
|
unfriended method in the user
|
2010-08-13 09:47:08 -07:00 |
|
danielvincent
|
64c7a87aeb
|
removed two bogus lines from user.receive
|
2010-08-13 08:57:22 -07:00 |
|
danielvincent
|
3d12e9ab51
|
DG RS; friending through groups
|
2010-08-12 21:30:16 -07:00 |
|
ilya
|
26bebbe393
|
MS IZ changing it back
|
2010-08-12 10:04:56 -07:00 |
|
ilya
|
9bec1131f6
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-12 10:03:51 -07:00 |
|
danielvincent
|
f7e43ee3d0
|
photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...
|
2010-08-12 00:27:26 -07:00 |
|
danielvincent
|
013a6d0849
|
add photo is now in a fancy-pancy box
|
2010-08-11 20:45:57 -07:00 |
|
ilya
|
352b9f65e0
|
MS IZ unfriending maybe works
|
2010-08-11 20:23:28 -07:00 |
|
danielvincent
|
97b04fc0d7
|
nevermind
|
2010-08-11 20:12:10 -07:00 |
|
danielvincent
|
3e1081acaa
|
commented out tinyMCE js for the time being
|
2010-08-11 20:09:16 -07:00 |
|
Raphael
|
8b51f94d1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 18:13:38 -07:00 |
|
Raphael
|
eb36190188
|
DG, RS; Albums create failure prettier
|
2010-08-11 18:13:23 -07:00 |
|
ilya
|
283b4a40b5
|
IZ MS tests now pass
|
2010-08-11 17:51:46 -07:00 |
|
ilya
|
b0455b9532
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 17:45:13 -07:00 |
|
ilya
|
dd3fb1677b
|
MS IZ continuiung to squash failing tests
|
2010-08-11 17:44:43 -07:00 |
|
Raphael
|
a19e29f2c2
|
RS, DG; Album.mine_or_friends actually fixed
|
2010-08-11 17:33:37 -07:00 |
|
Raphael
|
144d673dac
|
DG, RS; album button looks better
|
2010-08-11 17:16:20 -07:00 |
|
Raphael
|
3d46a49b97
|
RS, DG; fixing Album.mine_or_friends
|
2010-08-11 16:50:22 -07:00 |
|
Raphael
|
cf5476f601
|
RS, DG; stop crashing trying to socket albums
|
2010-08-11 16:40:08 -07:00 |
|
Raphael
|
ab25e35a71
|
Comment guids now serialize
|
2010-08-11 16:31:12 -07:00 |
|
Raphael
|
d8959326d5
|
RS, DG; unsocketing is back in
|
2010-08-11 16:24:05 -07:00 |
|
Raphael
|
4b5071ec05
|
DG, RS; socketing back in for your own posts
|
2010-08-11 16:12:55 -07:00 |
|
Raphael
|
2d14f64745
|
RS, DG; Socketing moved to user
|
2010-08-11 16:10:27 -07:00 |
|
Raphael
|
0907d7a9fd
|
RS, DG; Cleaned up the switch in user.receive
|
2010-08-11 16:01:16 -07:00 |
|
Raphael
|
bee71c5a23
|
RS, DG; All saving moved to user
|
2010-08-11 15:22:06 -07:00 |
|
Raphael
|
c6a620c7dd
|
RS, DG; store_from_xml is gone, use user.receive
|
2010-08-11 15:05:05 -07:00 |
|
Raphael
|
5228e51262
|
RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated.
|
2010-08-11 14:40:48 -07:00 |
|
Raphael
|
5abd604dad
|
RS, DG; build_xml_for has been eliminated.
|
2010-08-11 14:21:53 -07:00 |
|
Raphael
|
d7828a8bf3
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
spec/controllers/publics_controller_spec.rb
|
2010-08-11 13:59:21 -07:00 |
|
Raphael
|
9c9ebbf4c7
|
build_xml_for is no longer static, we should probably change the name
|
2010-08-11 13:58:18 -07:00 |
|
ilya
|
29b1217fcd
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 12:29:35 -07:00 |
|
ilya
|
11a8b8f3d4
|
MS IZ testing many the friend request user methods
|
2010-08-11 12:28:48 -07:00 |
|
Raphael
|
599d1da620
|
Moved socket code out to lib, unsocketing from view should now work again
|
2010-08-11 12:03:26 -07:00 |
|
Raphael
|
144e9ed439
|
Bookmarks now clean link in instantiate, posting them should work right again
|
2010-08-11 11:18:40 -07:00 |
|
Raphael
|
683bb0dbef
|
Took out create redirects on ajaxy things, authenticating statusmessages
|
2010-08-11 10:52:01 -07:00 |
|
Raphael
|
355aba75df
|
RS, DG; removing the last link_to_person
|
2010-08-11 10:02:45 -07:00 |
|
Raphael
|
f73c5c6a05
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 18:08:37 -07:00 |
|
Raphael
|
cc070ba168
|
RS, DG; Removed fancybox gone mad from photo adder
|
2010-08-10 18:08:27 -07:00 |
|
Raphael
|
a201390123
|
DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken
|
2010-08-10 17:59:22 -07:00 |
|
maxwell
|
1683370da5
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 17:36:54 -07:00 |
|
maxwell
|
a45d852f30
|
MS IZ request specs now PASS
|
2010-08-10 17:36:25 -07:00 |
|
Raphael
|
bd7ce5250f
|
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
|
2010-08-10 17:14:58 -07:00 |
|
Raphael
|
4b102de1db
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:56:42 -07:00 |
|
Raphael
|
37bf5b45f1
|
RS, DG; You now can't open the photo upload form while photos are uploading
|
2010-08-10 16:56:19 -07:00 |
|
Raphael
|
3104eeebc9
|
RS, DG; Photo websocket margins fixed
|
2010-08-10 16:40:25 -07:00 |
|
maxwell
|
b9718c079b
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:05:10 -07:00 |
|
maxwell
|
8a3eb9f6cf
|
IZ MS one last receive url...i think...
|
2010-08-10 16:04:08 -07:00 |
|
Raphael
|
a9ebe44b1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:03:54 -07:00 |
|
Raphael
|
0fb55be7a0
|
RS, DG; You can now sign up to be a user on a seed
|
2010-08-10 16:03:38 -07:00 |
|
maxwell
|
89c54d1a63
|
MS IZ receive url in the request and a slash in person
|
2010-08-10 15:56:34 -07:00 |
|
Raphael
|
8b9cd3453d
|
RS, DG; User.instatntiate simplified
|
2010-08-10 15:44:14 -07:00 |
|
maxwell
|
432ce02a14
|
MS IZ receive url is better
|
2010-08-10 15:35:40 -07:00 |
|
Raphael
|
a8b77cf868
|
DG RS; made an instantiate method for user which makes a person and profile
|
2010-08-10 15:35:27 -07:00 |
|
maxwell
|
da4de20ce1
|
IZ MS made things push to the receive url
|
2010-08-10 15:24:51 -07:00 |
|
maxwell
|
487de2d865
|
MS IZ receive, not recieve
|
2010-08-10 15:17:12 -07:00 |
|
maxwell
|
7ff25ef81a
|
MS IZ saved the person model
|
2010-08-10 15:10:11 -07:00 |
|
maxwell
|
016c8fa471
|
MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up
|
2010-08-10 14:11:41 -07:00 |
|
maxwell
|
b5f962c725
|
trying root path in host meta
|
2010-08-10 13:58:17 -07:00 |
|
maxwell
|
0ffe893f8a
|
MS IZ merging diffs
|
2010-08-10 12:37:04 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
Raphael
|
aa1f892c35
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 12:27:02 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -07:00 |
|
maxwell
|
95c4de5d6c
|
MS IZ fixed all of the request specs zomg
|
2010-08-10 11:26:32 -07:00 |
|
Raphael
|
b645eb3f3d
|
RS, DG, comments socket again
|
2010-08-10 11:05:29 -07:00 |
|
Raphael
|
aa4d428ab7
|
RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in =>
|
2010-08-10 11:02:04 -07:00 |
|
Raphael
|
4308f35b4b
|
Changed partial on request index
|
2010-08-10 10:18:16 -07:00 |
|
Raphael
|
d1bedeb993
|
RS, DG; don't show the group-specific nav if there is no group
|
2010-08-10 10:11:13 -07:00 |
|
maxwell
|
d7d9c8aac5
|
MS put some current users checks into a single one
|
2010-08-09 21:30:56 -07:00 |
|
danielvincent
|
4e062c143b
|
new album partial has a title. album title is in italics in new photo partial
|
2010-08-09 21:29:19 -07:00 |
|
danielvincent
|
d207c8b955
|
fixed way too high z-index in album div
|
2010-08-09 21:27:17 -07:00 |
|
danielvincent
|
988eea4215
|
fixed comment view bug
|
2010-08-09 21:21:35 -07:00 |
|
danielvincent
|
36adf1b6fd
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 21:10:31 -07:00 |
|
maxwell
|
9d41ed3ef1
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 21:10:14 -07:00 |
|
danielvincent
|
96fa34ea60
|
changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.
|
2010-08-09 21:10:11 -07:00 |
|
maxwell
|
38abd51666
|
MS IZ fixed a couple of failing specs in the parser
|
2010-08-09 21:09:51 -07:00 |
|
danielvincent
|
fd8d92a095
|
moved next/prev links in photo show to be inline with full size link.
|
2010-08-09 20:23:01 -07:00 |
|
danielvincent
|
d712218a14
|
removed commented out stuff on photo_new partial. also, fixed the delete button in photo show.
|
2010-08-09 20:18:20 -07:00 |
|
danielvincent
|
acd00c2a59
|
fixed top right buttons on album page, etc. also, made the image loader simpler.
|
2010-08-09 20:14:03 -07:00 |
|
maxwell
|
68c4de6c16
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 19:05:12 -07:00 |
|
Raphael
|
91b42ac0e2
|
Specs now mostly pass again, one is failing
|
2010-08-09 18:06:09 -07:00 |
|
Raphael
|
744693e7fb
|
RS, DG; There is now a add friend box on the front page that passes group idto the app
|
2010-08-09 17:33:54 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
838fec4921
|
RS, DG; Working on group nav, fixed some stuff in photo
|
2010-08-09 16:34:06 -07:00 |
|
Raphael
|
02f66d4c0e
|
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 15:59:23 -07:00 |
|
Raphael
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -07:00 |
|
Raphael
|
d71966476b
|
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
Conflicts:
app/views/albums/show.html.haml
app/views/authors/show.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
|
2010-08-09 15:09:05 -07:00 |
|
Raphael
|
039ec0d06e
|
warzombie is now more friendly
|
2010-08-09 15:05:54 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
59147eb232
|
Person.new in dev seed
|
2010-08-09 13:03:27 -07:00 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
maxwell
|
82578ad80c
|
MS IZ doing the friend querying correctly in user
|
2010-08-09 12:25:36 -07:00 |
|
maxwell
|
4243d8efca
|
MS IZ using the particular user's friends in the send_friend_request_to
|
2010-08-09 12:19:26 -07:00 |
|
maxwell
|
ac7530d17f
|
MS IZ person doesn't have friends user does
|
2010-08-09 11:51:32 -07:00 |
|
maxwell
|
f4428679ef
|
First attempt at fixing warzombie friendingw
|
2010-08-09 11:44:13 -07:00 |
|
maxwell
|
921ee029b6
|
MS IZ putting the person in the return trip
|
2010-08-09 11:12:15 -07:00 |
|
maxwell
|
8532be1307
|
MS IZ moved activate_friend to user
|
2010-08-09 11:03:16 -07:00 |
|
maxwell
|
67843a21e2
|
MS IZ saving the person in accept of FR
|
2010-08-09 10:50:49 -07:00 |
|
Raphael
|
0a40efdaf7
|
Removing unused messages
|
2010-08-09 10:47:45 -07:00 |
|
Raphael
|
73a6cd911b
|
DG, RS; User person delegation fixed
|
2010-08-09 10:46:02 -07:00 |
|
maxwell
|
544f7f08e5
|
MS IZ doesn't delete from pending friends since there is nothing in it
|
2010-08-09 10:38:13 -07:00 |
|
maxwell
|
7be374ac48
|
MS IZ fixed a couple of view things as well as the dev db seed script
|
2010-08-09 10:10:41 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
ilya
|
719bf450e1
|
I can't get no satisfaction from get satisfaction
|
2010-08-08 20:54:50 -07:00 |
|
ilya
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -07:00 |
|
maxwell
|
f4ca29da41
|
PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names...
|
2010-08-06 17:19:33 -07:00 |
|
Raphael
|
214685e5a9
|
Dev seed might now work
|
2010-08-06 17:11:50 -07:00 |
|
Raphael
|
7076097ee4
|
RS, IZ; The tests are green.
|
2010-08-06 16:56:13 -07:00 |
|
maxwell
|
58de12df5e
|
DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)
|
2010-08-06 16:35:02 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|
Raphael
|
f2e327d908
|
User factory now works
|
2010-08-06 13:27:42 -07:00 |
|
Raphael
|
0f596af5c4
|
Refactored message_queue getting, fixed retraction spec
|
2010-08-06 13:13:00 -07:00 |
|
Raphael
|
d130b82e42
|
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
|
2010-08-06 11:52:33 -07:00 |
|
danielvincent
|
6f1a596dff
|
small color changes
|
2010-08-06 00:40:44 -07:00 |
|
danielvincent
|
c54d47337b
|
updated button style
|
2010-08-06 00:15:22 -07:00 |
|
Raphael
|
b5cbfab36e
|
RS, IZ; Comment spec now passes
|
2010-08-05 19:01:45 -07:00 |
|
maxwell
|
5d924dadf4
|
MS DG; 19 failing specs left
|
2010-08-05 17:16:51 -07:00 |
|
maxwell
|
dc0eb7de51
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-05 15:13:59 -07:00 |
|
maxwell
|
5e6d0c1153
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into
friend-refactor, also fixed more specs
Conflicts:
app/models/person.rb
app/models/user.rb
spec/factories.rb
|
2010-08-05 15:13:05 -07:00 |
|
Raphael
|
bffb63d9f0
|
IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml
|
2010-08-05 14:39:48 -07:00 |
|
danielvincent
|
dae8f26692
|
DG MS; fixed most photo specs
|
2010-08-05 11:56:37 -07:00 |
|
Raphael
|
bb66e87905
|
RS, IZ; Encryption specs now pass with openssl
|
2010-08-05 11:56:31 -07:00 |
|
Raphael
|
f8e7d3f313
|
RS, IZ; Rolling back special casing of friend-request
|
2010-08-05 11:14:40 -07:00 |
|
Raphael
|
2429a1a476
|
RS, IZ; keys should roxml
|
2010-08-05 11:13:38 -07:00 |
|
Raphael
|
ebe14b5afd
|
RS, IZ; Not using person in friend request verification
|
2010-08-05 11:09:36 -07:00 |
|
Raphael
|
f487e271c0
|
RS, IZ; Posts now sign, signatures and keys now serialize
|
2010-08-05 10:43:02 -07:00 |
|
danielvincent
|
4827953bec
|
DG MS; person specs are now passing. retraction on unfriend is now uncommented
|
2010-08-05 10:29:30 -07:00 |
|
danielvincent
|
42c0b82068
|
one failing test in Person. i have no idea.
|
2010-08-04 23:54:15 -07:00 |
|
danielvincent
|
d6bc93fb96
|
commented out retraction on unfriending due to ROXML messing things up
.
|
2010-08-04 23:47:27 -07:00 |
|
ilya
|
4a3f6b2986
|
need to serialize key to bson
|
2010-08-04 21:08:25 -07:00 |
|
ilya
|
f11e973602
|
added the inport key thing in user
|
2010-08-04 20:44:18 -07:00 |
|
ilya
|
5dfc097c88
|
replaced the functionality with openssl, didn't do the encryption spec
|
2010-08-04 20:32:15 -07:00 |
|
danielvincent
|
f2d7f35b84
|
unfriend still not removing association from bad_friend
|
2010-08-04 20:29:54 -07:00 |
|
danielvincent
|
7a556e1b3c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-04 19:23:56 -07:00 |
|
danielvincent
|
c92a225556
|
DG MS; user-person relationship done. bunch of failing stuff.
|
2010-08-04 19:22:14 -07:00 |
|
Raphael
|
6832c67a78
|
RS IZ friend requests are hopefully now signed
|
2010-08-04 17:20:34 -07:00 |
|
Raphael
|
7676179e54
|
IZ, RS; now passing correct object to verify_signature
|
2010-08-04 17:10:38 -07:00 |
|
Raphael
|
5a802299d5
|
IZ, RS; Retractions should now be signed
|
2010-08-04 17:06:15 -07:00 |
|
Raphael
|
2388237174
|
RS, IZ; Replace type_name method with object.class.to_s
|
2010-08-04 16:36:08 -07:00 |
|
Raphael
|
b8a2e8ecdf
|
RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific
|
2010-08-04 16:13:32 -07:00 |
|
Raphael
|
e2c0ae2cee
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-04 16:01:37 -07:00 |
|
Raphael
|
c245d8c60c
|
Merging ostatus deletion with selenium start
|
2010-08-04 16:01:19 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
danielvincent
|
09958bc207
|
DG MS; removed delete friend button from current user's show page
|
2010-08-04 15:43:24 -07:00 |
|
danielvincent
|
278189462b
|
fixed ostatus generator references in models
|
2010-08-04 09:59:15 -07:00 |
|
danielvincent
|
c5ace3069d
|
diaspora module correctly loads everything (lazy)
|
2010-08-04 00:41:23 -07:00 |
|
danielvincent
|
c78b111fec
|
Merge branch 'master' into group-top
|
2010-08-03 16:42:33 -07:00 |
|
Raphael
|
e3c28c4fee
|
Fixed Photos, and Carrierwave initializer
|
2010-08-02 21:31:14 -07:00 |
|
Raphael
|
da3bf35d81
|
Typo in album
|
2010-08-02 18:30:09 -07:00 |
|
Raphael
|
6b1f020839
|
Moved utilities out to special controller, took pound sign out of database name
|
2010-08-02 18:03:16 -07:00 |
|
danielvincent
|
5030fbb8b5
|
Merge branch 'master' into group-top
|
2010-08-02 17:28:17 -07:00 |
|
danielvincent
|
3d5f27fe5a
|
javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing
|
2010-08-02 17:27:45 -07:00 |
|
Raphael
|
74691228d3
|
RS, IZ; All relevant controllers now create with user.post
|
2010-08-02 16:32:52 -07:00 |
|
danielvincent
|
102b912878
|
moved group nav to its own partial
|
2010-08-02 16:20:30 -07:00 |
|
Raphael
|
9fe37b1d8c
|
RS, IZ; Cleaned up user spec, started to add current_user.post
|
2010-08-02 16:16:23 -07:00 |
|
danielvincent
|
3e5cecd532
|
Merge branch 'master' into group-top
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-08-02 16:09:13 -07:00 |
|
Raphael
|
d503c6541f
|
RS; posted statuses now use the websocket to update latest, time is now styled right
|
2010-08-02 11:13:21 -07:00 |
|
Raphael
|
b8ae6b44a2
|
RS; Image filename is now the Photo model id
|
2010-08-02 10:05:34 -07:00 |
|
danielvincent
|
5974bf3571
|
group nav is now links to nothing
|
2010-08-01 23:26:24 -07:00 |
|
danielvincent
|
19b633d3a3
|
top nav for groups partially there.
|
2010-08-01 22:26:56 -07:00 |
|
Raphael
|
c95ceecf9e
|
Clarified socket helper, added a selenium test
|
2010-07-30 12:40:02 -07:00 |
|
Raphael
|
6fe00982f2
|
RS, IZ, fixing another error on person show
|
2010-07-30 10:32:36 -07:00 |
|
Raphael
|
0fd35709b1
|
RS, IZ, fixing error on person show with no posts
|
2010-07-30 10:26:00 -07:00 |
|
Raphael
|
e7ef3c06ed
|
Websocketed photos now fade in
|
2010-07-30 10:20:50 -07:00 |
|
ilya
|
3eeb81ad34
|
DG IZ; time_created_at uses published_at instead of created_at for OstatusPost
|
2010-07-29 20:43:03 -07:00 |
|
ilya
|
f191aef981
|
DG IZ profile profile photos should update, removed the scaled down hack
|
2010-07-29 19:44:58 -07:00 |
|
ilya
|
abc5ee412d
|
DG IZ assiging the new profile to the person in the parse objects from xml
|
2010-07-29 19:24:52 -07:00 |
|
ilya
|
0aa268a62d
|
DG IZ trying asymetric searization and marshaling
|
2010-07-29 19:12:20 -07:00 |
|
ilya
|
27bf29119d
|
restoring display inline
|
2010-07-29 18:03:18 -07:00 |
|
ilya
|
085ea0a665
|
RS, IZ, DG Removing display inline
|
2010-07-29 17:59:44 -07:00 |
|
ilya
|
f6495e2bec
|
RS IZ photos now fade in on the album upload page
|
2010-07-29 17:26:05 -07:00 |
|
maxwell
|
6aa1fa1826
|
DG MS profiles send? who knows...
|
2010-07-29 15:53:38 -07:00 |
|
Raphael
|
a636d97837
|
Removed crash if there was no latest status message
|
2010-07-29 14:38:46 -07:00 |
|
Raphael
|
3376057c33
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 13:58:49 -07:00 |
|
danielvincent
|
11a099914c
|
on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited.
|
2010-07-29 11:07:44 -07:00 |
|
danielvincent
|
fd4475370d
|
added profile url to author show page
|
2010-07-29 10:30:24 -07:00 |
|
maxwell
|
cb3d6db9b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 10:06:11 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -07:00 |
|
ilya
|
c8b40001e5
|
IZ album edit page was not added
|
2010-07-28 21:10:35 -07:00 |
|
Raphael
|
1e954eae4f
|
took out old puts, put in new one
|
2010-07-28 20:37:42 -07:00 |
|
maxwell
|
6a8291b56f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-28 18:35:06 -07:00 |
|
maxwell
|
049361ea15
|
MS profiles should send, need to just make the parser now
|
2010-07-28 18:32:00 -07:00 |
|
ilya
|
96a9c9455d
|
DG IZ; make photos in stream larger, because they need love too
|
2010-07-28 17:46:43 -07:00 |
|
ilya
|
6f3e7bc78b
|
DG IZ; minor tweaks
|
2010-07-28 17:31:05 -07:00 |
|
ilya
|
acb295d695
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-28 17:05:14 -07:00 |
|
ilya
|
03cf61bd7c
|
new user top bar
|
2010-07-28 17:04:56 -07:00 |
|
maxwell
|
e14e391a22
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-28 16:50:48 -07:00 |
|
maxwell
|
80db1132d1
|
Fixed the tests;
|
2010-07-28 16:50:38 -07:00 |
|
ilya
|
1700ce8e18
|
DG IZ; tweaks to album index page
|
2010-07-28 16:12:49 -07:00 |
|
ilya
|
3f27e1f67d
|
DG IZ photo spacing now works
|
2010-07-28 14:48:28 -07:00 |
|
ilya
|
5723d91dae
|
DG IZ; moved some buttons around, added album edit page
|
2010-07-28 14:00:02 -07:00 |
|
ilya
|
9e3c6a0936
|
DG IZ; brushed up ostatus user page
|
2010-07-28 12:13:36 -07:00 |
|
maxwell
|
eb4262dfc7
|
MS merged master
|
2010-07-28 11:13:17 -07:00 |
|
danielvincent
|
e2b5af35c1
|
minute changes
|
2010-07-28 00:04:43 -07:00 |
|
maxwell
|
a57727c1fc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 16:18:59 -07:00 |
|
maxwell
|
c41dea1e8b
|
MS small profile tweaks
|
2010-07-27 16:18:46 -07:00 |
|
danielvincent
|
7992b1b0e0
|
delete photo button on photo show page instead of delete album.
|
2010-07-27 16:10:42 -07:00 |
|
danielvincent
|
fdd1a5d93b
|
more recovery
|
2010-07-27 16:04:59 -07:00 |
|
maxwell
|
92cc48beaf
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 15:52:50 -07:00 |
|
maxwell
|
3cecbf1511
|
MS profile page fixes
|
2010-07-27 15:52:42 -07:00 |
|
danielvincent
|
34291340b2
|
trying to get back up to speed
|
2010-07-27 15:50:44 -07:00 |
|
maxwell
|
9dd5c08296
|
fixed two small UI bugs
|
2010-07-27 14:45:04 -07:00 |
|
maxwell
|
86e090bac3
|
MS figured out moz gradient business
|
2010-07-27 14:34:16 -07:00 |
|
maxwell
|
9c7b3f0c07
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 14:23:44 -07:00 |
|
maxwell
|
bdca2348a6
|
MS IZ profile page has more useful info, but ultimatly kinda ugly
|
2010-07-27 14:23:31 -07:00 |
|
danielvincent
|
d4ac19e9ce
|
all form buttons are now using button definition in UI
|
2010-07-27 12:23:21 -07:00 |
|
danielvincent
|
dbc8f0112e
|
some misc design cleanup. album page toggle pending.
|
2010-07-27 12:12:25 -07:00 |
|
danielvincent
|
97daaf81c2
|
made custom css3 buttons (pending FF compatability; works in webkit for now.)
|
2010-07-26 21:48:02 -07:00 |
|
maxwell
|
bda87bbeab
|
MS switched request new links to just the request link
|
2010-07-26 18:13:20 -07:00 |
|
maxwell
|
d73d36f162
|
MS i had broke atom generation in my refactor. now it is fixed
|
2010-07-26 17:39:48 -07:00 |
|
danielvincent
|
9afb8beb25
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-26 17:04:00 -07:00 |
|
danielvincent
|
ec59b89e83
|
DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page
|
2010-07-26 16:57:44 -07:00 |
|
maxwell
|
a9b1954ff6
|
MS status message now updates the big one on the index page...hooray for jquery
|
2010-07-26 16:27:10 -07:00 |
|
danielvincent
|
f6687316d6
|
DG IZ; only a remote scaled photo is downloaded, not the full res
|
2010-07-26 16:08:19 -07:00 |
|
danielvincent
|
65acd48885
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-26 15:52:02 -07:00 |
|
danielvincent
|
36abb19e2c
|
added the uploading photo wjava script
|
2010-07-26 15:50:41 -07:00 |
|
maxwell
|
88c83bb028
|
MS added pagination to the author show page
|
2010-07-26 15:15:42 -07:00 |
|
maxwell
|
47f5c77e1a
|
kinda prettied up the albums page
|
2010-07-26 15:09:02 -07:00 |
|
maxwell
|
d7550568ad
|
added pagination to photo picker on the user profile. still ugly, less sucky
|
2010-07-26 13:55:44 -07:00 |
|
maxwell
|
0c2fc54c0f
|
MS we didnt serialize the post creator sig....sigh.... this could not be the problem
|
2010-07-26 13:29:39 -07:00 |
|
Maxwell Salzberg
|
66f66b85a6
|
MS added test, things still seem broken though
|
2010-07-24 23:21:02 -07:00 |
|
maxwell
|
b797704a14
|
MS small pointless webhooks refactor
|
2010-07-24 16:11:32 -07:00 |
|
maxwell
|
416f128ba8
|
MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module
|
2010-07-24 15:48:42 -07:00 |
|
maxwell
|
2cbdc5413f
|
MS nuked some random non helpful puts statements
|
2010-07-24 12:12:48 -07:00 |
|
danielvincent
|
261a7d177d
|
fixed for real
|
2010-07-24 11:09:25 -07:00 |
|
danielvincent
|
926eacc588
|
mend
|
2010-07-24 10:37:35 -07:00 |
|
danielvincent
|
03e06cb279
|
person sidebar has a view all; displays user images with names in tooltips instead of text
|
2010-07-24 10:24:43 -07:00 |
|
maxwell
|
9095a06738
|
MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok
|
2010-07-24 01:56:07 -07:00 |
|
maxwell
|
c9709dd1e7
|
MS put current status back on page
|
2010-07-24 01:39:15 -07:00 |
|
maxwell
|
8a174d37c7
|
MS trying a dan-like thing in the publisher
|
2010-07-23 23:56:41 -07:00 |
|
danielvincent
|
4c3a51833f
|
user name is bigger
|
2010-07-23 22:35:12 -07:00 |
|
danielvincent
|
4d2b11310b
|
nudged layout
|
2010-07-23 21:34:47 -07:00 |
|
maxwell
|
302cf54fab
|
MS subscribers should now unsubscribe
|
2010-07-23 21:31:28 -07:00 |
|
maxwell
|
c34f5e5ee0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 21:20:05 -07:00 |
|
maxwell
|
311a60f7b7
|
MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller
|
2010-07-23 21:16:36 -07:00 |
|
danielvincent
|
e5d298040d
|
little things
|
2010-07-23 21:11:21 -07:00 |
|
danielvincent
|
f6fd6bc9e6
|
added breadcrumb to albums
|
2010-07-23 20:28:10 -07:00 |
|
danielvincent
|
7eb59a654c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 20:12:37 -07:00 |
|
danielvincent
|
d93c331615
|
moved publisher
|
2010-07-23 20:12:28 -07:00 |
|
ilya
|
2fa9462e05
|
Next and Previous for photos buttions are now in the center
|
2010-07-23 20:09:52 -07:00 |
|
danielvincent
|
b63b7fe482
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 19:44:41 -07:00 |
|
danielvincent
|
ad61c290fb
|
took current user's name out of the layout
|
2010-07-23 19:44:34 -07:00 |
|
maxwell
|
00159d1fb8
|
MS minor defaults change
|
2010-07-23 18:17:48 -07:00 |
|
ilya
|
8793709284
|
No file is now complained about in the view
|
2010-07-23 16:57:34 -07:00 |
|
ilya
|
61a9ba7a6e
|
put album owner on unless mine
|
2010-07-23 16:36:59 -07:00 |
|
ilya
|
48975cc59e
|
put album owner on album show page
|
2010-07-23 16:33:10 -07:00 |
|
ilya
|
4eccf63fef
|
Can't upload to other people's album
|
2010-07-23 16:26:05 -07:00 |
|
ilya
|
1c0d5f6e6b
|
Removing destroy link from albums that are not yours
|
2010-07-23 16:07:15 -07:00 |
|
ilya
|
79aa12ee67
|
RS IZ Removing the destroy link from photos
|
2010-07-23 15:59:42 -07:00 |
|
ilya
|
f866872d7a
|
now should be saving to the directory without the wrong id in the name
|
2010-07-23 15:49:08 -07:00 |
|
ilya
|
031234f763
|
Failing at syntax
|
2010-07-23 15:42:12 -07:00 |
|
ilya
|
bb251e73b3
|
Logging photo.inspect after save
|
2010-07-23 15:37:07 -07:00 |
|
ilya
|
e754e97c7e
|
Logging for the differing id problem in remote photos
|
2010-07-23 15:32:27 -07:00 |
|
ilya
|
2f35d07807
|
Broke photo signing
|
2010-07-23 15:22:04 -07:00 |
|
ilya
|
e43f54cc72
|
RS IZ remote photo url does not change on marshaling'
|
2010-07-23 15:13:40 -07:00 |
|
ilya
|
1b32afc78f
|
Switching to Grid_FS, correctly
|
2010-07-23 14:53:12 -07:00 |
|
ilya
|
283bbc4850
|
Switching to Grid_FS
|
2010-07-23 14:32:55 -07:00 |
|
Raphael
|
d8ebbf8d26
|
Adding some logging to requesting/subscribing
|
2010-07-23 14:20:02 -07:00 |
|
ilya
|
a52adba95b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 11:59:31 -07:00 |
|
ilya
|
082274d0d7
|
RS IZ a nicer fail(notice) on wrong file format on upload
|
2010-07-23 11:59:04 -07:00 |
|
Raphael
|
473662a265
|
Layout false on hubub controller
|
2010-07-23 11:50:14 -07:00 |
|
maxwell
|
e0baf9d6c5
|
MS sort the updates on a author's page
|
2010-07-22 23:36:37 -07:00 |
|
maxwell
|
dfad30e33b
|
MS typo
|
2010-07-22 22:34:30 -07:00 |
|
maxwell
|
3e3fcc57f9
|
MS author author?
|
2010-07-22 22:32:47 -07:00 |
|
maxwell
|
1f414c9347
|
MS so close to subscribing to tantek
|
2010-07-22 22:30:08 -07:00 |
|
maxwell
|
7ba85e0d4e
|
MS tantek?
|
2010-07-22 22:22:08 -07:00 |
|
maxwell
|
8c50ea0c97
|
MS i really wanna subscribe to tantek
|
2010-07-22 22:14:06 -07:00 |
|
maxwell
|
0fdce91756
|
DG MS added views for ostatus following
|
2010-07-22 21:27:43 -07:00 |
|
maxwell
|
3f4219cf94
|
added debugging stuff to index page for ostatus stuffs
|
2010-07-22 20:19:52 -07:00 |
|
maxwell
|
16bbce3054
|
DG MS ostatus post and author now exsist
|
2010-07-22 20:16:24 -07:00 |
|
maxwell
|
c5bcab94e1
|
DG MS...dumb, forgot to call it in the controller
|
2010-07-22 17:11:44 -07:00 |
|
maxwell
|
82e61ff99d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-22 13:53:46 -07:00 |
|
maxwell
|
b3668956ab
|
MS DG following now works on identica, you subscribe, and then identica spams you for the rest of your life
|
2010-07-22 13:53:39 -07:00 |
|
ilya
|
7df902b9db
|
XML reader was assuming photos were local
|
2010-07-22 12:39:53 -07:00 |
|
ilya
|
065c790e4e
|
not saving in photo receive and logging the saving in common
|
2010-07-22 12:23:18 -07:00 |
|
ilya
|
a1a8fc1ea4
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-22 12:07:36 -07:00 |
|
ilya
|
b2dcaed5e2
|
RS IZ saving in the photo parsing
|
2010-07-22 12:07:18 -07:00 |
|
maxwell
|
daf0de2eb0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus
|
2010-07-22 11:54:07 -07:00 |
|
ilya
|
b90cb95c64
|
RS IZ the photo controller now uses instantiate
|
2010-07-22 11:41:00 -07:00 |
|
ilya
|
24f8b33f2f
|
Tests all pass!
|
2010-07-22 11:36:36 -07:00 |
|
ilya
|
773dbd91aa
|
RS IZ one more test passing going to bisect
|
2010-07-22 10:21:10 -07:00 |
|
ilya
|
8d87f07d31
|
using owner instead of first user
|
2010-07-22 09:55:13 -07:00 |
|
maxwell
|
6869384732
|
i think it works - max
|
2010-07-21 21:15:16 -07:00 |
|
ilya
|
14533f6534
|
url not path
|
2010-07-21 21:13:31 -07:00 |
|
maxwell
|
9b1fcdbab2
|
MS DG some serious message handler and user request API stuff....needs way more tests
|
2010-07-21 20:33:43 -07:00 |
|
ilya
|
a222edc646
|
Url not path
|
2010-07-21 20:22:30 -07:00 |
|
ilya
|
ef7b9f58a7
|
IZ remote files
|
2010-07-21 19:51:34 -07:00 |
|
ilya
|
a75dfb0201
|
Album retractions
|
2010-07-21 18:27:18 -07:00 |
|
ilya
|
6b9a3fc518
|
Pushing Albums out
|
2010-07-21 18:26:03 -07:00 |
|
ilya
|
5a5842dbdc
|
Accidently started websocketing albums
|
2010-07-21 18:22:57 -07:00 |
|
ilya
|
a6104fd2b5
|
RS, IZ; Albums must be pushed
|
2010-07-21 18:07:38 -07:00 |
|
ilya
|
606fa3353c
|
RS, IZ; Photos might push urls to friends
|
2010-07-21 18:02:13 -07:00 |
|
maxwell
|
0d268905e7
|
DG MS all photos of a album are destroyed on album deletion
|
2010-07-21 17:05:40 -07:00 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
maxwell
|
3cee09407c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:47:46 -07:00 |
|
maxwell
|
6f7f82e818
|
added helpers for photo show page
|
2010-07-21 15:47:30 -07:00 |
|
Raphael
|
9b4d92e1fa
|
trying to patch relationship controller
|
2010-07-21 15:36:14 -07:00 |
|
maxwell
|
a5f359ef1b
|
MS DG added a safe for viewing photosize
|
2010-07-21 15:08:00 -07:00 |
|
maxwell
|
0f407b11ed
|
MS DG comments now work on photo show page; full size photos now available
|
2010-07-21 14:58:06 -07:00 |
|
maxwell
|
6410b68ea4
|
added correct path to ignore for uploads
|
2010-07-21 14:31:08 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
danielvincent
|
d5c28eb9a6
|
album photos as links were too janky; removed
|
2010-07-21 00:42:41 -07:00 |
|
danielvincent
|
5fc2dfa0bb
|
delete links removed from album index
|
2010-07-21 00:40:57 -07:00 |
|
danielvincent
|
aece0fc1c7
|
removed duplications used for testing
|
2010-07-21 00:32:38 -07:00 |
|
danielvincent
|
c01e9846cf
|
began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere
|
2010-07-21 00:24:11 -07:00 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
maxwell
|
f07740454a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 19:30:28 -07:00 |
|
danielvincent
|
249948a500
|
hotfix for photos/collection relationship to fix photo saving
|
2010-07-20 19:29:19 -07:00 |
|
maxwell
|
dac3c7a8de
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 16:22:08 -07:00 |
|
maxwell
|
933bf61db8
|
RS, MS, relationship_flow returns the action and the url to execute it to
|
2010-07-20 16:15:36 -07:00 |
|
danielvincent
|
51fd87db36
|
no ideas why collection saving isn't working...
|
2010-07-20 15:15:11 -07:00 |
|
ilya
|
1bd2c16ef1
|
DG IZ started the collection spec
|
2010-07-20 14:01:56 -07:00 |
|
Raphael
|
afc150c719
|
Reverting reverrsion
|
2010-07-20 11:56:11 -07:00 |
|
Raphael
|
382caf7adc
|
Reverting last commit
|
2010-07-20 11:53:13 -07:00 |
|
Raphael
|
7b6289c78a
|
Took label out of publisher for photo
|
2010-07-20 11:52:38 -07:00 |
|
ilya
|
715a6ae770
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:50:45 -07:00 |
|
ilya
|
7901791ee3
|
DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.
|
2010-07-20 11:50:36 -07:00 |
|
maxwell
|
453d2ee827
|
RS MS fail. totally made a new bug and fixed it re: resizing
|
2010-07-20 11:50:23 -07:00 |
|
maxwell
|
d420652311
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:41:56 -07:00 |
|
maxwell
|
e856945a94
|
RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page.
|
2010-07-20 11:41:50 -07:00 |
|
Raphael
|
8e8c48eac9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:31:51 -07:00 |
|
Raphael
|
d8cbbcf6c8
|
Added photo file validation spec
|
2010-07-20 11:31:41 -07:00 |
|
Raphael
|
de3a08d031
|
Took out putses
|
2010-07-20 10:23:19 -07:00 |
|
ilya
|
e08ed8805f
|
DG IZ photo upload form now with all the others
|
2010-07-20 10:00:02 -07:00 |
|
danielvincent
|
55710ffbdb
|
image uploader does two thumbnails
|
2010-07-17 21:10:21 -07:00 |
|
maxwell
|
ec3f6e6765
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-17 19:22:26 -07:00 |
|
danielvincent
|
c53efbe56f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/post.rb
|
2010-07-17 19:00:53 -07:00 |
|
Raphael
|
bb21361a6b
|
Photo controller fixed
|
2010-07-17 18:13:51 -07:00 |
|
maxwell
|
917d58acbb
|
MS found one more duplicate in the Gemfile
|
2010-07-17 14:10:31 -07:00 |
|
Raphael
|
7d7c39e3dc
|
callbacks not running on photo save
|
2010-07-17 14:09:21 -07:00 |
|
danielvincent
|
c8c76ddab5
|
added auth_user back to photos controller
|
2010-07-17 14:08:18 -07:00 |
|
danielvincent
|
79536dcfb7
|
all post partials now use object_path for links
|
2010-07-17 13:59:04 -07:00 |
|
danielvincent
|
b221e19746
|
every post partial shows a user picture. a post's comments are displayed with a count in its show page
|
2010-07-17 13:41:54 -07:00 |
|
Raphael
|
93e900b998
|
fixed comments, did I break request url?
|
2010-07-17 11:29:30 -07:00 |
|
Raphael
|
d8ad4367d5
|
Tests now pass
|
2010-07-17 09:32:41 -07:00 |
|
maxwell
|
eb4153ec8f
|
did a couple of things to the request page
|
2010-07-16 23:22:18 -07:00 |
|
maxwell
|
5d0c5dbd86
|
MS kinda hacky webfinger email fix
|
2010-07-16 23:03:59 -07:00 |
|
danielvincent
|
180138610c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 23:02:31 -07:00 |
|
danielvincent
|
04eb66b2e6
|
user has a image url field for user picture
|
2010-07-16 23:02:24 -07:00 |
|
maxwell
|
44b4defb69
|
MS IZ YEAAAAAAAAAAAAHHHHHgit push origin master git push origin master
|
2010-07-16 22:20:25 -07:00 |
|
maxwell
|
cd31d11aca
|
MS IZ adding a friend through the webfinger profile
|
2010-07-16 22:11:55 -07:00 |
|
maxwell
|
f34e033bce
|
MS IZ getting the profile
|
2010-07-16 21:59:40 -07:00 |
|
maxwell
|
58b052b07f
|
IZ MS small bugfix
|
2010-07-16 21:35:16 -07:00 |
|
maxwell
|
a742ef1253
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
Gemfile
|
2010-07-16 21:33:57 -07:00 |
|
maxwell
|
36c911d20b
|
IZ MS added diaspora rel to webfinger profile
|
2010-07-16 21:33:08 -07:00 |
|
danielvincent
|
5637ab2a8e
|
added multipart option to new photo form. needed to remove remote true for now.
|
2010-07-16 21:14:42 -07:00 |
|
Raphael
|
93fdbae9c5
|
fixed small bug on user show page, added header text to user edit page
|
2010-07-16 17:27:57 -07:00 |
|
Raphael
|
bb4d5cad59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 17:26:22 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|
maxwell
|
c124a9ab41
|
IZ MS blogs ctivity streams/atom
|
2010-07-16 16:07:58 -07:00 |
|
maxwell
|
06238703c3
|
IZ MS bookmarks now create activity streams
|
2010-07-16 15:54:26 -07:00 |
|
maxwell
|
98bc754627
|
trying to get it reporting from diaspora
|
2010-07-16 14:54:14 -07:00 |
|
maxwell
|
86718dbec3
|
trying to get it reporting from diaspora
|
2010-07-16 14:53:07 -07:00 |
|
maxwell
|
642db5006f
|
trying to get it reporting from diaspora
|
2010-07-16 14:49:44 -07:00 |
|
maxwell
|
03a8f2ea5c
|
trying to get it reporting from diaspora
|
2010-07-16 14:36:50 -07:00 |
|
maxwell
|
3d87c111df
|
webfinger is now not washington specific
|
2010-07-16 14:15:19 -07:00 |
|
Raphael
|
9165ac413a
|
image uploading started
|
2010-07-16 12:31:24 -07:00 |
|
maxwell
|
7e190047ec
|
IZ MS host
|
2010-07-16 11:14:26 -07:00 |
|
maxwell
|
4259dc7dfe
|
IZ MS changing end slash
|
2010-07-16 11:10:38 -07:00 |
|
maxwell
|
172141db0a
|
IZ MS setting alias to not idendica
|
2010-07-16 11:07:17 -07:00 |
|
maxwell
|
b39f7cebd0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 10:39:18 -07:00 |
|
maxwell
|
081a6a2c73
|
MS IZ trying to delete commented stuff
|
2010-07-16 10:39:02 -07:00 |
|
Raphael
|
256757f02a
|
Rails.logger in a model
|
2010-07-16 10:29:42 -07:00 |
|
Raphael
|
9f90ae4db0
|
Syntax errors are awesome
|
2010-07-16 10:20:41 -07:00 |
|
Raphael
|
4178a78b23
|
Logger in receive friend request
|
2010-07-16 10:18:45 -07:00 |
|
Raphael
|
567d3f4dc5
|
Fixing friending deploy
|
2010-07-16 10:06:29 -07:00 |
|
Raphael
|
7dd8acadf7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 09:59:24 -07:00 |
|
Raphael
|
05e6dada58
|
Fixing deploy friending
|
2010-07-16 09:59:06 -07:00 |
|
maxwell
|
bf3d34090e
|
MS IZ = AHHH
|
2010-07-15 19:08:25 -07:00 |
|
maxwell
|
9ff4cd015d
|
MS IZ = AHHH
|
2010-07-15 19:05:59 -07:00 |
|
maxwell
|
f927ace140
|
MS IZ = AHHH
|
2010-07-15 19:01:14 -07:00 |
|
maxwell
|
8f59a9d788
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:42:44 -07:00 |
|
maxwell
|
b903163d3f
|
MS IZ = AHHH
|
2010-07-15 18:42:25 -07:00 |
|
Raphael
|
cae5700222
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:41:01 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
maxwell
|
45abeb2346
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:11:20 -07:00 |
|
maxwell
|
6bab2fedc8
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:06:48 -07:00 |
|
maxwell
|
2dc6b5f46a
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:02:36 -07:00 |
|
maxwell
|
9119d8af93
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:59:22 -07:00 |
|
maxwell
|
5dea277294
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:56:54 -07:00 |
|
maxwell
|
d393458ae8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 16:55:09 -07:00 |
|
maxwell
|
cc712196a6
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:54:46 -07:00 |
|
Raphael
|
7fb7c519cc
|
Adding active to friend view
|
2010-07-15 16:30:56 -07:00 |
|
Raphael
|
e5a5b5a828
|
Fixing zombies
|
2010-07-15 16:20:38 -07:00 |
|
Raphael
|
613e2da3e6
|
Made logging clearer, fixing zombiefriends
|
2010-07-15 16:11:19 -07:00 |
|
Raphael
|
82e3f6a14e
|
debugging zombiefriends
|
2010-07-15 16:06:10 -07:00 |
|
Raphael
|
417df7f874
|
debugging zombiefriends
|
2010-07-15 16:03:48 -07:00 |
|
Raphael
|
57d9bd1543
|
Added friending route to dashboards
|
2010-07-15 15:38:49 -07:00 |
|
Raphael
|
d7e07dfda8
|
comment specs fixed, comments now signed by post poster
|
2010-07-15 14:41:39 -07:00 |
|
Raphael
|
64c81f0551
|
merge in master, only friend tom
|
2010-07-15 14:18:22 -07:00 |
|
Raphael
|
862787ea93
|
RS, DG; person destruction no longer deletes comments
|
2010-07-15 14:12:01 -07:00 |
|
Raphael
|
2d5d3a2f2d
|
commit more often
|
2010-07-15 13:29:21 -07:00 |
|
Raphael
|
fd18ac6c4b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-15 13:06:46 -07:00 |
|
maxwell
|
720550189d
|
MS more cleanup
|
2010-07-15 10:59:36 -07:00 |
|
maxwell
|
1412265150
|
MS IZ now we can unsubscribe...probally
|
2010-07-15 10:43:18 -07:00 |
|
maxwell
|
99446d82c4
|
MS IZ more fixes
|
2010-07-15 10:30:51 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
892eec1959
|
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
|
2010-07-15 09:32:13 -07:00 |
|
Raphael
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -07:00 |
|
Raphael
|
d7d1af8058
|
always import the key
|
2010-07-14 11:55:15 -07:00 |
|
Raphael
|
2e0e904cdb
|
Sending key in friend request response
|
2010-07-14 11:47:36 -07:00 |
|
Raphael
|
a7ba1d8920
|
Assign key before validation
|
2010-07-14 11:25:34 -07:00 |
|
Raphael
|
335f202e2b
|
RS, IZ; Profiles are now embedded
|
2010-07-14 11:22:44 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
Raphael
|
f680c4b71e
|
RS, IZ; Signature Verification now stubbed out outside of encryption specs, green
|
2010-07-14 11:01:21 -07:00 |
|
ilya
|
4a0bd5fc0c
|
RS IZ; removed validations on marshaling and removed key deletion on person destroyw
|
2010-07-13 17:36:18 -07:00 |
|
ilya
|
2862925e2d
|
before validations on create
|
2010-07-13 15:19:39 -07:00 |
|
ilya
|
6614285644
|
params string now a method
|
2010-07-13 15:08:14 -07:00 |
|
ilya
|
0df76daab5
|
assign key
|
2010-07-13 14:44:30 -07:00 |
|
ilya
|
4a53d29939
|
assign key
|
2010-07-13 14:40:10 -07:00 |
|
ilya
|
d4d1aa0fd5
|
RS IZ validations of signature are now called on craeeton of a post
|
2010-07-13 14:34:30 -07:00 |
|
maxwell
|
9e93fd072e
|
DG MS; added subscriber model for ostatus interop
|
2010-07-13 14:32:27 -07:00 |
|
ilya
|
83ea15c97a
|
merging in master
|
2010-07-13 12:23:09 -07:00 |
|
ilya
|
964ee65b11
|
rs iz ; the signature of the signable_accessors are now in the xml
|
2010-07-13 12:21:11 -07:00 |
|
maxwell
|
0bcbd5b16c
|
DG MS; diaspora xml generate model genereates a valid atom feed for status messages
|
2010-07-13 12:09:06 -07:00 |
|
ilya
|
add9961ca4
|
Now signing only xml accessors other than person
|
2010-07-13 11:41:57 -07:00 |
|
ilya
|
7952385cdb
|
added newlines to post
|
2010-07-13 11:24:57 -07:00 |
|
ilya
|
25940cf567
|
Removed stray puts
|
2010-07-13 11:12:49 -07:00 |
|
ilya
|
a219801c2d
|
Now using detached signatures
|
2010-07-13 11:10:04 -07:00 |
|
ilya
|
6d431e9459
|
signing tests sort of almost done
|
2010-07-13 11:01:27 -07:00 |
|
ilya
|
b9146cbb41
|
RS IZ; now signatures work like in real life
|
2010-07-12 20:42:22 -07:00 |
|
danielvincent
|
ed8ed9be9e
|
DG MS; started Diaspora::XML for ostatus compliance
|
2010-07-12 20:15:12 -07:00 |
|
ilya
|
406c00aeb6
|
RS IZ; using detached signatures and verification things
|
2010-07-12 18:31:20 -07:00 |
|
maxwell
|
f9f7f0fcc7
|
DG MS; request makes sure http:// and an ending slash is present on a new request link
|
2010-07-12 12:33:31 -07:00 |
|
maxwell
|
5ba2e61ab8
|
MS DG moved xml accessor for profile
|
2010-07-12 11:37:46 -07:00 |
|
ilya
|
174eb7e8f7
|
Merging in Master
|
2010-07-12 11:28:39 -07:00 |
|
maxwell
|
18760f13f8
|
push changes
|
2010-07-12 11:25:53 -07:00 |
|
ilya
|
3dfb55ee85
|
IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
|
2010-07-11 00:04:08 -04:00 |
|
ilya
|
72e7514535
|
MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw
|
2010-07-10 23:30:24 -04:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|