maxwell
|
23057869e1
|
DG MS debugging friend request
|
2010-07-09 18:41: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
|
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
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
ilya
|
9cddf26a53
|
DG IZ fixed views for friend request
|
2010-07-06 14:48:44 -04: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
|
4f7579a5db
|
DG MS; fixed delete button bug on stream
|
2010-07-01 19:49:56 -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
|
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 |
|
maxwell
|
448fcf8f89
|
MS RS fixed real name, now profiles are created with a new friend
|
2010-06-29 20:33:55 -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
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -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 |
|
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
|
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 |
|