maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
maxwell
|
8131e413a4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 22:59:18 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
ilya
|
9e78c9b64c
|
removing setup person
|
2010-08-18 21:58:29 -07:00 |
|
ilya
|
0a3277d306
|
maybe the instantiate method will help
|
2010-08-18 21:51:51 -07:00 |
|
ilya
|
0f6ec71dcd
|
we need assign key as well
|
2010-08-18 21:45:41 -07:00 |
|
ilya
|
b081bdcfdf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:43:20 -07:00 |
|
ilya
|
0c9f041f28
|
we need do bad things in the user for seeding the database
|
2010-08-18 21:42:37 -07:00 |
|
maxwell
|
ff41277088
|
one thing beta couldnt handle
|
2010-08-18 21:34:02 -07:00 |
|
maxwell
|
3986993b9f
|
updateing bundle task
|
2010-08-18 21:25:52 -07:00 |
|
maxwell
|
0eb0a69990
|
MS merging
|
2010-08-18 21:24:15 -07:00 |
|
maxwell
|
a26543b4a5
|
rolling back
|
2010-08-18 21:22:49 -07:00 |
|
Raphael
|
00b070f2fc
|
added stuff to clear_bundle
|
2010-08-18 21:21:56 -07:00 |
|
Raphael
|
7ce8f94d58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:10:48 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
maxwell
|
f7d74e9f93
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:06:13 -07:00 |
|
maxwell
|
f5d0f24ea9
|
foo
|
2010-08-18 21:05:27 -07:00 |
|
ilya
|
36c06349c5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 20:59:18 -07:00 |
|
ilya
|
284601c6b1
|
got moved photo.image.stuff to photo.url[:stuff]
|
2010-08-18 20:59:01 -07:00 |
|
maxwell
|
d054162bbe
|
more RC updating stuff
|
2010-08-18 20:51:55 -07:00 |
|
Raphael
|
701bec670f
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 20:50:28 -07:00 |
|
Raphael
|
0459631d47
|
Show debug
|
2010-08-18 20:49:06 -07:00 |
|
maxwell
|
dc4e595be6
|
added some bundler magic
|
2010-08-18 20:26:27 -07:00 |
|
ilya
|
0d392a5e7e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 20:14:47 -07:00 |
|
ilya
|
3243435015
|
the album create doesn't crash the app
|
2010-08-18 20:14:31 -07:00 |
|
maxwell
|
9ccdf7ec41
|
Some small rails 3rc things
|
2010-08-18 20:14:03 -07:00 |
|
maxwell
|
2a99b129dc
|
Some small rails 3rc things
|
2010-08-18 20:10:12 -07:00 |
|
maxwell
|
c82c91f7eb
|
pushing stuff to deploy
|
2010-08-18 20:01:44 -07:00 |
|
maxwell
|
e66e37addf
|
MS getting bundler behaving
|
2010-08-18 19:52:00 -07:00 |
|
maxwell
|
625cd1c99e
|
augmenting bundle calls
|
2010-08-18 19:36:53 -07:00 |
|
maxwell
|
00c80ed662
|
MS moving to master
|
2010-08-18 18:23:44 -07:00 |
|
maxwell
|
c387556612
|
Merge branch 'master' of github.com:diaspora/diaspora into rails_rc
|
2010-08-18 18:23:07 -07:00 |
|
ilya
|
ef15cddf19
|
RS, IZ a slash
|
2010-08-18 18:13:17 -07:00 |
|
ilya
|
5cae2b21b1
|
RS, IZ fixed the url for the image
|
2010-08-18 18:06:13 -07:00 |
|
maxwell
|
fec0a5ed7f
|
MS not going for real mongomapper yet
|
2010-08-18 17:56:36 -07:00 |
|
ilya
|
f6892b88d6
|
photo.remote_photo is relative
|
2010-08-18 17:50:13 -07:00 |
|
maxwell
|
11dcfe10f8
|
added bundler update task
|
2010-08-18 17:47:39 -07:00 |
|
maxwell
|
6e2c42f8de
|
MS app now works with rc1
|
2010-08-18 17:42:04 -07:00 |
|
ilya
|
76b4b55e98
|
Added spec for remote photo url setting to photos
|
2010-08-18 17:39:38 -07:00 |
|
ilya
|
4019e4425a
|
Checking for failing to set url in photo
|
2010-08-18 17:12:28 -07:00 |
|
ilya
|
b279d6582b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:59:52 -07:00 |
|
ilya
|
803de25cc0
|
DG IZ albums are now posts
|
2010-08-18 16:59:19 -07:00 |
|
Raphael
|
5a2b42e4e5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:37:12 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|
ilya
|
516a667ce4
|
going back to showing the first group on the index page
|
2010-08-18 16:35:11 -07:00 |
|
ilya
|
5de9362933
|
DG IZ setting group id to nil and changing the deploy script for renaming of the repo
|
2010-08-18 16:27:08 -07:00 |
|
ilya
|
d0b2a23fcb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:17:00 -07:00 |
|
ilya
|
21f70c643d
|
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
|
2010-08-18 16:15:10 -07:00 |
|
Raphael
|
39c96bfd04
|
Changing to a smaller pic in the tests
|
2010-08-18 16:00:06 -07:00 |
|
Raphael
|
ac694eda8c
|
A bunch of dumb checks to make the group index publisher pass tests
|
2010-08-18 15:42:06 -07:00 |
|