nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1843 commits 4 branches 0 tags 121 MiB
Commit graph

580 commits

Author SHA1 Message Date
ilya
daf08cd9f9 DG IZ posts by the user get websocketed on the group page and albums 
get signed?
 2010-08-17 18:06:35 -07:00
ilya
f15b3c46b2 DG IZ; reverted to before removing latest message methods 2010-08-17 17:40:48 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
ilya
054dafdf99 couple more 2010-08-17 17:16:11 -07:00
ilya
c1ff8544d3 removed a couple of js lines 2010-08-17 17:04:37 -07:00
ilya
e5036862f6 DG IZ removed the latest message javascript as well as the hash 2010-08-17 16:49:58 -07:00
ilya
d211abb1bc DG IZ on page for group js method now returns true 2010-08-17 16:32:14 -07:00
ilya
d5d1a2d00f DG IZ; javascript variable misnamed 2010-08-17 16:29:51 -07:00
ilya
7d68089c8b DG IZ using group_id when passing the id around the app 2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d DG IZ added group id to the action hash 2010-08-17 15:27:12 -07:00
ilya
fc7f59bdfc DG IZ stream for the current user's posts 2010-08-17 10:13:23 -07:00
ilya
33ed838b79 DG IZ added an error message on request delete 2010-08-16 15:08:05 -07:00
ilya
4a36df29e5 DG IZ now the links are of button style 2010-08-16 14:59:23 -07:00
ilya
92aa72447f DG IZ fixed the css in selector 2010-08-16 14:57:30 -07:00
ilya
b1c29083df changed the link data-method 2010-08-16 14:34:16 -07:00
ilya
2bc9d0156d 2 arguments in the hidden field 2010-08-16 11:59:13 -07:00
ilya
0ee03afe1d DG IZ selector box on request page 2010-08-16 11:39:33 -07:00
danielvincent
18cd4b858a broke out group index and show 2010-08-14 00:27:43 -07:00
danielvincent
c81ea5a632 minor changes 2010-08-14 00:21:10 -07:00
danielvincent
a7eab9e50c minor section header tweaks (album stuff) 2010-08-13 23:20:39 -07:00
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
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
eb36190188 DG, RS; Albums create failure prettier 2010-08-11 18:13:23 -07:00
Raphael
144d673dac DG, RS; album button looks better 2010-08-11 17:16:20 -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
355aba75df RS, DG; removing the last link_to_person 2010-08-11 10:02:45 -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
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
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
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
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
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
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
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
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
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
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
Raphael
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -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
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
ilya
890f927492 removed references of mine? method in all views 2010-08-08 22:53:23 -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
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
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
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
danielvincent
102b912878 moved group nav to its own partial 2010-08-02 16:20:30 -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
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
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
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
Raphael
a636d97837 Removed crash if there was no latest status message 2010-07-29 14:38:46 -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
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
03cf61bd7c new user top bar 2010-07-28 17:04:56 -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
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
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
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
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
ad61c290fb took current user's name out of the layout 2010-07-23 19:44: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
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
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
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
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
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
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
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
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
danielvincent
c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/post.rb
 2010-07-17 19:00:53 -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
maxwell
eb4153ec8f did a couple of things to the request page 2010-07-16 23:22:18 -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
f34e033bce MS IZ getting the profile 2010-07-16 21:59:40 -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
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
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
081a6a2c73 MS IZ trying to delete commented stuff 2010-07-16 10:39:02 -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
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
maxwell
720550189d MS more cleanup 2010-07-15 10:59:36 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07: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
maxwell
d37461a432 ms dg post deletions now come thru the socket again 2010-07-09 19:27:39 -07:00
danielvincent
7bfdaac691 added unfriend button to person show page 2010-07-09 18:54:48 -07:00
danielvincent
aa916d0604 moved User.first out of the application view 2010-07-09 18:50: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
b49f198c4f DG MS cleaned up some of the request stuff 2010-07-09 11:14:00 -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
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
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
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
89959bdcb8 MS dont make person request remote for now 2010-07-08 10:42:42 -07:00
maxwell
d04093f456 Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-08 10:18:03 -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
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
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
7bdf52e173 comment numbers update uncleanly 2010-07-06 12:38:24 -07: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
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
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
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