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 |
|
ilya
|
1bed575b90
|
Added the Key Fingerprint validation to the person model(defaults to empty string)
|
2010-07-10 06:09:53 -04:00 |
|
ilya
|
7eba033c0d
|
Revert "RS IZ Friday night, key_fingerprint serialization weirdness"
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
|
2010-07-10 05:29:57 -04:00 |
|
ilya
|
8c75761ba1
|
RS IZ Friday night, key_fingerprint serialization weirdness
|
2010-07-10 02:25:48 -04:00 |
|
maxwell
|
c073fc6137
|
MS DG friend deletions dont work, but they do send, prob a parser problem
|
2010-07-09 19:36:02 -07:00 |
|
maxwell
|
d37461a432
|
ms dg post deletions now come thru the socket again
|
2010-07-09 19:27:39 -07:00 |
|
danielvincent
|
ce132dd782
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 18:54:59 -07:00 |
|
danielvincent
|
7bfdaac691
|
added unfriend button to person show page
|
2010-07-09 18:54:48 -07:00 |
|
maxwell
|
601da95c8c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 18:54:05 -07:00 |
|
maxwell
|
29516d829e
|
MS flash now gives message if you have already friended a given person
|
2010-07-09 18:53:47 -07:00 |
|
danielvincent
|
aa916d0604
|
moved User.first out of the application view
|
2010-07-09 18:50:39 -07:00 |
|
maxwell
|
23057869e1
|
DG MS debugging friend request
|
2010-07-09 18:41:39 -07:00 |
|
maxwell
|
8147602570
|
DG MS friends now are delete
|
2010-07-09 18:10:11 -07:00 |
|
ilya
|
eec66395c1
|
Removed key password
|
2010-07-09 20:22:01 -04:00 |
|
ilya
|
91e96973ef
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-09 19:17:14 -04:00 |
|
ilya
|
2f5ec3d7c4
|
added a bunch of public keys to test ring
|
2010-07-09 19:17:07 -04:00 |
|
maxwell
|
f5fd0b011a
|
DG MS; upon friend deletion, all connected posts and comments are purged
|
2010-07-09 16:08:00 -07:00 |
|
ilya
|
7eec041846
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-09 18:15:22 -04:00 |
|
ilya
|
8c45dd4702
|
testing signing
|
2010-07-09 18:15:17 -04:00 |
|
ilya
|
b802db9194
|
writing signing
|
2010-07-09 17:41:01 -04:00 |
|
maxwell
|
cf352b6f8d
|
DG MS; cannot friend request an existing friend.
|
2010-07-09 14:35:42 -07:00 |
|
maxwell
|
b052ddeb84
|
DG MS; database seed scripts now ensure all friends are set to true
|
2010-07-09 14:13:39 -07:00 |
|
maxwell
|
48adc9ebc1
|
DG MS; person object now properly stored with request object save
|
2010-07-09 14:07:35 -07:00 |
|
maxwell
|
d21a3baf32
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 11:14:11 -07:00 |
|
maxwell
|
b49f198c4f
|
DG MS cleaned up some of the request stuff
|
2010-07-09 11:14:00 -07:00 |
|
ilya
|
cfaf13ac7d
|
Use pregenerated keys
|
2010-07-09 13:45:00 -04:00 |
|
maxwell
|
c7e1bc3a46
|
DG MS debugging friend requests
|
2010-07-09 10:18:29 -07:00 |
|
maxwell
|
c2c64d9938
|
MS DG more friend request tests pass
|
2010-07-08 23:14:54 -07:00 |
|
maxwell
|
408b58cbbf
|
Merge branch 'safe-without-gpg'
|
2010-07-08 21:45:27 -07:00 |
|
maxwell
|
6cc9deaa65
|
merging with head
|
2010-07-08 21:44:14 -07:00 |
|
maxwell
|
583d3d0c82
|
DG MS friending now tests out
|
2010-07-08 21:34:38 -07:00 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
ilya
|
895742824d
|
Sped up specs, fixed env
|
2010-07-08 21:23:08 -04:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
ilya
|
9e8426ceb4
|
RS, IZ; Users now have keys, keyring now in db folder
|
2010-07-08 19:57:10 -04:00 |
|
maxwell
|
900f1080a2
|
DG MS; fixed destroy links for status messages, added link for requests on top nav
|
2010-07-08 14:38:26 -07:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07:00 |
|
maxwell
|
1fa2dfd6eb
|
DG MS cleaning up friend request
|
2010-07-08 12:05:06 -07:00 |
|
maxwell
|
da4e148fed
|
DG MS; fixing friend request
|
2010-07-08 11:44:18 -07:00 |
|
maxwell
|
1885b5b6b9
|
MS DG fixed friend request
|
2010-07-08 11:30:58 -07:00 |
|
maxwell
|
0c00e6a512
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 10:42:55 -07:00 |
|
maxwell
|
89959bdcb8
|
MS dont make person request remote for now
|
2010-07-08 10:42:42 -07:00 |
|
Raphael
|
2a90fb2bdc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 10:28:36 -07:00 |
|
Raphael
|
97b1e8dd5d
|
oops
|
2010-07-08 10:28:23 -07:00 |
|
ilya
|
6e6763de14
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 13:28:17 -04:00 |
|
ilya
|
93c5404cab
|
DG IZ message handler is a singleton'
|
2010-07-08 13:28:02 -04:00 |
|
Raphael
|
4819ce694b
|
removed emspec from gemfile
|
2010-07-08 10:27:22 -07:00 |
|
maxwell
|
09b79293f0
|
merged master
|
2010-07-08 10:19:58 -07:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
6293f9f585
|
socket is now a controller
|
2010-07-08 10:17:41 -07:00 |
|
ilya
|
3ff32e4905
|
DG IZ; removed views and controller associated with friend object
|
2010-07-08 12:38:14 -04:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
danielvincent
|
ebfc55ff28
|
DG IZ friend request, has a puts in the receive hook for debugging
|
2010-07-07 21:20:38 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
maxwell
|
947f1a60e7
|
RS MS added url for for the socket controller
|
2010-07-07 18:59:32 -07:00 |
|
danielvincent
|
a33acd134e
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 18:10:47 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
cc603a7943
|
autotest for rafi
|
2010-07-07 15:27:44 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
danielvincent
|
d705d39f70
|
DG IZ; added for action to friend request
|
2010-07-07 13:44:06 -07:00 |
|
ilya
|
79c0e960ad
|
DG IZ; friend now has an active flag
|
2010-07-06 23:43:01 -04:00 |
|
ilya
|
d5d4d4ae84
|
DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely
|
2010-07-06 21:29:49 -04:00 |
|
ilya
|
a23a2691f3
|
DG IZ; starting fresh with requests
|
2010-07-06 20:09:20 -04:00 |
|
ilya
|
f71b5b51d1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 19:33:00 -04:00 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
Raphael
|
bb325cbf6b
|
cleaned up a little
|
2010-07-06 12:41:28 -07:00 |
|
Raphael
|
d46e82d004
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 12:38:46 -07:00 |
|
Raphael
|
7bdf52e173
|
comment numbers update uncleanly
|
2010-07-06 12:38:24 -07:00 |
|
ilya
|
1a44cf5ab3
|
DG IZ push to wrapped to check before sending off a friend req
|
2010-07-06 15:11:24 -04:00 |
|
ilya
|
3974b01b29
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 14:49:08 -04:00 |
|
ilya
|
9cddf26a53
|
DG IZ fixed views for friend request
|
2010-07-06 14:48:44 -04:00 |
|
Raphael
|
e971c71451
|
refactor websocket receive insert javascript
|
2010-07-06 11:40:19 -07:00 |
|
ilya
|
0587688d18
|
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
|
2010-07-06 02:15:49 -04:00 |
|
ilya
|
027d953cf4
|
DG IZ added the FriendRequest model.
|
2010-07-05 23:28:51 -04:00 |
|
danielvincent
|
20b056586d
|
warming up the page. colors were too cold and non-human before.
|
2010-07-05 00:02:16 -07:00 |
|
danielvincent
|
0001797850
|
moved user's name to the right of their picture
|
2010-07-03 23:39:05 -07:00 |
|
danielvincent
|
85cee4064b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
public/javascripts/publisher.js
|
2010-07-03 22:45:56 -07:00 |
|
danielvincent
|
e709eba243
|
publisher as a faux nav element.
|
2010-07-03 22:43:11 -07:00 |
|
Raphael
|
fffd3aebfc
|
Added remote is true to stream partials, no more redirecting
|
2010-07-02 15:36:07 -07:00 |
|
danielvincent
|
df3fe6c2a9
|
DG IZ RS; deletion now gets sent through the websocket
|
2010-07-02 15:16:28 -07:00 |
|
danielvincent
|
8e6ddb4b2e
|
propagate_delete -> propagate_retraction
|
2010-07-02 14:40:25 -07:00 |
|
Raphael
|
f9856517db
|
Post deletion now deletes comments
|
2010-07-02 14:34:58 -07:00 |
|
danielvincent
|
469599a4a9
|
DG RS IZ; added post deletion propagation
|
2010-07-02 13:08:53 -07:00 |
|
Raphael
|
737614e04b
|
google analytics for real
|
2010-07-01 22:20:57 -07:00 |
|
Raphael
|
418635aa72
|
Added google to session wall layout
|
2010-07-01 22:13:55 -07:00 |
|
danielvincent
|
1616f5573d
|
DG MS; fixed position of flash message
|
2010-07-01 19:55:38 -07:00 |
|
danielvincent
|
4f7579a5db
|
DG MS; fixed delete button bug on stream
|
2010-07-01 19:49:56 -07:00 |
|
danielvincent
|
88f0244353
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:22:30 -07:00 |
|
danielvincent
|
368f550f65
|
preview text next to diaspora in header
|
2010-07-01 17:22:24 -07:00 |
|
maxwell
|
2b2864b78d
|
now its just a message for ie 6, 7
|
2010-07-01 17:12:21 -07:00 |
|
maxwell
|
8d1ec57fa4
|
beefed it up to ie 7
|
2010-07-01 17:07:36 -07:00 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -07:00 |
|
maxwell
|
86c6cdcafa
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:38:51 -07:00 |
|
maxwell
|
ba984009f8
|
added chrome frame
|
2010-07-01 16:38:32 -07:00 |
|
danielvincent
|
c27bc09e75
|
fixed user image bug
|
2010-07-01 16:35:44 -07:00 |
|
danielvincent
|
b25880f04a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:25:11 -07:00 |
|
danielvincent
|
03e7071aae
|
fixed nav list/link deal for firefox, html compliance
|
2010-07-01 16:24:51 -07:00 |
|
maxwell
|
6f17e5f28f
|
added chrome frame for ie lameos
|
2010-07-01 16:17:32 -07:00 |
|
maxwell
|
b0a3feb30c
|
fixed g analytics
|
2010-07-01 15:51:17 -07:00 |
|
danielvincent
|
c0a744b2ce
|
owner picture selector in application helper
|
2010-07-01 15:34:35 -07:00 |
|
danielvincent
|
99d12964b6
|
to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga
|
2010-07-01 10:55:22 -07:00 |
|
ilya
|
5285753486
|
IZ warzombie route, the method is in the dsashboard controller
|
2010-07-01 13:28:17 -04:00 |
|
maxwell
|
428284abeb
|
sorry about that, removed tiny mce, but we still had things which inited it
|
2010-07-01 09:15:27 -07:00 |
|
maxwell
|
cb23766012
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 09:03:04 -07:00 |
|
maxwell
|
01132e3dc0
|
pushing js changes
|
2010-07-01 09:02:38 -07:00 |
|
Raphael
|
27d29d5d40
|
RS; I should have figured this one out way earlier...
|
2010-07-01 01:22:37 -07:00 |
|
maxwell
|
da59078b64
|
fixed small js bug so it only adds to the base route (or page 1 on pagination)
|
2010-06-30 17:49:45 -07:00 |
|
maxwell
|
9631977597
|
RS MS comments propagate, and show up IN REAL TIME
|
2010-06-30 17:29:32 -07:00 |
|
maxwell
|
e696ef7023
|
comments now go go go and are tested RS MS
|
2010-06-30 16:24:44 -07:00 |
|
maxwell
|
4077e4248e
|
pushing for cap deploy
|
2010-06-30 14:23:40 -07:00 |
|
maxwell
|
fcdba64828
|
pushing to test comment passing
|
2010-06-30 13:54:09 -07:00 |
|
Raphael
|
3d976ca47e
|
RS, a little bit of autolinking in statuses and comments
|
2010-06-30 08:36:51 -07:00 |
|
Raphael
|
340a57ea6d
|
RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons
|
2010-06-30 08:06:30 -07:00 |
|
maxwell
|
6bc68fb42e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 00:27:30 -07:00 |
|
maxwell
|
dc5b321b62
|
sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up.
|
2010-06-30 00:27:11 -07:00 |
|
danielvincent
|
a15cd932b6
|
nevermind, nevermind
|
2010-06-29 23:47:39 -07:00 |
|
danielvincent
|
cf8c669e83
|
login screen now black.
|
2010-06-29 23:24:31 -07:00 |
|
danielvincent
|
70ece3c180
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 20:56:51 -07:00 |
|
danielvincent
|
e159b8f7f4
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/friends/show.html.haml
|
2010-06-29 20:56:44 -07:00 |
|
maxwell
|
fcbe8e42a0
|
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
|
2010-06-29 20:54:53 -07:00 |
|
danielvincent
|
19c41fb6be
|
DG IZ; comments show and hide
|
2010-06-29 20:53:49 -07:00 |
|
maxwell
|
448fcf8f89
|
MS RS fixed real name, now profiles are created with a new friend
|
2010-06-29 20:33:55 -07:00 |
|
danielvincent
|
984f5f62b6
|
DG IZ; publisher reflects what type is selected
|
2010-06-29 19:55:50 -07:00 |
|
danielvincent
|
97cd3fb413
|
DG IZ; comment count in status message partial
|
2010-06-29 19:08:23 -07:00 |
|
danielvincent
|
8ff241cdde
|
DG IZ; all comments hidden by default. linking anchor issue.
|
2010-06-29 19:00:54 -07:00 |
|
danielvincent
|
746f2acaec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 18:00:09 -07:00 |
|
danielvincent
|
7d6783e446
|
DG IZ; more little changes to UI
|
2010-06-29 18:00:01 -07:00 |
|
maxwell
|
3937483bd3
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 17:45:19 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|
danielvincent
|
0c16038e2d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-06-29 17:30:29 -07:00 |
|
danielvincent
|
acc782d5b2
|
DG IZ; cool labels fade in
|
2010-06-29 17:27:09 -07:00 |
|
maxwell
|
7961d11669
|
uncommenting get satisfaction
|
2010-06-29 17:09:07 -07:00 |
|
maxwell
|
eebed9d457
|
fixed publisher in chrome and broke it out to a seperate js file
|
2010-06-29 17:04:46 -07:00 |
|
danielvincent
|
a685c6c0ab
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 16:28:20 -07:00 |
|
danielvincent
|
39a1874ce3
|
DG IZ; all input fields are now textareas on dashboard page
|
2010-06-29 16:28:12 -07:00 |
|
maxwell
|
77c0bb5c4e
|
urls are now unique, and a user can not add a friend with the exact same url
|
2010-06-29 16:04:15 -07:00 |
|
maxwell
|
a0a0b9d0ad
|
fixed stream bull
|
2010-06-29 15:05:09 -07:00 |
|
maxwell
|
ee9acc5c82
|
thanks to dan, GS works great now MS RS
|
2010-06-29 15:00:30 -07:00 |
|
danielvincent
|
67123c664a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
|
2010-06-29 14:36:46 -07:00 |
|
danielvincent
|
5193a20458
|
DG IZ; getting there.
|
2010-06-29 14:34:33 -07:00 |
|
maxwell
|
6532962c1c
|
trying to get google analytics working
|
2010-06-29 13:58:36 -07:00 |
|
maxwell
|
60336bd520
|
trying to get GS working
|
2010-06-29 13:45:54 -07:00 |
|
maxwell
|
19e03c7077
|
person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field
|
2010-06-29 12:33:00 -07:00 |
|
maxwell
|
f9d4eff7b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 12:32:07 -07:00 |
|
danielvincent
|
260805af64
|
DG IZ; publisher box & profile picture placeholder
|
2010-06-29 12:25:36 -07:00 |
|
maxwell
|
a683a2c1aa
|
RS MS added goog analytics
|
2010-06-29 11:45:41 -07:00 |
|
danielvincent
|
01f048b0a6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
public/stylesheets/sass/application.sass
|
2010-06-28 22:18:47 -07:00 |
|
danielvincent
|
08d6a46bd8
|
login page
|
2010-06-28 22:18:05 -07:00 |
|
maxwell
|
45a9d9e342
|
moved the silly destory link over a bit
|
2010-06-28 22:15:52 -07:00 |
|
maxwell
|
46ab63de36
|
added will pagination action.
|
2010-06-28 21:56:58 -07:00 |
|
ilya
|
775aab996a
|
DG IZ picture in the profile
|
2010-06-28 23:39:55 -04:00 |
|
ilya
|
0fa11806ba
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 21:32:18 -04:00 |
|
ilya
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04:00 |
|
maxwell
|
36b5a90d34
|
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
|
2010-06-28 17:35:38 -07:00 |
|
maxwell
|
3dce5f1b34
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 16:15:48 -07:00 |
|
maxwell
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
ilya
|
2ac4759067
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 18:21:03 -04:00 |
|
ilya
|
2b42ef216c
|
DG IZ; added a profile; one-to-one relation with Person (non-singleton)
|
2010-06-28 18:20:56 -04:00 |
|
maxwell
|
b6c6316886
|
trying to fix status message bug
|
2010-06-28 15:03:45 -07:00 |
|
maxwell
|
d9a6bb7ba2
|
merged my socket changes
|
2010-06-28 14:52:43 -07:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -07:00 |
|
ilya
|
44b25e3eaa
|
DG IZ; fixed javascript bug. stream fades in recents again.
|
2010-06-28 17:02:26 -04:00 |
|
ilya
|
25198a7e86
|
IZ, RS; Moved XML parser to lib
|
2010-06-28 15:56:46 -04:00 |
|
danielvincent
|
762cbcb0f2
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/comments/_comment.html.haml
app/views/layouts/application.html.haml
|
2010-06-28 12:09:35 -07:00 |
|
ilya
|
a540f09109
|
RS, IZ; Added ids to views
|
2010-06-28 14:46:43 -04:00 |
|
ilya
|
3d76fa26ba
|
RS IZ testing GUID
|
2010-06-28 14:28:01 -04:00 |
|
maxwell
|
60091012bf
|
on client connect, websockets now tell the server where the user is. nothing more
|
2010-06-28 01:12:21 -07:00 |
|
danielvincent
|
462bd96189
|
ui fixup
|
2010-06-27 16:17:42 -07:00 |
|
danielvincent
|
5be27f33ec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
app/views/status_messages/_status_message.html.haml
|
2010-06-27 10:32:23 -07:00 |
|
maxwell
|
b017f1b0f9
|
forgot to add partial file to git...sorry
|
2010-06-26 23:43:30 -07:00 |
|
Maxwell Salzberg
|
b804bdc220
|
forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts
|
2010-06-26 15:40:33 -07:00 |
|
Maxwell Salzberg
|
4402a84c32
|
fixed the webhook bug, now going to deploy and test
|
2010-06-26 15:21:23 -07:00 |
|
Maxwell Salzberg
|
2bbfcb0bb1
|
putting debug in for master so I can check deployed servers out
|
2010-06-26 14:16:19 -07:00 |
|
danielvincent
|
39e85754d8
|
nav should be collapsed into a filter list. comments are more clear.
|
2010-06-26 00:07:21 -07:00 |
|
maxwell
|
6467f943da
|
MS^2 Comments serialize and deserialize properly
|
2010-06-25 22:49:53 -07:00 |
|
maxwell
|
e4e2d52bcb
|
reverting typos
|
2010-06-25 22:29:36 -07:00 |
|
maxwell
|
0d700046c4
|
MS^2 Object parser can handle comments
|
2010-06-25 22:29:08 -07:00 |
|
maxwell
|
a6c33b3e7b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:49 -07:00 |
|
maxwell
|
ec01e2c016
|
Comments now working, but no AJAX, need to refresh to see them
|
2010-06-25 22:15:41 -07:00 |
|
ilya
|
ad28f0cf82
|
RS, IZ; Maybe commited
|
2010-06-26 00:58:24 -04:00 |
|
ilya
|
a7f6eaefdf
|
no friends panel on page
|
2010-06-26 00:47:21 -04:00 |
|
ilya
|
d9ffb0d07d
|
RS IZ No Friends list before signin
|
2010-06-25 23:53:04 -04:00 |
|
ilya
|
f5ecfebcb9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 23:23:44 -04:00 |
|
ilya
|
d4f528bba8
|
Removed bookmark new page, moved form to index
|
2010-06-25 23:23:37 -04:00 |
|
maxwell
|
faa5d21636
|
Change the form_for not to need a message passed, and adding it to the home page
|
2010-06-25 19:58:40 -07:00 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
ilya
|
f5d1ab14fb
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:58 -04:00 |
|
ilya
|
2557271dcc
|
removed users link
|
2010-06-25 21:57:18 -04:00 |
|
maxwell
|
a89e0d4a7f
|
We are sorry.
|
2010-06-25 18:46:27 -07:00 |
|
maxwell
|
2566b2d4e1
|
added person validations
|
2010-06-25 18:31:35 -07:00 |
|
maxwell
|
884af9a3b6
|
added debug partial
|
2010-06-25 15:35:40 -07:00 |
|
maxwell
|
b105b0d6f2
|
merged in
|
2010-06-25 15:34:40 -07:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|
ilya
|
c0167a445a
|
RS, IZ; Ended spec pollution, fixed up blog spec
|
2010-06-25 18:04:09 -04:00 |
|
maxwell
|
64c1d99b8c
|
MS found the stupid nil. from here, i have 33 failures.
|
2010-06-24 22:20:09 -07:00 |
|
ilya
|
179af4fbfa
|
Merged mongomapper and master
|
2010-06-25 00:11:45 -04:00 |
|
maxwell
|
e558d4833f
|
DG MS fixing tests
|
2010-06-24 20:45:49 -07:00 |
|
ilya
|
4323bc5fe7
|
RS, IZ, specs working again for real
|
2010-06-24 20:47:03 -04:00 |
|
maxwell
|
5f3a6a7aa0
|
MS mongomapper works kinda
|
2010-06-24 17:22:49 -07:00 |
|
Raphael
|
f0db58f912
|
Moved authentication to applicationcontroller for now, refactored posting statusmessages
|
2010-06-24 17:10:45 -07:00 |
|
ilya
|
b4cc4e797f
|
RS IZ my newest fix
|
2010-06-23 20:29:57 -04:00 |
|
ilya
|
81157190ac
|
RS, IZ, Merged from master
|
2010-06-23 20:19:25 -04:00 |
|
ilya
|
8829714e2d
|
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
|
2010-06-23 20:17:44 -04:00 |
|
maxwell
|
a0eeb43176
|
DG friend url validation can now take a post, sligtly regressed on some really weird edge cases
|
2010-06-23 16:30:46 -07:00 |
|
maxwell
|
fb7ed9e0e7
|
DG MS pushing a small show page fix
|
2010-06-23 15:25:46 -07:00 |
|
maxwell
|
9fa26f020e
|
DG MS; clicking on a person's name redirects to that person's post stream
|
2010-06-23 14:32:51 -07:00 |
|
Raphael
|
6acee9d158
|
changed blog.owner to blog.person.real_name
|
2010-06-23 12:16:52 -07:00 |
|
maxwell
|
671772f901
|
MS DG added tinyMCE, now a blog is better than a status messsage
|
2010-06-23 11:58:46 -07:00 |
|
maxwell
|
fba4ce9e3b
|
DG MS; fixed flash message visual bug
|
2010-06-23 11:11:58 -07:00 |
|
maxwell
|
663b99924f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 01:26:06 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
Maxwell Salzberg
|
e6e1c22b07
|
DG; webhooks apply incoming posts to current friends with a silent fail on no match
|
2010-06-23 01:20:56 -07:00 |
|
Maxwell Salzberg
|
523cb6f15f
|
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
|
2010-06-22 23:27:31 -07:00 |
|
Maxwell Salzberg
|
9a44578c37
|
DG; Person is now the parent of Friend and User
|
2010-06-22 23:11:55 -07:00 |
|
maxwell
|
fd5d7c63ad
|
messy application.haml file i know, but now the sockets only update pages which want their data
|
2010-06-22 18:59:11 -07:00 |
|
maxwell
|
94de043862
|
fixed not hardcoded port for websockets
|
2010-06-22 17:20:07 -07:00 |
|
maxwell
|
aa7a2da3d1
|
put debug back into websocket
|
2010-06-22 16:23:15 -07:00 |
|
maxwell
|
cc89cd5cda
|
reload object before send to websocket
|
2010-06-22 16:12:15 -07:00 |
|
maxwell
|
989949a8c9
|
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
|
2010-06-22 15:14:55 -07:00 |
|
maxwell
|
3064d208eb
|
added firefox websocket stuffs, only loads if it is not safari or chrome
|
2010-06-22 14:31:16 -07:00 |
|
maxwell
|
0546bb2582
|
pulled in all of max's changes from yesterday to 187
|
2010-06-22 10:39:06 -07:00 |
|
maxwell
|
3a8394bd59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse
|
2010-06-21 19:24:07 -07:00 |
|
maxwell
|
f696ffc3a6
|
fixed up some views, but some stuff feels like it broke
|
2010-06-21 16:46:19 -07:00 |
|
danielvincent
|
1233c60f6f
|
DG IZ; user's real name displayed on top of every page
|
2010-06-21 16:09:48 -07:00 |
|
danielvincent
|
a1361da770
|
DG IZ; friend and owner now require a real name
|
2010-06-21 15:56:40 -07:00 |
|
maxwell
|
a0417d13af
|
fixed merge with master
|
2010-06-21 14:38:38 -07:00 |
|
danielvincent
|
7f795e05cb
|
Merge branch 'master' into half-decent
Conflicts:
app/controllers/dashboard_controller.rb
|
2010-06-21 14:25:22 -07:00 |
|
danielvincent
|
06271d5821
|
added dumb partial switcher function in dashboard controller
|
2010-06-21 14:23:59 -07:00 |
|
maxwell
|
655dd64a54
|
websockets work
|
2010-06-21 14:12:05 -07:00 |
|
maxwell
|
3581f7a7d6
|
merged in socket
|
2010-06-20 22:13:24 -07:00 |
|
danielvincent
|
26d675af11
|
some sass cleanup
|
2010-06-20 18:36:01 -07:00 |
|
danielvincent
|
c542c08e38
|
simpler
|
2010-06-20 17:06:10 -07:00 |
|
danielvincent
|
6647ce34ab
|
status message and bookmark page
|
2010-06-20 14:52:04 -07:00 |
|
danielvincent
|
aee5f7f04f
|
took out filler elements
|
2010-06-20 11:49:05 -07:00 |
|
maxwell
|
1610e72de9
|
fixed merge
|
2010-06-20 11:13:21 -07:00 |
|
maxwell
|
da9bcb8bec
|
just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly
|
2010-06-19 15:53:37 -07:00 |
|
danielvincent
|
df2b9d6ad4
|
more shuffling
|
2010-06-19 14:44:08 -07:00 |
|
maxwell
|
2f6a11f018
|
fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit
|
2010-06-19 14:42:23 -07:00 |
|
danielvincent
|
0c392a0cce
|
moved nav to bottom header
|
2010-06-19 03:01:39 -07:00 |
|
danielvincent
|
d1630b6c45
|
shrink that header
|
2010-06-19 00:53:42 -07:00 |
|
maxwell
|
f06b645b9c
|
typo in Friend
|
2010-06-19 00:50:16 -07:00 |
|
maxwell
|
5afb97b5f7
|
dashboard controller stopped resolving, but the old behavior seems to work now...nnot sure why, could have been mongoid bug...
|
2010-06-19 00:49:35 -07:00 |
|
maxwell
|
8019fc8d31
|
working websocket
|
2010-06-19 00:09:58 -07:00 |
|
danielvincent
|
1223011a4f
|
more semi-drastic changes.
|
2010-06-19 00:01:25 -07:00 |
|
maxwell
|
63866a8128
|
playing
|
2010-06-18 23:47:42 -07:00 |
|
danielvincent
|
de8d8d5cb5
|
in the shit
|
2010-06-18 23:32:47 -07:00 |
|
maxwell
|
5286b6be69
|
DG MS; require XML root node; added header to XML (not yet required)
|
2010-06-18 18:03:13 -07:00 |
|
maxwell
|
34df8fa946
|
DG MS; resolved unknown types going to receive handler. only post objects are inputted
|
2010-06-18 16:47:34 -07:00 |
|
maxwell
|
c430aaff18
|
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
|
2010-06-18 14:35:51 -07:00 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
maxwell
|
043924b5f5
|
made everyting so the lastest is the first thing you see
|
2010-06-17 20:58:20 -07:00 |
|
danielvincent
|
39118293eb
|
DG MS; fixed minor webhook bug when generating xml collection.
|
2010-06-17 18:45:50 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
danielvincent
|
ba6d136bc7
|
DG MS; added specs for common module
|
2010-06-17 15:22:02 -07:00 |
|
danielvincent
|
628af0372f
|
DG MS; completed event-queue intergration.
|
2010-06-17 14:29:41 -07:00 |
|
danielvincent
|
3371b87fff
|
DG MS; queue works. just need to move some tests over.
|
2010-06-17 11:32:13 -07:00 |
|
danielvincent
|
4cecb522b6
|
DG MS; queue still working. half-way finished cleaning up code.
|
2010-06-17 10:36:54 -07:00 |
|
danielvincent
|
d91cec0881
|
queue works. needs cleanup.
|
2010-06-17 10:29:30 -07:00 |
|
Maxwell Salzberg
|
67535c1113
|
tried to git rid of error in em-http-request
|
2010-06-17 09:20:59 -07:00 |
|
danielvincent
|
43207aeb41
|
pending: resolving post action in queue
|
2010-06-16 23:12:23 -07:00 |
|
danielvincent
|
da9f33aa72
|
fixed post stream to ascend by time
|
2010-06-16 17:35:39 -07:00 |
|
danielvincent
|
c63eac0fd9
|
added line delimiters for post stream on dashboard
|
2010-06-15 22:34:08 -07:00 |
|
Raphael Sofaer
|
ed26c82be4
|
RS, IZ; merged day's commits
|
2010-06-15 21:41:39 -07:00 |
|
Raphael Sofaer
|
8213443afd
|
RS, IZ; stubbed out and wrapped curl backtick
|
2010-06-15 21:34:52 -07:00 |
|
maxwell
|
9e89b2e0a7
|
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
|
2010-06-15 21:08:29 -07:00 |
|
Raphael Sofaer
|
34127b070a
|
IZ Made the specs pass, time to clean
|
2010-06-15 20:38:14 -07:00 |
|
Raphael Sofaer
|
c4b931c309
|
IZ RS getting remote messages (not yet done)
|
2010-06-15 18:41:54 -07:00 |
|
maxwell
|
e6f3fc1d38
|
DG MS more test cleanup and removed a deprecation warning
|
2010-06-15 17:38:12 -07:00 |
|
maxwell
|
497b477e89
|
DG MS added a post model, going to put it more places than just status message now
|
2010-06-15 17:21:57 -07:00 |
|
danielvincent
|
f69a2bd8a1
|
RS; Merging whitespace
|
2010-06-15 11:14:00 -07:00 |
|
danielvincent
|
45c926f790
|
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
|
2010-06-15 11:09:47 -07:00 |
|
ilya
|
8a37843cd9
|
IZ no more message= in newest in status message model
|
2010-06-15 13:23:24 -04:00 |
|
ilya
|
ee295d01ff
|
IZ using factories for the spec
|
2010-06-15 13:18:26 -04:00 |
|
danielvincent
|
99d9e50ed6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-15 10:12:14 -07:00 |
|
danielvincent
|
d70cf5b7a7
|
DG RS; fixed newest messages bug in view. moved to helper.
|
2010-06-15 10:11:28 -07:00 |
|
maxwell
|
408c2c719d
|
swaped out js for jquery
|
2010-06-15 09:53:19 -07:00 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
58dfefc3ca
|
added home to nav bar
|
2010-06-14 18:50:38 -07:00 |
|
maxwell
|
3c3c194ed5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-14 17:48:50 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07:00 |
|
ilya
|
08e64450f3
|
IZ Removed the - for = deprication warning in views, the devise ones are hardcoded so maybe they'll be gone on next version
|
2010-06-14 20:34:03 -04:00 |
|
maxwell
|
4532c39e93
|
DG MS; Status messages have owner field; defaults to user
|
2010-06-14 17:13:07 -07:00 |
|
maxwell
|
1f73c2351e
|
DG MS IZ; Status message renders to and from xml; Friend model in place
|
2010-06-14 16:20:57 -07:00 |
|
maxwell
|
db44081186
|
MS IZ DG completed friends should be displayed on dashboard
|
2010-06-14 13:17:20 -07:00 |
|
maxwell
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12:17 -07:00 |
|
danielvincent
|
63f5fe15d6
|
nav includes users and status messages
|
2010-06-14 11:55:52 -07:00 |
|
danielvincent
|
4584f1309e
|
Merge branch 'blueprint'
|
2010-06-14 11:51:56 -07:00 |
|
danielvincent
|
98abb75097
|
added blueprint
|
2010-06-14 11:50:17 -07:00 |
|
maxwell
|
0ff541ba43
|
fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS
|
2010-06-14 11:05:55 -07:00 |
|
maxwell
|
29c6f9fa0f
|
DG, MS, IZ; status messages now functional
|
2010-06-13 22:11:16 -07:00 |
|
maxwell
|
85e6eb2132
|
added stray local files
|
2010-06-13 21:22:52 -07:00 |
|
maxwell
|
28ba205ef3
|
blerg rspec cache sux
|
2010-06-13 21:08:17 -07:00 |
|
maxwell
|
865d7d18cb
|
user login now drops to a dashboard page
|
2010-06-13 20:00:31 -07:00 |
|
danielvincent
|
eaeafd3240
|
added authentication via devise
|
2010-06-12 21:56:50 -07:00 |
|
danielvincent
|
8ecaf240e6
|
user session model authenticates against users
|
2010-06-12 19:51:54 -07:00 |
|
maxwell
|
8b0c3725a5
|
push for rafi
|
2010-06-12 15:55:29 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|