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 |
|
maxwell
|
f07740454a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 19:30:28 -07:00 |
|
danielvincent
|
249948a500
|
hotfix for photos/collection relationship to fix photo saving
|
2010-07-20 19:29:19 -07:00 |
|
maxwell
|
dac3c7a8de
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 16:22:08 -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 |
|
danielvincent
|
51fd87db36
|
no ideas why collection saving isn't working...
|
2010-07-20 15:15:11 -07:00 |
|
ilya
|
1bd2c16ef1
|
DG IZ started the collection spec
|
2010-07-20 14:01:56 -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
|
d420652311
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:41:56 -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 |
|
Raphael
|
8e8c48eac9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:31:51 -07:00 |
|
Raphael
|
d8cbbcf6c8
|
Added photo file validation spec
|
2010-07-20 11:31:41 -07:00 |
|
Raphael
|
de3a08d031
|
Took out putses
|
2010-07-20 10:23:19 -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 |
|
maxwell
|
ec3f6e6765
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-17 19:22:26 -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 |
|
Raphael
|
bb21361a6b
|
Photo controller fixed
|
2010-07-17 18:13:51 -07:00 |
|
maxwell
|
917d58acbb
|
MS found one more duplicate in the Gemfile
|
2010-07-17 14:10:31 -07:00 |
|
Raphael
|
7d7c39e3dc
|
callbacks not running on photo save
|
2010-07-17 14:09:21 -07:00 |
|
danielvincent
|
c8c76ddab5
|
added auth_user back to photos controller
|
2010-07-17 14:08:18 -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 |
|
Raphael
|
93e900b998
|
fixed comments, did I break request url?
|
2010-07-17 11:29:30 -07:00 |
|
Raphael
|
d8ad4367d5
|
Tests now pass
|
2010-07-17 09:32:41 -07:00 |
|
maxwell
|
eb4153ec8f
|
did a couple of things to the request page
|
2010-07-16 23:22:18 -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
|
44b4defb69
|
MS IZ YEAAAAAAAAAAAAHHHHHgit push origin master git push origin master
|
2010-07-16 22:20:25 -07:00 |
|
maxwell
|
cd31d11aca
|
MS IZ adding a friend through the webfinger profile
|
2010-07-16 22:11:55 -07:00 |
|
maxwell
|
f34e033bce
|
MS IZ getting the profile
|
2010-07-16 21:59:40 -07:00 |
|
maxwell
|
58b052b07f
|
IZ MS small bugfix
|
2010-07-16 21:35:16 -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
|
c124a9ab41
|
IZ MS blogs ctivity streams/atom
|
2010-07-16 16:07:58 -07:00 |
|
maxwell
|
06238703c3
|
IZ MS bookmarks now create activity streams
|
2010-07-16 15:54:26 -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 |
|