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
|
0c8aca3ef8
|
rebasing
|
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 |
|
Raphael
|
a7e30adc28
|
Better test for unique 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 |
|
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 |
|
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 |
|
Raphael
|
f87ddffc64
|
2 failures left in merge
|
2011-01-14 16:35:41 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08: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 |
|
Raphael
|
ae57c7a232
|
Stop testing on created_at, because I am so not updating the fixtures and we do have to export the times.
|
2011-01-13 19:59:01 -08:00 |
|
Raphael
|
300e055933
|
It turns out comments weren't importing because I didn't write the code to make them import.
|
2011-01-13 18:48:32 -08:00 |
|
maxwell
|
27162e59b8
|
adding new js file to jasmine
|
2011-01-13 17:00:08 -08:00 |
|
maxwell
|
b116362c5d
|
notifications for local comments
|
2011-01-13 13:02:02 -08:00 |
|
Dan Hansen
|
f807bc25d1
|
whitelist certain keyCodes, e.g. tab, fixes #795
|
2011-01-13 01:24:05 -06:00 |
|
Sarah Mei
|
9c87fff295
|
Log specs don't check for specific number of renders.
|
2011-01-12 22:43:45 -08:00 |
|
Dan Hansen
|
ce4fe1938c
|
remove references to fancybox, we use facebox
|
2011-01-13 00:24:10 -06:00 |
|
Sarah Mei
|
57141fc305
|
Pull logging out to a shared behavior. Remove 4 pending specs.
|
2011-01-12 21:57:05 -08:00 |
|
zhitomirskiyi
|
9b6faa5644
|
added a notificaions read button
|
2011-01-12 16:24:14 -08:00 |
|
maxwell
|
1661158f95
|
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
|
2011-01-12 10:47:39 -08:00 |
|
Sarah Mei
|
756471be43
|
Fix 1.9 build. MAXWELL.
|
2011-01-11 19:58:27 -08:00 |
|
maxwell
|
49b172f192
|
up with convention, down with case. pubsubhubbub now adhears to ruby caseing, rather than its own name weirdness
|
2011-01-11 15:04:03 -08:00 |
|
Raphael
|
3684546335
|
Require pubsubhubbub
|
2011-01-11 14:34:30 -08:00 |
|
maxwell
|
85295015ee
|
DG MS tests now green, plus autotest works again
|
2011-01-11 14:23:19 -08:00 |
|
maxwell
|
25f388d903
|
MS DG made receive encapsulated in an object
|
2011-01-11 14:23:19 -08:00 |
|
maxwell
|
23de681cb8
|
DG MS moved receive methods to their respective models
|
2011-01-11 14:23:18 -08:00 |
|
maxwell
|
220c6894fa
|
--amend
|
2011-01-11 14:23:18 -08:00 |
|
maxwell
|
daab8e80ce
|
basic receive cleanup
|
2011-01-11 14:23:18 -08:00 |
|
Sarah Mei
|
68eedd578a
|
mysql timezones: PWND.
|
2011-01-10 20:40:27 -08:00 |
|
Raphael
|
ee20b00f58
|
Only the time zone errors are left, and those could probably be ignored
|
2011-01-10 18:30:52 -08:00 |
|
Raphael
|
079151eeea
|
Set target_id on notifications
|
2011-01-10 17:30:37 -08:00 |
|
Raphael
|
f1e8b5c01d
|
Found problem in notification import, need to finish post and notification polymorphic stuff
|
2011-01-10 16:57:15 -08:00 |
|
Raphael
|
c90f3cb1ef
|
export more things from mongo
|
2011-01-10 16:36:48 -08:00 |
|
Raphael
|
f277fb3bb8
|
Specs for post_visibilities and notifications imports
|
2011-01-10 15:55:59 -08:00 |
|
Raphael
|
f4465c9d32
|
Naive import of posts, still need to set status_message_id on photos
|
2011-01-10 15:41:53 -08:00 |
|
Raphael
|
fefc4ba60e
|
Posts are the next model to import, then postvisibility, then notifications
|
2011-01-10 13:22:05 -08:00 |
|
Raphael
|
92aecb3bec
|
Start profile import, fixtures are wrong
|
2011-01-10 12:25:13 -08:00 |
|
Raphael
|
47ed820dea
|
Invitations and requests importing
|
2011-01-10 11:51:34 -08:00 |
|
Raphael
|
52f1ce81fb
|
No syntax errors, but invitation and request importing still not working
|
2011-01-10 11:34:04 -08:00 |
|
Sarah Mei
|
f273d6938e
|
Fix pagination spec - we don't care which 25 things are returned, just that 25 are returned.
|
2011-01-09 20:44:23 -08:00 |
|
Sarah Mei
|
545fbe4679
|
Fix jasmine specs by replacing fancybox with facebox, and changing expectation to match new view.
|
2011-01-09 19:41:18 -08:00 |
|