MrZYX
1319099cf3
made some strings translatable
2011-01-12 15:58:10 +01:00
MrZYX
40fc8efec9
updated locales
2011-01-12 15:57:07 +01:00
Sarah Mei
756471be43
Fix 1.9 build. MAXWELL.
2011-01-11 19:58:27 -08:00
maxwell
73821859e6
require pubsubhubub in the job'
2011-01-11 16:24:59 -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
maxwell
5609422a7b
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-11 14:40:11 -08:00
maxwell
32d1d26e22
updated some dependancies
2011-01-11 14:39:44 -08:00
Raphael
3684546335
Require pubsubhubbub
2011-01-11 14:34:30 -08:00
maxwell
1f9813ce58
add autotest growl, if thats how you roll
2011-01-11 14:29:17 -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
Raphael
6bb132b25e
Revert 'Create a separate webfinger service.' We'll come back to it when we figure out the error.
2011-01-11 14:18:25 -08:00
Raphael
021bbc12ba
No guarantee that there aree join table rows for any given model
2011-01-11 12:04:57 -08:00
Raphael
f8be5a284c
Don't use the environment rake task, just require the environment
2011-01-11 11:05:21 -08:00
Sarah Mei
68eedd578a
mysql timezones: PWND.
2011-01-10 20:40:27 -08:00
Raphael
6ba587155a
explicit require in rake file
2011-01-10 18:48:12 -08:00
Raphael
b9afd6012c
export should require environment
2011-01-10 18:45:02 -08:00
Raphael
0b265012bc
Make task for full migration
2011-01-10 18:42:34 -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
30f98aec3c
Set notification target type after importing
2011-01-10 17:07:16 -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
Alec Leamas
1e3d70f98b
Add public/well-known dir for the moment.
2011-01-10 20:47:20 +01: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
Sarah Mei
38102ebda7
Revert "Mount application on proper location" - changes cause app to fail when there's no trailing / on the pod_url.
...
This reverts commit 18827b40d1 .
2011-01-09 18:32:01 -08:00
Sarah Mei
b865c20b2d
Backing out sub-uri changes
2011-01-09 18:29:43 -08:00
Alec Leamas
e09771d9b4
Create a separate webfinger service.
2011-01-09 23:38:36 +01:00
Alec Leamas
e01fb62eeb
Expose and refer to assets on the sub_uri.
...
When using sub-uri, create a symlink in public/ making the assets
available at the sub-uri. Modify environment.rb so that asset paths
refers to this sub-uri path. Closes http://bugs.joindiaspora.com/issues/391
and http://bugs.joindiaspora.com/issues/737 when application mounted
on suburi (i. e., prev patch)
2011-01-09 23:38:03 +01:00
Alec Leamas
18827b40d1
Mount application on proper location
...
Uses mapping in config.ru to respect sub-uri settings in pod_uri.
2011-01-09 23:37:47 +01:00
Raphael
555932d67e
Import invitations
2011-01-09 02:25:35 -08:00
danielvincent
685b809248
resque requires a job to be assigned to a queue. enable resque logging on posting to a hub
2011-01-08 18:13:54 -08:00
danielvincent
c16d0c46a2
comments do not queue up jobs for local users.
2011-01-08 17:53:01 -08:00
Sarah Mei
22f7d1d48b
Unix timestamps (output by mongo) are in milliseconds, but MySQL datetimes only have fidelity to seconds.
...
As a result we have to divide the exported value by 1000 before importing it (which coincidentally is the same as truncating the last 3 digits).
The remaining 8-hour difference is a time zone thing - haven't solved that one yet.
2011-01-08 17:18:09 -08:00
danielvincent
f2f3059d72
fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl
2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab
fixed all rspec/cucumber
2011-01-08 16:53:16 -08:00
danielvincent
6ca0b0014b
fade in aspect badges on stream
2011-01-08 15:24:03 -08:00
danielvincent
55fa1646c7
swapped out delete text for 'x' on stream_elements. controls fade in on hover
2011-01-08 15:06:25 -08:00
danielvincent
9cf1f5a023
fixed reshare with filters
2011-01-08 13:11:55 -08:00
danielvincent
cadba3f2b7
fixed specs with a reload. added header gradient for firefox
2011-01-08 13:11:55 -08:00