maxwell
|
6869384732
|
i think it works - max
|
2010-07-21 21:15:16 -07:00 |
|
ilya
|
14533f6534
|
url not path
|
2010-07-21 21:13:31 -07:00 |
|
maxwell
|
9b1fcdbab2
|
MS DG some serious message handler and user request API stuff....needs way more tests
|
2010-07-21 20:33:43 -07:00 |
|
ilya
|
a222edc646
|
Url not path
|
2010-07-21 20:22:30 -07:00 |
|
ilya
|
ef7b9f58a7
|
IZ remote files
|
2010-07-21 19:51:34 -07:00 |
|
ilya
|
a75dfb0201
|
Album retractions
|
2010-07-21 18:27:18 -07:00 |
|
ilya
|
6b9a3fc518
|
Pushing Albums out
|
2010-07-21 18:26:03 -07:00 |
|
ilya
|
e23b139495
|
Adding logging to pushing
|
2010-07-21 18:25:33 -07:00 |
|
ilya
|
5a5842dbdc
|
Accidently started websocketing albums
|
2010-07-21 18:22:57 -07:00 |
|
ilya
|
a6104fd2b5
|
RS, IZ; Albums must be pushed
|
2010-07-21 18:07:38 -07:00 |
|
ilya
|
a4b0d47edc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 18:02:45 -07:00 |
|
ilya
|
606fa3353c
|
RS, IZ; Photos might push urls to friends
|
2010-07-21 18:02:13 -07:00 |
|
maxwell
|
ddffc5560a
|
rake db:purge includes albums and comments
|
2010-07-21 17:44:42 -07:00 |
|
maxwell
|
5c77ab048e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/controllers/requests_controller.rb
|
2010-07-21 17:06:42 -07:00 |
|
maxwell
|
0d268905e7
|
DG MS all photos of a album are destroyed on album deletion
|
2010-07-21 17:05:40 -07:00 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
Raphael
|
ebdbe0ee3d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:58:21 -07:00 |
|
Raphael
|
8caa0350b3
|
request fixing
|
2010-07-21 15:56:58 -07:00 |
|
maxwell
|
3cee09407c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:47:46 -07:00 |
|
maxwell
|
6f7f82e818
|
added helpers for photo show page
|
2010-07-21 15:47:30 -07:00 |
|
Raphael
|
9b4d92e1fa
|
trying to patch relationship controller
|
2010-07-21 15:36:14 -07:00 |
|
ilya
|
9686aad842
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:26:39 -07:00 |
|
ilya
|
d7e546c3b3
|
RS IZ Vim in sprinkle, not too nice
|
2010-07-21 15:26:08 -07:00 |
|
maxwell
|
a5f359ef1b
|
MS DG added a safe for viewing photosize
|
2010-07-21 15:08:00 -07:00 |
|
maxwell
|
0f407b11ed
|
MS DG comments now work on photo show page; full size photos now available
|
2010-07-21 14:58:06 -07:00 |
|
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 |
|
ilya
|
cb67a7fa1b
|
RS IZ sprinkle editing
|
2010-07-21 10:04:55 -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 |
|
ilya
|
0f95b93bab
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 13:31:06 -07:00 |
|
ilya
|
2345975f22
|
DG IZ; fixed show photo always expanding to 100% width
|
2010-07-20 13:31:01 -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 |
|