maxwell
|
6410b68ea4
|
added correct path to ignore for uploads
|
2010-07-21 14:31:08 -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 |
|
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 |
|
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 |
|
Raphael
|
9165ac413a
|
image uploading started
|
2010-07-16 12:31:24 -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
|
b39f7cebd0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 10:39:18 -07:00 |
|
maxwell
|
081a6a2c73
|
MS IZ trying to delete commented stuff
|
2010-07-16 10:39:02 -07:00 |
|
Raphael
|
256757f02a
|
Rails.logger in a model
|
2010-07-16 10:29:42 -07:00 |
|
Raphael
|
9f90ae4db0
|
Syntax errors are awesome
|
2010-07-16 10:20:41 -07:00 |
|
Raphael
|
4178a78b23
|
Logger in receive friend request
|
2010-07-16 10:18:45 -07:00 |
|
Raphael
|
567d3f4dc5
|
Fixing friending deploy
|
2010-07-16 10:06:29 -07:00 |
|
Raphael
|
7dd8acadf7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 09:59:24 -07:00 |
|
Raphael
|
05e6dada58
|
Fixing deploy friending
|
2010-07-16 09:59:06 -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
|
9119d8af93
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:59:22 -07:00 |
|
maxwell
|
5dea277294
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:56:54 -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 |
|
Raphael
|
e5a5b5a828
|
Fixing zombies
|
2010-07-15 16:20:38 -07:00 |
|
Raphael
|
613e2da3e6
|
Made logging clearer, fixing zombiefriends
|
2010-07-15 16:11:19 -07:00 |
|
Raphael
|
82e3f6a14e
|
debugging zombiefriends
|
2010-07-15 16:06:10 -07:00 |
|
Raphael
|
417df7f874
|
debugging zombiefriends
|
2010-07-15 16:03:48 -07:00 |
|
Raphael
|
57d9bd1543
|
Added friending route to dashboards
|
2010-07-15 15:38:49 -07:00 |
|
Raphael
|
d7e07dfda8
|
comment specs fixed, comments now signed by post poster
|
2010-07-15 14:41:39 -07:00 |
|
Raphael
|
64c81f0551
|
merge in master, only friend tom
|
2010-07-15 14:18:22 -07:00 |
|
Raphael
|
862787ea93
|
RS, DG; person destruction no longer deletes comments
|
2010-07-15 14:12:01 -07:00 |
|
Raphael
|
2d5d3a2f2d
|
commit more often
|
2010-07-15 13:29:21 -07:00 |
|
Raphael
|
fd18ac6c4b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-15 13:06:46 -07:00 |
|
maxwell
|
720550189d
|
MS more cleanup
|
2010-07-15 10:59:36 -07:00 |
|
maxwell
|
1412265150
|
MS IZ now we can unsubscribe...probally
|
2010-07-15 10:43:18 -07:00 |
|
maxwell
|
99446d82c4
|
MS IZ more fixes
|
2010-07-15 10:30:51 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
892eec1959
|
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
|
2010-07-15 09:32:13 -07:00 |
|