maxwell
|
0c24510682
|
remove an invalid spec
|
2011-01-17 18:33:30 -08:00 |
|
zhitomirskiyi
|
8d86585928
|
profile spec passes
|
2011-01-17 18:22:54 -08:00 |
|
zhitomirskiyi
|
8818a9bb6f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-17 18:04:21 -08:00 |
|
zhitomirskiyi
|
c28b5a22fb
|
here you go
|
2011-01-17 18:03:15 -08:00 |
|
Raphael
|
8bd784e5ab
|
Fix aspect edit
|
2011-01-17 17:36:36 -08:00 |
|
zhitomirskiyi
|
3f21a05e3e
|
remove s3 setting
|
2011-01-17 16:46:39 -08:00 |
|
Raphael
|
a6ff90ad20
|
removing database.yml
|
2011-01-17 16:17:08 -08:00 |
|
zhitomirskiyi
|
86c2686b9a
|
a little begin rescue magic for uploading to s3
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
390e19ecdd
|
some sod modz
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
47671ac332
|
no pod_url
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
995d285fdd
|
ssl s3, attrs
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
0c8aca3ef8
|
rebasing
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
7ef89acf81
|
added the redirect to the nginx conf
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
0f9dc4954a
|
added a task to upload
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
7477a22421
|
safeguard on absolutify rake task
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
7f87825186
|
fixed nil error in migration when dealing with remote images
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
1d52e06532
|
added rake task and spec for absolutifying existing image links
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
2eb1901073
|
s3 support minus rake migration.
|
2011-01-17 15:56:06 -08:00 |
|
Raphael
|
bd4efe8c2d
|
Escape youtube titles
|
2011-01-17 15:39:46 -08:00 |
|
zhitomirskiyi
|
baac8199da
|
MS IZ proper file requiring
|
2011-01-17 15:27:38 -08:00 |
|
zhitomirskiyi
|
3d4cf4d8d5
|
IZ MS required a file needed by the import
|
2011-01-17 14:56:30 -08:00 |
|
zhitomirskiyi
|
fc92779ddc
|
redirect after contact destroy
|
2011-01-17 14:46:38 -08:00 |
|
zhitomirskiyi
|
be92f3866c
|
IZ MS fix 500 on commnet notificaions
|
2011-01-17 14:46:38 -08:00 |
|
Raphael
|
68f2528f23
|
production in database yml example
|
2011-01-17 14:38:06 -08:00 |
|
Raphael
|
db417abc18
|
Fix person show
|
2011-01-17 14:30:57 -08:00 |
|
Raphael
|
a7e30adc28
|
Better test for unique contacts
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
4ba58d8132
|
Simplify hashes_for_contacts
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
6410355d71
|
Fix aspect edit page
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
6eb0dfb43f
|
Improve User#posts_from
|
2011-01-17 14:23:50 -08:00 |
|
zhitomirskiyi
|
79b613b0e5
|
MS IZ notifications now contain helpful test
|
2011-01-17 14:07:21 -08:00 |
|
Maxwell Salzberg
|
254c411bd9
|
prevent searching with spaces
|
2011-01-17 13:48:52 -08:00 |
|
Raphael
|
72785a69cb
|
Correct ordering problem in posts_from
|
2011-01-17 12:21:38 -08:00 |
|
Raphael
|
36781481bb
|
Pulling in changes from master
|
2011-01-17 11:41:15 -08:00 |
|
MrZYX
|
f17ba7b4eb
|
updated locales
|
2011-01-16 19:52:11 +01:00 |
|
Sarah Mei
|
dff4119765
|
Expose gem upgrade failures in CI.
|
2011-01-15 21:03:03 -08:00 |
|
Sarah Mei
|
bb04224187
|
Add db:migrate to cruise task for mysql branch
|
2011-01-15 19:39:01 -08:00 |
|
Sarah Mei
|
910ae49fca
|
Lock down gem versions & github refs in mysql branch because it's got that same damn aws problem.
|
2011-01-15 15:23:34 -08:00 |
|
Sarah Mei
|
2c91bfca96
|
Fix spec that fails under ruby 1.9.
|
2011-01-15 15:00:45 -08:00 |
|
Sarah Mei
|
eeba0e7a63
|
Remove a spec that tests a method that doesn't exist anymore.
|
2011-01-15 14:28:15 -08:00 |
|
Sarah Mei
|
795f715833
|
Fix notification spec to stub the right association.
|
2011-01-15 14:20:25 -08:00 |
|
Sarah Mei
|
fb136d22d0
|
Fix 1.8 build by rolling back aws gem. Fix 1.9 build by rolling back mongo_mapper to a previous ref. Prevent this from happening (as much) in the future by locking down versions in the Gemfile.
|
2011-01-15 10:44:24 -08:00 |
|
Sarah Mei
|
8b7bfd540d
|
Expose gem upgrade failures on CI. Build will break. Next checkin will fix it. :)
|
2011-01-15 10:04:39 -08:00 |
|
danielvincent
|
e2fdad02f1
|
css fixes, incl. timeago style fix on stream_element
|
2011-01-14 22:12:31 -08:00 |
|
Raphael
|
f87ddffc64
|
2 failures left in merge
|
2011-01-14 16:35:41 -08:00 |
|
zhitomirskiyi
|
a00fbb1717
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-14 16:11:37 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
maxwell
|
bc8821fdc5
|
Revert "some fixes for the alert widget"
This reverts commit 4e40c19342.
|
2011-01-14 14:28:03 -08:00 |
|
Dan Hansen
|
4e40c19342
|
some fixes for the alert widget
|
2011-01-14 15:13:09 -06:00 |
|
Dan Hansen
|
8103e66ea3
|
didn't mean to commit some changes in aspect-edit.js
|
2011-01-14 14:57:26 -06:00 |
|
Dan Hansen
|
d4f30ded1b
|
Diaspora.js 2.0, added an official widget, don't use native alerts anymore
|
2011-01-14 14:54:44 -06:00 |
|