Raphael
|
59006e657f
|
Hcard done manually
|
2010-09-09 15:15:37 -07:00 |
|
Raphael
|
3e9a36e1f1
|
Layout false on all publics controller routes
|
2010-09-09 14:15:20 -07:00 |
|
Raphael
|
c6aff4a562
|
making the hcard work
|
2010-09-09 13:02:59 -07:00 |
|
Raphael
|
6645d2090e
|
Deploy the salmon branch
|
2010-09-09 12:22:30 -07:00 |
|
Raphael
|
240dda4eab
|
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
|
2010-09-09 12:21:36 -07:00 |
|
Raphael
|
4fd0853e71
|
Moving to salmon
|
2010-09-08 18:29:39 -07:00 |
|
Raphael
|
061f9de668
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-08 17:35:39 -07:00 |
|
Raphael
|
91f2e2e6ae
|
Add public key to webfinger profile
|
2010-09-08 17:35:18 -07:00 |
|
Daniel Vincent Grippi
|
20d5043e81
|
DG MS; moved tabs around up top
|
2010-09-08 12:52:28 -07:00 |
|
Daniel Vincent Grippi
|
f7dd0b10b9
|
DG MS; changed the gear on top nav to not be a tab
|
2010-09-08 12:34:08 -07:00 |
|
Daniel Vincent Grippi
|
5fd105c1dc
|
DG MS; search now links user names if you're friends with them
|
2010-09-08 12:04:05 -07:00 |
|
Daniel Vincent Grippi
|
edae8f1e66
|
DG MS; fixed a view bug in user edit page. page also displays diaspora username .
|
2010-09-08 11:58:03 -07:00 |
|
Daniel Vincent Grippi
|
36730978ca
|
login page is more elegant
|
2010-09-08 11:37:54 -07:00 |
|
Raphael
|
d25327d32d
|
Add example to request partial
|
2010-09-08 11:07:49 -07:00 |
|
Raphael
|
91667c1990
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-08 10:59:17 -07:00 |
|
Raphael
|
960d40278c
|
Add username, login with username or email
|
2010-09-08 10:59:08 -07:00 |
|
Daniel Vincent Grippi
|
1749a9c52d
|
no console
|
2010-09-08 10:51:18 -07:00 |
|
Raphael
|
5fd1602731
|
Group batch edit is for all groups
|
2010-09-08 10:00:31 -07:00 |
|
Raphael
|
2d1a49abb5
|
Add refs to mongomapper and validatable
|
2010-09-08 10:00:17 -07:00 |
|
maxwell
|
d1379f8e5c
|
switching back to master
|
2010-09-07 21:58:05 -07:00 |
|
maxwell
|
d271f10060
|
MS; i think this bundler thing works
|
2010-09-07 18:21:36 -07:00 |
|
maxwell
|
2b165df85c
|
Merge branch 'master' of github.com:diaspora/diaspora into rails_rc
|
2010-09-07 18:21:17 -07:00 |
|
maxwell
|
c8dc31bb5b
|
MS adding gemfile lock back into this house
|
2010-09-07 18:06:18 -07:00 |
|
maxwell
|
5bfadf3b36
|
MS added fix to symlink
|
2010-09-07 18:00:03 -07:00 |
|
maxwell
|
db79845b1b
|
MS trying to mess with deploy script
|
2010-09-07 17:59:20 -07:00 |
|
Daniel Vincent Grippi
|
20d9334ce1
|
DG IZ; changed the photo uploader to drag and drop. now works in firefox.
|
2010-09-07 17:20:48 -07:00 |
|
maxwell
|
baa048c579
|
MS changed some bundler stuff
|
2010-09-07 17:17:57 -07:00 |
|
maxwell
|
804777f9ae
|
MS; updated to released rails
|
2010-09-07 16:47:53 -07:00 |
|
Daniel Vincent Grippi
|
41afd86fe7
|
DG IZ; fixed photos.
|
2010-09-07 12:03:43 -07:00 |
|
maxwell
|
6c33c2a463
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-07 00:55:02 -07:00 |
|
Daniel Vincent Grippi
|
2daa31b7bf
|
added a line to the bottom of the publisher
|
2010-09-06 17:28:09 -07:00 |
|
Daniel Vincent Grippi
|
39c366e2e9
|
group edit button up top.
|
2010-09-06 17:22:57 -07:00 |
|
Daniel Vincent Grippi
|
48415b4de8
|
cleaned up group edit a little
|
2010-09-06 13:01:24 -07:00 |
|
maxwell
|
919d7d23c0
|
MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays
|
2010-09-06 17:46:09 +02:00 |
|
ilya
|
9a4edc419c
|
DG IZ first commit from the car, now can change groups a couple of times
|
2010-08-31 22:55:50 -07:00 |
|
Daniel Vincent Grippi
|
7e909d4034
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 16:38:52 -07:00 |
|
Daniel Vincent Grippi
|
f9c2e0e76d
|
moved publisher down.wn. header is now a dark grey instead of black.
|
2010-08-31 13:07:11 -07:00 |
|
ilya
|
12f7d16c0b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 10:48:29 -07:00 |
|
ilya
|
98db03d36e
|
the group edit resets the data started to reset the from id attr
|
2010-08-31 10:46:49 -07:00 |
|
Daniel Vincent Grippi
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -07:00 |
|
Daniel Grippi
|
de8450c7c5
|
line spacing adjustments.
|
2010-08-29 23:04:28 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
b4db6cc2fb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-29 22:49:42 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
5babda044d
|
cleaned up group controller. added custom as_json to group model.
|
2010-08-29 21:56:10 -07:00 |
|
ilya
|
82ff7dc4e4
|
the person bg color now reset to white, need to reset the original group param and reset the moves var so that one can submit again
|
2010-08-29 20:38:59 -07:00 |
|
ilya
|
9a5f7b4675
|
IZ now the bg color of the moved people changes to blue and changes back to white when you move them back, still need to reset to white on submit and make it pretty
|
2010-08-29 20:23:20 -07:00 |
|
Raphael
|
b85333e52b
|
error.new
|
2010-08-28 18:36:49 -07:00 |
|
Raphael
|
d25e6017e3
|
Make a couple of generic errors ArgumentError
|
2010-08-28 14:53:08 -07:00 |
|
Raphael
|
aa22a0d5c8
|
Removing unused method
|
2010-08-28 14:38:22 -07:00 |
|
Raphael
|
f76c4bd390
|
Revert "Change ObjectID to ObjectId"
This reverts commit efcc112397a8080fbfabd15dab30036bbb6c7140.
|
2010-08-28 13:32:51 -07:00 |
|