Raphael
|
a9ebe44b1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:03:54 -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
|
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
|
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
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26: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 |
|
danielvincent
|
fd8d92a095
|
moved next/prev links in photo show to be inline with full size link.
|
2010-08-09 20:23:01 -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 |
|
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
|
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
|
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 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -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 |
|
maxwell
|
5d924dadf4
|
MS DG; 19 failing specs left
|
2010-08-05 17:16:51 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -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
|
c95ceecf9e
|
Clarified socket helper, added a selenium test
|
2010-07-30 12:40:02 -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
|
f6495e2bec
|
RS IZ photos now fade in on the album upload page
|
2010-07-29 17:26:05 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -07:00 |
|
ilya
|
03cf61bd7c
|
new user top bar
|
2010-07-28 17:04:56 -07:00 |
|
ilya
|
9e3c6a0936
|
DG IZ; brushed up ostatus user page
|
2010-07-28 12:13:36 -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
|
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
|
47f5c77e1a
|
kinda prettied up the albums page
|
2010-07-26 15:09:02 -07:00 |
|
Maxwell Salzberg
|
66f66b85a6
|
MS added test, things still seem broken though
|
2010-07-24 23:21:02 -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 |
|
danielvincent
|
e5d298040d
|
little things
|
2010-07-23 21:11:21 -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 |
|
maxwell
|
e0baf9d6c5
|
MS sort the updates on a author's page
|
2010-07-22 23:36:37 -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
|
6869384732
|
i think it works - max
|
2010-07-21 21:15:16 -07:00 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
maxwell
|
6f7f82e818
|
added helpers for photo show page
|
2010-07-21 15:47:30 -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
|
933bf61db8
|
RS, MS, relationship_flow returns the action and the url to execute it to
|
2010-07-20 16:15:36 -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
|
cd31d11aca
|
MS IZ adding a friend through the webfinger profile
|
2010-07-16 22:11:55 -07:00 |
|