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
|
3607601ea3
|
addded the right url to the push to method
|
2010-08-10 13:32:26 -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
|
ac2f82c3d7
|
Renamed dashboards spec to groups
|
2010-08-10 12:28:36 -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
|
cd875d06db
|
RS, DG; DB purge now deletes tmp folder
|
2010-08-10 11:13:37 -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
|
36e3cff1b6
|
resized default user picture to a square and compressed it.
|
2010-08-09 21:16:43 -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
|
614c8c72ba
|
RS, DG; Log files should now rotate
|
2010-08-09 14:27:17 -07:00 |
|
Raphael
|
088da2544b
|
RS, DG; We now delete channels when there is nobody subscribed to them
|
2010-08-09 14:11:46 -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 |
|