Raphael Sofaer
38289b1a47
Multi-server integration tests are now possible
2011-05-25 15:16:14 -07:00
MrZYX
0c5bdece5a
warn and exit if there's no config at all
2011-05-25 23:39:54 +02:00
Sarah Mei
c6d61c68c0
Backfill some tests for app config, refactor base file name so people copy it instead of moving it
2011-05-25 11:07:29 -07:00
MrZYX
574deada03
get rid of nil values in app config, they destroy the merge
2011-05-24 23:54:31 +02:00
Raphael Sofaer
609439f948
Destroy notifications on contact destroy
2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781
Gross, but hopefully temporary solution for namespaced classes and old versions of libxml
2011-05-23 16:24:28 -07:00
Raphael Sofaer
6b094b2f35
Take out begin rescue in diaspora parser, that's handled in the resque job wrapper
2011-05-23 15:40:03 -07:00
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -07:00
Raphael Sofaer
7912c8af3b
Be nicer about changing app_config.yml to app.yml
2011-05-19 17:01:41 -07:00
danielgrippi
b0967ad8b4
Fakes respond as expected to respond_to?
2011-05-19 16:24:12 -07:00
MrZYX
443b66ba32
one more important app_config
2011-05-18 20:56:22 +02:00
MrZYX
60870cab37
one more app_config
2011-05-18 20:53:45 +02:00
Shane Becker
910cc52387
rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011
2011-05-18 11:46:45 -07:00
MrZYX
1a78c8fca1
whoops lets do a deep merge
2011-05-18 19:22:15 +02:00
MrZYX
e79a6597e6
eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something
2011-05-18 16:11:20 +02:00
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
MrZYX
00c6631f11
replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server
2011-05-17 16:00:47 +02:00
danielgrippi
55d39521c4
rescue redis connection attempts in websocket
2011-05-16 18:34:37 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
Sarah Mei
3b3ae86125
Get rid of annoying app_config.yml warning in test and development
2011-05-14 12:52:53 -07:00
Raphael Sofaer
70fd2e916a
Update rspec
2011-05-13 17:52:37 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
MrZYX
3e3b8e07b2
add space before adding pid to logline
2011-05-08 21:36:27 +02:00
Arzumy MD
fad9635022
Added spec for YOUTUBE_ID_REGEX, we can easily add more youtube url sample here later to avoid polluting application_helper spec
2011-05-06 00:47:40 +08:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10
#1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor
2011-05-05 00:05:59 +08:00
Arzumy MD
cdf94a0275
#1019 comment/post handles multiple youtube links properly
2011-05-05 00:05:59 +08:00
Sarah Mei
84ca9dfed6
Fix splunk logging in 1.9
2011-04-29 20:57:25 -07:00
MrZYX
009bbb826b
added \b (word ending) to tag regex to exclude :;?! etc.; allow : in tags
2011-04-30 00:08:33 +02:00
Raphael Sofaer
4ed621fc1f
reenable logging
2011-04-28 09:38:28 -07:00
Raphael Sofaer
948725b946
Fix infinite scroll after changing aspects
2011-04-26 18:26:12 -07:00
Raphael Sofaer
ba3b4f7d60
Add PID to log lines
2011-04-25 11:54:25 -07:00
Maxwell Salzberg
e866fdb1f3
small fix to make atom valid
2011-04-22 11:01:38 -07:00
MrZYX
9df8f83276
fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber
2011-04-17 21:28:09 +02:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
Raphael Sofaer
9383388bb6
Dumb fix for pagination
2011-04-13 10:46:31 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
352d1c6abf
fixed disconnecting logic. specs&cucumber green
2011-04-11 15:10:51 -07:00
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
MrZYX
54aa2c7ce3
whoops, let's not break inital fetching
2011-04-09 20:21:27 +02:00
MrZYX
e7eb9adbf5
do not webfinger if we have no clue about the handle
2011-04-09 18:40:40 +02:00
MrZYX
fbe91aba3a
refetch profile if it's missing, comment out hydra stub for now because it breaks the specs
2011-04-09 15:20:28 +02:00
danielgrippi
c128cae4ec
specs green after moving ContactController#new to AspectsMembership#new
2011-04-08 11:44:09 -07:00
danielgrippi
aeda5a4e39
dispatching / receiving logic complete. following wip.
2011-04-07 18:29:24 -07:00
Raphael Sofaer
8af6fab0a4
Move rspec rake stuff into loaderror begin-rescue so that we can deploy with --without test
2011-04-06 14:44:04 -07:00
Raphael Sofaer
847a66735a
Increase time between thin restarts, rescue jasmine load failure for deploying without test gems
2011-04-06 14:32:46 -07:00
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
Raphael Sofaer
3fb822c6c5
Fix distinct problem
2011-04-06 12:29:05 -07:00
Raphael Sofaer
bbf1bf00cb
Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.
2011-04-06 12:11:49 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
Raphael Sofaer
fa41c1fc52
Stream query... FIXED?????
2011-04-05 14:56:56 -07:00
Raphael Sofaer
746a0c38b3
Take another shot at fixing pagination
2011-04-05 13:59:15 -07:00
Raphael Sofaer
fddd252aee
Take out limit hack, pass offset through instead
2011-04-05 11:50:09 -07:00
Raphael Sofaer
03e37d2186
Using union in stream query
2011-04-05 11:40:32 -07:00
Raphael Sofaer
fdb6675f28
Make things more postgres compatible
2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b
follow wip. 2 failures.
2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
Raphael Sofaer
b48b483eab
Still working on stream query
2011-04-04 13:06:15 -07:00
Raphael Sofaer
d09bf35213
Add tests for raw_visible_posts
2011-04-04 12:07:19 -07:00
MrZYX
42523139c7
fixed for ruby 1.9
2011-04-03 22:11:52 +02:00
MrZYX
92bf8444a7
added spec; rtl? -> direction_for
2011-04-03 04:20:08 +02:00
MrZYX
a1c3a6dc1e
lets see if that fixes the build
2011-04-02 15:53:58 +02:00
Raphael Sofaer
24fffc0220
Simplify query, now we just have to fix it
2011-03-30 19:17:52 -07:00
Raphael Sofaer
435b16b30a
Don't index on just hidden
2011-03-30 19:17:52 -07:00
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
Raphael Sofaer
e3ad078ba5
Scope querying in PhotosController#show
2011-03-30 16:40:01 -07:00
Raphael Sofaer
8c9a7e1c41
Fix PhotosController#show
2011-03-30 15:43:44 -07:00
maxwell
6364f2a332
clean activity streams, fix test
2011-03-30 14:27:20 -07:00
MrZYX
cd3a307785
disallow % in tags
2011-03-30 20:02:10 +02:00
MrZYX
66ea747571
disallow dots in tags as rails routing system doesn't like them
2011-03-30 15:41:26 +02:00
danielgrippi
0c8db5beee
Fix find_visible_post_by_id
2011-03-29 20:17:19 -07:00
danielgrippi
2487db3257
reduce the number of ruby objects instantiated in posts_from
2011-03-29 20:03:16 -07:00
danielgrippi
5b0da52e0a
fixed comment socketing bug, post ordering on own profile page.
2011-03-29 19:40:44 -07:00
danielgrippi
93b82a377f
fix temp pagination fix in raw_visible_posts.
2011-03-29 19:20:31 -07:00
danielgrippi
5bd47f20c1
Only get non-pending posts in posts_from
2011-03-29 19:00:51 -07:00
danielgrippi
b3cb8e0a2b
temp fix for pagination. photos index fix
2011-03-29 18:55:00 -07:00
danielgrippi
aa4c20e404
pass post to comments partial. use sql in raw_visible_posts
2011-03-29 17:31:57 -07:00
danielgrippi
99e55c82eb
disambiguate ordering
2011-03-29 17:31:56 -07:00
danielgrippi
371aa71ca8
add ordering to raw_visible_posts
2011-03-29 17:31:56 -07:00
danielgrippi
6df652a513
Limit posts in raw_visible_posts
2011-03-29 17:31:56 -07:00
danielgrippi
97d8b34599
Fix all specs, add foreign key constraints on post_visibility
2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91
8 failures left. wip.
2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5
Moving PostVisibility to aspects, WIP, model specs pass
2011-03-29 17:31:56 -07:00
zhitomirskiyi
18ea46710b
not delivering to local for profiles
2011-03-29 17:23:28 -07:00
MrZYX
421e50d2ca
specify what we don't want in a tag for now
2011-03-26 19:02:04 +01:00
Raphael Sofaer
6855447204
unicode fix in tags
2011-03-25 17:39:44 -07:00
Raphael Sofaer
fef226156c
Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable?
2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628
Relayable retractions pretty much done
2011-03-25 16:09:37 -07:00
Raphael Sofaer
cc84ddbe94
Move encryptable out of relayable for use in relayable_retraction
2011-03-25 16:09:37 -07:00
danielgrippi
f36e884d67
added logo to atom feed
2011-03-25 10:16:00 -07:00
Raphael Sofaer
85e0736e5b
Remove stray puts
2011-03-21 17:12:54 -07:00
zhitomirskiyi
70d71ec491
service users is green
2011-03-21 14:56:50 -07:00
MrZYX
88e642ffdb
disallow _ in tags because they interfer with markdownify
2011-03-21 22:31:01 +01:00
Sarah Mei
10019bb3db
Fix User spec. Also, people_in_aspects now won't let you get people for aspects you don't own. people_in_aspects should probably be arel and/or an association extension.
2011-03-19 13:25:27 -07:00
danielgrippi
3db11cf38d
PostsController#index -> TagsController#show
2011-03-18 20:57:39 -07:00
Raphael Sofaer
bef06d18d8
Move notifying iteration into resque job
2011-03-17 15:19:26 -07:00
Raphael Sofaer
5a1d8d091a
Fix condition for queuing job
2011-03-17 14:12:52 -07:00
Raphael Sofaer
0aa5193434
Use the new local batch receive job
2011-03-17 13:41:30 -07:00
Raphael Sofaer
72523cc7f9
SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to
2011-03-17 12:56:23 -07:00
Raphael Sofaer
3718a72f46
log renders of collections of partials with more info
2011-03-17 11:36:16 -07:00
Kiran Soumya
6d113da242
Bug Fix:868 for Users unable to download photos
2011-03-17 01:14:05 +05:30
danielgrippi
68479481cf
made websockets far less dumb. don't render partials for people not connected.
2011-03-15 18:21:09 -07:00
maxwell
1164303251
do not call a remote job if their are no remote subscribers
2011-03-15 17:49:43 -07:00
danielgrippi
39b8fed431
Change includes aspects to joins aspects
2011-03-15 15:00:17 -07:00
danielgrippi
1988e195fb
a user can put tags in their profile and they show up on the person/show page.
2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d
breaking out Diaspora::Taggable wip
2011-03-15 13:21:36 -07:00
Raphael Sofaer
1b0445563e
Specs passing with text
2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408
Changing message to text, partway done, deleted data conversion
2011-03-14 11:39:31 -07:00
Raphael Sofaer
9f368bf82f
Change person show page to created_at ordering, since you're looking at that person's content
2011-03-11 10:15:17 -08:00
Sarah Mei
a80179e77f
Fix requires for 1.9 build. Hopefully now it will just fail for perf reasons :p
2011-03-10 23:18:52 -08:00
maxwell
7b0a354677
slight tweaks to pubsubhubub publishing
2011-03-10 12:17:34 -08:00
MrZYX
6d314e9394
fixed ostatus builder + spec
2011-03-10 15:17:56 +01:00
maxwell
337831bba2
move ostatus builder, actually added the file.
2011-03-09 18:01:48 -08:00
maxwell
1ac688f82c
moved an ostatus builder query out to the controller, where it belongs, and corrected the order
2011-03-09 17:33:47 -08:00
maxwell
f9279f9bbc
fixed public route not fetching posts, also an error in status_message activity markup
2011-03-09 17:08:41 -08:00
Raphael Sofaer
3f5844aaa0
Integerify logged time
2011-03-09 16:17:29 -08:00
Raphael Sofaer
5cc7aa4496
Change some person_ids to author_ids
2011-03-09 15:28:27 -08:00
Raphael Sofaer
e38a136c49
don't quote floats
2011-03-09 15:28:08 -08:00
Raphael Sofaer
3c4ec6d39d
LOG MORE STUFF
2011-03-09 14:29:49 -08:00
Raphael Sofaer
cf93bfc89b
improve hash logger a bit
2011-03-09 14:06:48 -08:00
Raphael Sofaer
f8c0906db7
Instrumenting activerecord object instantiation to do some profiling
2011-03-09 13:54:28 -08:00
Raphael Sofaer
c259fc65f0
You can now pass hashes to the logger
2011-03-09 11:48:29 -08:00
MrZYX
deeb8044f5
handle the case that admins is unset in the app_config.yml
2011-03-09 20:03:46 +01:00
MrZYX
b21ea3c85a
downcase usernames from the admins section in the AppConfig
2011-03-09 18:34:30 +01:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
zhitomirskiyi
9490538e44
checking for relayable in the dispatcher and the receiver
2011-03-08 11:55:17 -08:00
danielgrippi
fca5310c77
dispatch the conversation in ConversationsController
2011-03-07 17:54:25 -08:00
Raphael Sofaer
b7c3f93d25
Use delegation in PostFake, use render => :collection in stream
2011-03-07 12:20:46 -08:00
danielgrippi
48fff29bf6
fixed conversation receive. made visibilities on conversation :dependent => :destroy
2011-03-04 11:19:01 -08:00
zhitomirskiyi
9d7611f8d8
addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling
2011-03-02 12:27:57 -08:00
Raphael Sofaer
68f0f7ec21
Add rcov task
2011-03-01 18:12:42 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0
Delete statistic and data point models
2011-03-01 16:54:12 -08:00
danielvincent
11309574cf
messages are now relayable, a comment has an author as opposed to a person.
2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397
private messages wip
2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b
broke out some comment logic to a replayable module
2011-03-01 12:28:33 -08:00
Raphael Sofaer
8a4ca3af0e
fix error on account deletion
2011-02-28 11:24:31 -08:00
MrZYX
0fc5f1c043
log the 'received comment but no corresponding post' case
2011-02-26 16:50:47 +01:00
zhitomirskiyi
e61cc2fd34
made the postzord take the services in individually
2011-02-24 17:31:54 -08:00
zhitomirskiyi
126925f28f
wip
2011-02-24 17:31:54 -08:00
Raphael Sofaer
126a4b2547
LOG MORE, on resque job errors
2011-02-24 13:11:57 -08:00
Raphael Sofaer
faf026dec6
Update dispatcher to use HttpMulti job
2011-02-23 16:06:55 -08:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
MrZYX
05a7b88899
I need this to run the specs… dunno why
2011-02-18 17:22:19 +01:00
maxwell
7ace73b84b
iz ms wip fixing contactController destroy
2011-02-17 18:05:21 -08:00
maxwell
17a801394e
work in progress. need to update the views for the controller changes
2011-02-17 18:05:21 -08:00
Raphael Sofaer
10805c1187
Log stacktrace lines from diaspora/lib as well as diaspora/app
2011-02-12 15:43:08 -08:00
Raphael Sofaer
8dc3e5efa8
restrict log lines a little further
2011-02-12 12:09:50 -08:00
MrZYX
e76c5068d1
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-12 21:08:06 +01:00
MrZYX
6f4ffee1e4
small fix to logging
2011-02-12 21:07:46 +01:00
Sarah Mei
84d596ee47
Clean up the public/uploads folder after ci runs.
2011-02-12 09:16:12 -08:00
Raphael Sofaer
c173bf5104
reorder log line in SQL event
2011-02-11 16:29:38 -08:00
Raphael Sofaer
a9eef6018c
log bits of caller and a hashcode of caller, we'll probably want to take out logging caller as it may be slow
2011-02-11 15:55:02 -08:00
Raphael Sofaer
8db6f49e64
Log all sql
2011-02-11 11:12:03 -08:00
Raphael Sofaer
d17b4340e9
Log milliseconds, not microseconds
2011-02-10 16:02:26 -08:00
Raphael Sofaer
bb58544a70
Add logging for GC (slight slowdown, but worth it for the data)
2011-02-10 15:52:00 -08:00
maxwell
84325edeb8
Revert "added prune method"
...
This reverts commit 7078937311 .
2011-02-03 15:10:54 -08:00
maxwell
7078937311
added prune method
2011-02-03 14:47:04 -08:00
maxwell
7bfaf462c8
zomg actually set the db and use it
2011-02-02 15:33:19 -08:00
maxwell
450696fa60
added db to variables
2011-02-02 15:31:55 -08:00
maxwell
228c1a85e8
add equals
2011-02-02 15:12:51 -08:00
maxwell
f97c4ae5c9
adding loading of user and password from database.yml
2011-02-02 15:09:19 -08:00
maxwell
94135827ce
add mysql dump cron and task
2011-02-02 14:55:13 -08:00
Sarah Mei
9a6fca87ff
Re-enable running a single cucumber feature on the command line
2011-02-02 11:13:59 -08:00
maxwell
d040380e57
fix data conversion spec, ILYA
2011-02-01 22:27:07 -08:00
Sarah Mei
59a6c3b3a0
Fix import database errors by not importing notifications
2011-01-31 21:36:10 -08:00
Dan Hansen
2e03c7f9f6
forgot to remove these files from my previous commit
2011-01-31 15:23:04 -06:00
Dan Hansen
3746d296b0
fix dom traversing for embedder
2011-01-31 15:15:30 -06:00
Raphael
31e4683183
Finished contacts of contacts for local users
2011-01-27 13:41:22 -08:00
Raphael
a6f8b2c14e
Add splunk logging for errors
2011-01-27 11:44:35 -08:00
Philip Champon
0588dafe6b
added enumeration to args and a spec to verify it
2011-01-27 12:46:02 -05:00
Raphael
f892a00b99
Fix data conversion, fixture generation in publicscontroller
2011-01-26 18:39:09 -08:00
Raphael
b67aca0ffc
Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns
2011-01-26 18:29:23 -08:00
zhitomirskiyi
d595a64169
new interface to send invitation WIP
2011-01-26 12:16:47 -08:00
Raphael
906cb36adf
Fix double notifications on comments, write a bunch of comment dispatch tests. Alliterate.
2011-01-25 16:46:51 -08:00
zhitomirskiyi
716899f919
don't dispatch locally on comments if you're the post owner
2011-01-24 19:13:48 -08:00
zhitomirskiyi
8f05b638b3
holy crap fixed that comment dispatch bug
2011-01-24 18:21:27 -08:00
maxwell
a28a861509
fix url helpers on fakes
2011-01-24 18:01:40 -08:00
zhitomirskiyi
e9e01e965e
fixed error with comments saving twice on the same pod
2011-01-24 17:24:29 -08:00
maxwell
1b3c58c2c2
Use a fake to not allocate an AR model for every reference to a person
2011-01-24 15:13:52 -08:00
Sarah Mei
0b39359d1c
Standardize how we're requiring config/environment
2011-01-23 12:42:09 -08:00
Sarah Mei
225e5fc9d7
This much untested code makes me sad. But I fixed the bug whereby no rake tasks worked because of the require line.
2011-01-21 22:03:21 -08:00
zhitomirskiyi
f89c442730
statistics class does distributions and averages on its DataPoints
2011-01-21 10:29:07 -08:00
zhitomirskiyi
55bfbfd5b0
added users_with_posts_today to DataPoint
2011-01-21 10:29:07 -08:00
zhitomirskiyi
0dc0af015f
added methods to statistics rake task
2011-01-21 10:29:06 -08:00
Raphael
591915a2cd
Add some includes to a query
2011-01-20 15:22:35 -08:00
Raphael
19a86eb5a3
Remove useless transaction_id from request logs
2011-01-20 15:03:33 -08:00
Raphael
5eb0bf6736
Speed up person show
2011-01-19 18:45:45 -08:00
zhitomirskiyi
1d228fa819
stats rake file now works with mysql; production
2011-01-19 17:04:46 -08:00
maxwell
e7a065a521
make jobs have a base class, which will verify the activerecord connection before trying the job
2011-01-19 14:10:42 -08:00
maxwell
465dd9ba96
check to see if rails is already loaded in a couple of places
2011-01-19 13:30:12 -08:00
Raphael
eee9561656
Specify type
2011-01-17 19:40:14 -08:00
Raphael
6474ca9540
display photos correctly
2011-01-17 19:34:33 -08:00
zhitomirskiyi
86c2686b9a
a little begin rescue magic for uploading to s3
2011-01-17 15:56:06 -08:00
zhitomirskiyi
47671ac332
no pod_url
2011-01-17 15:56:06 -08:00
zhitomirskiyi
0c8aca3ef8
rebasing
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
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
Raphael
db417abc18
Fix person show
2011-01-17 14:30:57 -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
Sarah Mei
bb04224187
Add db:migrate to cruise task for mysql branch
2011-01-15 19:39:01 -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
Raphael
8f91689b3f
Require config environment rather than the environment rake task
2011-01-14 10:48:01 -08: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
d6cae5862d
The cool kids store birthdays in unix time
2011-01-13 19:29:44 -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
Raphael
f2a27ea970
Another try at getting the youtube titles in
2011-01-13 18:15:44 -08:00
Raphael
597a7a8a03
Revert "Serialize youtube titles to yaml to ActiveRecord can read them"
...
This reverts commit b42bffa6fa .
2011-01-13 17:16:06 -08:00
Raphael
2f4be3c9c4
Revert "keep nil nil"
...
This reverts commit fb12f5de52 .
2011-01-13 17:15:43 -08:00
Raphael
fb12f5de52
keep nil nil
2011-01-13 17:03:55 -08:00
Raphael
b42bffa6fa
Serialize youtube titles to yaml to ActiveRecord can read them
2011-01-13 16:51:09 -08:00
zhitomirskiyi
54d4f4350d
one event
2011-01-13 15:11:00 -08:00
zhitomirskiyi
9e332a6188
comma
2011-01-13 14:40:48 -08:00
zhitomirskiyi
1a995d5f03
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-13 13:36:18 -08:00
zhitomirskiyi
97e5c3cb2c
typo
2011-01-13 13:36:03 -08:00
maxwell
b116362c5d
notifications for local comments
2011-01-13 13:02:02 -08:00
zhitomirskiyi
99931cdf41
splunking some stats
2011-01-13 12:54:18 -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
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
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
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
52f1ce81fb
No syntax errors, but invitation and request importing still not working
2011-01-10 11:34:04 -08:00
Alec Leamas
e09771d9b4
Create a separate webfinger service.
2011-01-09 23:38:36 +01:00
Raphael
555932d67e
Import invitations
2011-01-09 02:25:35 -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
Raphael
e8d46982d8
Aspect memberships now importing
2011-01-07 16:58:39 -08:00
Raphael
6abedf5f87
Contacts now importing
2011-01-07 16:28:52 -08:00
Raphael
aa624b4df0
People now importing, additional failing tests on imported times
2011-01-07 16:09:08 -08:00
maxwell
36d6864b40
only locally socket comments
2011-01-07 15:17:18 -08:00
Raphael
9bd2de06ee
Services need a mongo_id
2011-01-07 15:14:45 -08:00
Raphael
62486a17b6
Aspects imported correctly
2011-01-07 14:54:50 -08:00
maxwell
8f1f01f0a3
if you write jobs, you should use them in you app
2011-01-07 14:03:46 -08:00
Raphael
1187c13170
Import for users, test for aspects import
2011-01-07 13:25:50 -08:00
zhitomirskiyi
868cb1efc1
checking that filepath exists
2011-01-07 10:57:37 -08:00
Raphael
ff44003ea3
Import some more times
2011-01-07 10:56:46 -08:00
Raphael
686713dc4b
assert on type before typecasting, do not tolerate empty strings where NULL should be.
2011-01-07 10:49:07 -08:00
zhitomirskiyi
c8e161f1cf
photo backups are now in 4.5 gb chunks
2011-01-07 09:37:45 -08:00
Raphael
abdb5f7587
serialized hashes need a NULLIF, as do many other fields, probably
2011-01-06 17:26:08 -08:00
maxwell
153c4925d6
test for pubsubhububb jobs
2011-01-06 17:19:13 -08:00
Raphael
89a41826c1
Started raw post import
2011-01-06 17:01:17 -08:00
Raphael
7c3c17a418
Move fantasy_resque to the fake_resque file, add services to the mysql export fixture
2011-01-06 16:34:28 -08:00
Raphael
e46b3e6cf3
Import raw services, I think we need to change the name of the type field (is it supposed to be in provider?) other than that, only posts remain.
2011-01-06 16:23:18 -08:00
Raphael
7668276a99
Set booleans correctly
2011-01-06 15:42:34 -08:00
Raphael
770e90064d
nullif fixes raw person import
2011-01-06 15:16:32 -08:00
Raphael
283a5501be
Boolean values aren't importing; we may need SET statements for them
2011-01-06 14:58:42 -08:00
Raphael
7c4d35cf28
raw import of notifications, failing to pull in unread
2011-01-06 14:37:59 -08:00
Raphael
564dd993b7
raw import of Invitation
2011-01-06 14:30:38 -08:00
Raphael
a1419b9dc0
Person#owner_mongo_id should be null if the csv has an empty string
2011-01-06 14:16:51 -08:00
Raphael
9ba43b148f
Move resque modifications out to spec/support
2011-01-06 12:33:12 -08:00
Raphael
8d62ad8896
Add some reloads
2011-01-06 12:33:12 -08:00
Raphael
0284f0fd6d
Write fixture for mysql export
2011-01-06 12:33:12 -08:00
maxwell
11808e3233
adding tests for pubsub client'
2011-01-06 11:47:16 -08:00
Raphael
3df36721d6
Move attribute lists out to base, so they are together and we can use them in the import
2011-01-06 10:31:45 -08:00
Sarah Mei
75ac7e91c8
Refactor ImportToMysql; add import_raw. Add rake task for import.
...
Remove unique constraint on index on mongo_requests.
2011-01-05 23:54:22 -08:00
maxwell
27d8cc8003
added sync pubsubhubbub publisher client. we now should not longer require eventmachine, (in the server process, the websocket still requires it). this should also be in a job
2011-01-05 19:02:43 -08:00
Raphael
925184110d
Make postzord a module
2011-01-05 18:31:19 -08:00
maxwell
a7d651236f
make the postman work across everything. remove lots of now useless methods
2011-01-05 17:44:08 -08:00
maxwell
5e58eba240
new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times
2011-01-05 17:43:25 -08:00
maxwell
8819d288c4
i am greeen
2011-01-05 17:43:25 -08:00
maxwell
80edb498f2
--amend
2011-01-05 17:43:25 -08:00
maxwell
3fe30cde12
removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out
2011-01-05 17:43:25 -08:00
Raphael
ff1cad6e63
raw import for requests
2011-01-05 17:38:00 -08:00
Raphael
0d80ded2d3
Raw import for post_visibilities
2011-01-05 17:25:11 -08:00
zhitomirskiyi
ce470e74ee
notification calls email notification
2011-01-05 17:21:55 -08:00
Raphael
a02eb39bf1
error in profile export
2011-01-05 17:03:22 -08:00
Raphael
7b721836c8
Add the fixtures I've been using, fix a problem in person export
2011-01-05 16:49:04 -08:00
Raphael
b34acfd4eb
Add contact raw import, fixtures have no comments
2011-01-05 16:40:16 -08:00
Raphael
e4ef2641f8
raw import of aspects and aspect memberships
2011-01-05 15:40:04 -08:00
Raphael
079e2f4cb2
Get a little further in importing times
2011-01-05 11:51:36 -08:00
Sarah Mei
bed82d68ab
how about we don't accidentally delete Rails.root, mmmkay?
2011-01-04 22:54:19 -08:00
Sarah Mei
7f86a9e1ba
ImportToMysql now loads users.csv. Spec currently failing on datetime conversion.
2011-01-04 22:43:32 -08:00
Sarah Mei
80867bbc54
Make directory settable.
2011-01-04 21:08:28 -08:00