nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13731 commits 4 branches 0 tags 121 MiB
Commit graph

1606 commits

Author SHA1 Message Date
Raphael Sofaer
e1a7ff798a Seed in rebuild 2011-07-09 16:55:05 -07:00
Raphael Sofaer
c83276a9d9 OK, now I get what was going on. 2011-07-07 22:17:42 -07:00
Raphael Sofaer
d8e891b492 Revert "escape js in format_tags until I can think about whether we have an XSS problem in the morning" 
This reverts commit 8af95909c2.
 2011-07-07 22:13:02 -07:00
Raphael Sofaer
8af95909c2 escape js in format_tags until I can think about whether we have an XSS problem in the morning 2011-07-07 21:54:56 -07:00
Raphael Sofaer
d0ce257107 Revert "Revert "Merge branch 'hashtags-in-comments'"" 
This reverts commit d2e26f6937.
 2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937 Revert "Merge branch 'hashtags-in-comments'" 
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
 2011-07-07 13:39:15 -07:00
danielgrippi
310b9969f3 hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here... 2011-07-07 12:21:57 -07:00
Raphael Sofaer
1d5b08aa92 Don't use the pretty formatter on CI 2011-07-06 10:09:58 -07:00
Raphael Sofaer
27f78dd1ad Rake cucumber should be pretty 2011-07-05 18:15:17 -07:00
Raphael Sofaer
53993cd714 Use schema:load on CI 2011-07-05 12:07:03 -07:00
Raphael Sofaer
5f592f9616 Schema:load in ci breaks it, because we would need to drop and re-create as well 2011-07-05 08:52:48 -07:00
Raphael Sofaer
e916cd5c2f Why migrate on CI? Schema load. 2011-07-04 22:12:05 -07:00
Raphael Sofaer
e34809c8ed Use the rails backtrace cleaner 2011-07-04 15:00:42 -07:00
Maxwell Salzberg
f4f34e0faa fix for public posts in development mode, in single process mode, when your pod_url is still set to localhost 2011-07-04 12:20:15 -07:00
Raphael Sofaer
a36bd9897f Put the cruisecontrol stuff back in the cruise rake task, rather than a method. 2011-07-02 12:25:19 -07:00
Raphael Sofaer
7f55279962 I have no idea why travis ran the specs twice, but let's try again. 2011-07-02 10:21:30 -07:00
Raphael Sofaer
bc5d29bff3 Take some stuff out of the travis run, I think we need to use headless instead of an explicit xvfb. Turning off travis for now. 2011-07-02 10:21:30 -07:00
Raphael Sofaer
de8e750b0d Put it all in the travis yml file 2011-07-02 00:56:27 -07:00
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
Raphael Sofaer
d1a149f9f6 Some stuff to not need an application.yml in CI 2011-06-29 11:52:13 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer
7ba80ce799 change the build script that actually runs 2011-06-28 10:54:00 -07:00
Maxwell Salzberg
c2565127c7 regenerate application.yml on every build 2011-06-28 10:28:17 -07:00
Raphael Sofaer
ce2518ea82 Docs for log_overrider 2011-06-26 20:42:30 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
Jonne Hass
58ba4db3c8 Merge pull request #656 from cyberkov/1041-whitespace-tasks 
fixed whitespace task mentioned in bug 1041
 2011-06-22 04:17:04 -07:00
danielgrippi
74f9ffbbdf 8 failures left with sqlite3 adapter 2011-06-22 00:22:16 +02:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
ab398555d6 Back to green in mysql 2011-06-19 16:16:30 +02:00
Raphael Sofaer
7c454b7d15 Fix stream query for postgres, shouldn't break mysql 2011-06-19 16:16:30 +02:00
cyberkov
94b152e733 fixed whitespace task mentioned in bug 1041 2011-06-15 13:48:40 +02:00
Raphael Sofaer
480d7c47cf Documentation is so rad. 2011-06-13 17:02:18 -07:00
Raphael Sofaer
7171aa05ed Do a little bit more documenting. 2011-06-13 16:31:40 -07:00
Ilya Zhitomirskiy
71dd8dc7f3 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/app_config.rb
 2011-06-09 15:51:59 -07:00
Raphael Sofaer
c78e903794 Change rebuild back to using migrate 2011-06-09 15:30:58 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
danielgrippi
d7efee55a1 load schema instead of migrating on rake db:rebuild 2011-06-06 19:39:14 -07:00
danielgrippi
bd8ea324ae remove unused rake task 2011-06-06 19:37:51 -07:00
Raphael Sofaer
1aa1ddc829 Forgot the space in SplunkLogging 2011-06-04 23:44:12 -07:00
Raphael Sofaer
6d105e5c09 Don't n query in UsersController#public 2011-06-04 22:34:48 -07:00
Raphael Sofaer
5314e27e78 Clean up the SplunkLogging mixin to make searching in the splunk console a little easier 2011-06-04 18:37:20 -07:00
Raphael Sofaer
283e376712 Move initialize_signatures method out of user and into relayable 2011-06-01 16:45:30 -07:00
Raphael Sofaer
06217a0a1d Fix stream query 2011-06-01 14:19:27 -07:00
Raphael Sofaer
9aad7810c0 Move visible_posts defaults into a defaults hash, mostly 2011-06-01 12:24:07 -07:00
Raphael Sofaer
5455aedf1d Compress the database dump during backup 2011-06-01 10:56:12 -07:00
Raphael Sofaer
b3cbe0a3a5 Wrap integration rake in MissingSourceFile rescue to avoid failure when the test gems aren't present. 2011-06-01 10:25:19 -07:00
Raphael Sofaer
71c3a29aa6 Move YoutubeTitles callback into module 2011-05-31 12:27:57 -07:00
Sarah Mei
8de71d41e4 Don't need to export the selenium server port anymore on CI. Yay! 2011-05-28 22:22:06 -07:00
Sarah Mei
f732d20f0c Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt. 2011-05-28 21:03:39 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
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
Sarah Mei
55191c6838 Move more stuff in to DataConversion::Base, refactor method names. Add spec for importer. 2011-01-04 20:28:10 -08:00
Sarah Mei
7453130c63 Namespacin'. 2011-01-04 20:12:11 -08:00
Sarah Mei
a4c01e4df1 More logging (w/ elapsed time) on mysql export. 2011-01-04 19:40:15 -08:00
Raphael
adb238c7d1 Merge remote branch 'tomk/717-rake-statistics' 2011-01-04 16:13:28 -08:00
Raphael
c643346589 Making it easier to maybe put .inspect on all the accesses to the json export 2011-01-04 14:25:40 -08:00
Raphael
894a008daa Hopefully finish export to csv 2011-01-04 11:59:25 -08:00
Raphael
16d7ccdf0b fix youtube title stting 2011-01-04 11:48:02 -08:00
zhitomirskiyi
d3daa32558 mark a notification as read when you ignore a request 2011-01-04 11:27:25 -08:00
Raphael
936f7fdb3d newlines are in the data, probably easiest to use a different separator in the CSV 2011-01-04 11:24:11 -08:00
Raphael
0966889ab9 continue work on mongo export 2011-01-04 10:58:22 -08:00
Alec Leamas
22a696bcf8 Print warnings on stderr, where they belong. 2011-01-02 16:07:19 +01:00
Philip Champon
607fea6722 Handling bug http://bugs.joindiaspora.com/issues/767 
Added email argument to task, warn and replace if address resolves to
an invalid user@domain one.
 2010-12-31 14:53:32 +01:00
zhitomirskiyi
9f227b3b0a manual logging in the backup, since Rails.logger is nil 2010-12-30 14:27:35 -08:00
Thomas R. Koll
be270c4696 Adding rake statistics:genders to list all genders with profile count 2010-12-30 14:18:12 +01:00
Thomas R. Koll
61d0f0ea65 Feature #717: Adding rake tasks to print statistics on users and content 
Adds following rake tasks:
  rake statistics:users
  rake statistics:content
 2010-12-30 13:38:26 +01:00
Raphael
4e44b197c2 Begin writing migration from mongo to mysql 2010-12-29 18:15:13 -08:00
Alec Leamas
8d218e7871 suburi cucumber test. 
Adds the features/uri-features test directory, testing sub-uri
deployment. These tests uses script/server since much of this code is
about configuring the server.  They are not run by "rake cucumber", to
run them use "bundle exec rake cucumber features/uri-test".

Tests requires a working app_config.yml setup with pod_url =
"http://localhost:3000/diaspora"

Patches cucumber.yml to always load step definitions from features/**, see
http://thoughtsincomputation.com/posts/cucumber-step-definitions-and-autorequire-hell
 2010-12-29 10:31:25 +01:00
Sarah Mei
f18439fa14 ZOMG specs pass on mysql! 
Make '_type' column on services into 'type'.
 2010-12-28 21:08:54 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Michael Sofaer and Raphael Sofaer
30d60021f4 11 Controller specs remain in mysql. ALMOST DONE 2010-12-24 14:12:55 -08:00
Sarah Mei
a13136a4dc Clean up first_user rake tasks; create add_user rake task 2010-12-24 13:46:25 -08:00
Sarah Mei
5ae16c15a3 Fix bug in :pod_uri generation. 2010-12-24 13:00:06 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Sarah Mei
aeaabd29f1 run specs before cucumber in default rake task 2010-12-24 10:41:20 -08:00
Michael Sofaer and Raphael Sofaer
426651d827 Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see 2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01 Fix retraction related failures in mysql 2010-12-23 23:04:04 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
Raphael
924bcca0e2 Isolated problem in status message marshalling, mysql 2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04 33 failures left in mysql 2010-12-22 16:37:41 -08:00
Raphael
55492535c6 Fix some more specs, aspects controller is green in mysql 2010-12-22 14:15:45 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
danielvincent
a1f3ab3046 mark requests as read when a user responds to the request 2010-12-21 10:31:18 -08:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Raphael
049670654e Connecting spec passes with mysql 2010-12-20 14:22:44 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Raphael
0c67e271df Services are in mysql, contact_for and add_contact_to_aspect work again 2010-12-19 13:11:41 -08:00
Raphael
232de40457 Only service hasn't been migrated, there are a good 100 passing examples in mysql 2010-12-19 12:27:32 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
MrZYX
c3a79f7298 some fixes to translations 2010-12-18 15:25:21 +01:00
danielvincent
9ef9b3f0c3 log backup rake tasks 2010-12-17 12:26:20 -08:00
maxwell
d56093666e fix for local passing optimization 2010-12-16 18:42:13 -08:00
Raphael
bd64cb723f to_s args before trying to slice them 2010-12-16 17:58:11 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
Raphael
647c48d530 Set auto_flushing to 1 explicitly 2010-12-16 17:26:46 -08:00
Raphael
4da97be84b Add benchmarks and logging to resque jobs 2010-12-16 16:48:36 -08:00
Raphael
719081473e Fix log statements in Encryptable 2010-12-16 15:22:26 -08:00
maxwell
1451db6cd8 fixed rspec build 2010-12-16 10:15:16 -08:00
zhitomirskiyi
08c1142e4a logging the number of open channels 2010-12-15 21:16:50 -08:00
maxwell
8d91771cb2 xml escape things 2010-12-15 18:05:09 -08:00
maxwell
cb5982704e dont url escape, xml escape 2010-12-15 17:43:46 -08:00
maxwell
9555fae33d no notifications on retractions 2010-12-15 13:14:46 -08:00
maxwell
d5edc9b477 CGI::escaping for proper, good juju activity streams 2010-12-15 12:27:52 -08:00
Raphael
94fe0b4049 Do the update in JS 2010-12-14 21:54:18 -08:00
Raphael
bc35388d1f Use find_each 2010-12-14 20:58:22 -08:00
zhitomirskiyi
1d1faea9e7 tiny typo 2010-12-14 19:50:22 -08:00
danielvincent
2cf332e120 Remove sent boolean from requests, finish migration 2010-12-14 19:27:18 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
maxwell
0119de4afc adding task to fix users with periods 2010-12-14 18:45:10 -08:00
maxwell
6bd42874e8 adding a task to fix person object with spaces in their name 2010-12-14 17:36:27 -08:00
danielvincent
aef5abf631 Correct some queries, look at incoming requests in search, explicit pending false in activate_contact 2010-12-14 17:33:07 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
Sarah Mei
646603ffe0 Don't show rake output when running migrations_spec 2010-12-11 12:32:33 -08:00
maxwell
076d0e5edd Merge branch 'master' of github.com:diaspora/diaspora 2010-12-10 11:47:20 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
Raphael
0e77577fbd Websocket now uses redis 2010-12-10 11:25:38 -08:00
maxwell
1ad3dee0dc another warning message in migration 2010-12-09 19:29:25 -08:00
maxwell
dfbc01ca7a added a test for the converter rake task 2010-12-09 19:29:25 -08:00
maxwell
8fe2eb3180 starting migrations 2010-12-09 19:29:25 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
Raphael
6aa7648787 Put send_contact_request_to back into the app 2010-12-06 13:45:12 -08:00
maxwell
9bc8934970 add test mode to emailer 2010-12-05 18:06:54 -08:00
danielvincent
4daebfd147 archlinux env load fixed in resque 2010-12-04 16:35:05 -08:00
danielvincent
f9e4a744a5 put spec helper methods in spec_helper 2010-12-03 15:50:17 -08:00
danielvincent
a7823485c7 made http calls synchronous. messagehandler enqueues POSTs into resque. 2010-12-03 15:26:52 -08:00
danielvincent
6f1783664a load mailer in resque-workers 2010-12-03 12:07:39 -08:00
danielvincent
71cae6b89f Move request mail into resque 2010-12-03 11:51:04 -08:00
Raphael
46e49c764d sorry 2010-12-02 19:16:52 -08:00
Raphael
2e87bece60 Final fixes for person socketing 2010-12-02 19:03:15 -08:00
Raphael
3c7172822e Require files needed for socketing from resque worker 2010-12-02 17:27:41 -08:00
Raphael
2ec5fae2e8 Require needed files for resque-worker 2010-12-02 16:56:14 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
3688b3982f message queue should follow redirects 2010-12-02 15:23:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
danielvincent
8cb2a3a79a resque init, config, gemfile 2010-12-02 12:35:26 -08:00
Raphael
db0106f13c Rename EMWebfinger to Webfinger, clean up some related things 2010-12-02 12:35:25 -08:00
maxwell
be00a2f1b3 webfingering is now syncrounous 2010-12-02 12:35:25 -08:00
maxwell
9aa093a0a3 api compatabile, but ugly 2010-12-02 12:35:25 -08:00
Alec Leamas
308c653945 Cleaning up db:first_user patch. 
Removing duplicated reset task (what happened?). Hate long lines.
Let user.rb handle all error checks. Clean up.
 2010-12-02 15:24:10 +01:00
Alec Leamas
1a8e0788c2 Add rake task db:first_user. 
Purges database and adds a user without development dependencies.
Closes http://bugs.joindiaspora.com/issues/548. Note error handling
for User.build...
 2010-12-02 12:00:44 +01:00
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
maxwell
4c25724573 do no return in em-webfinger, causeing weird splunk errors 2010-11-30 11:33:19 -08:00
Raphael
e86a5563ed Override request started log line 2010-11-29 14:03:29 -08:00
maxwell
bf79d62317 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-29 13:41:38 -08:00
maxwell
4ef7c4d6d1 make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored. 2010-11-29 13:39:48 -08:00
Raphael
eccc25e20a Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier 2010-11-29 13:14:27 -08:00
Sarah Mei
5c76062932 remove warning when running specs 2010-11-28 17:15:50 -08:00
danielvincent
c35be73978 added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive) 2010-11-28 18:51:27 -05:00
danielvincent
05174436c0 comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner). 2010-11-28 18:51:27 -05:00
danielvincent
f59c6e2427 refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now. 2010-11-27 23:06:34 -05:00
Raphael
1ec1ada70b Take out giant log line 2010-11-27 21:33:12 -05:00
danielvincent
64f7a20ff4 fixed specs, took out that nasty raise. 2010-11-27 16:20:46 -05:00
maxwell
c65c62906c pushing so dan can look at how to stub EM:next_tick correctly 2010-11-27 16:20:46 -05:00
maxwell
62b4e85b0b DG MS move dispatch post to EM::next_tick in controller so the post response returns to the poster much faster. also fixed a bug in the logs refrencing an object that did not exsist 2010-11-27 16:20:46 -05:00
Raphael
7030ed0fed Putting youtube titles back into status messages 2010-11-27 11:43:24 -05:00
Raphael
7100bc14d1 Clean up another couple log lines 2010-11-26 21:29:59 -05:00
Raphael
d81db97054 take out request routed 2010-11-26 21:15:03 -05:00
Raphael
0fa93706a6 Make request completed log line complete 2010-11-26 21:15:02 -05:00
MrZYX
ad6d6d5efa lib/em-websocket.rb is now even more translatable 2010-11-27 02:43:49 +01:00
Raphael
fb85ffe406 Adding specs for log_overrider 2010-11-26 18:38:08 -05:00
Raphael
77d46b2d66 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 17:09:38 -05:00
MrZYX
d6f95445c5 made em-webfinger errors translatable 2010-11-26 19:14:07 +01:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
Raphael
1fb58c53fb Monkeypatching to change rails default logging to something more useful 2010-11-25 19:37:05 -05:00
Raphael
a061999e30 Don't inspect people in logging statements 2010-11-25 18:03:34 -05:00
Raphael
73c7a1d339 Fix build, add more logging 2010-11-25 11:40:36 -05:00
Raphael
b4297ba858 Add logging statement to receive 2010-11-25 09:39:36 -05:00
Raphael
f4f864a4fb Don't be obnoxious in the chrome frame 2010-11-24 21:36:34 -05:00
danielvincent
d334ffb3fa batch inviter takes an invite count for new users. default=10 2010-11-23 11:58:00 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
Raphael
0daffb7fed Add a couple specs, refactor in connecting 2010-11-21 14:09:39 -05:00
Sarah Mei
90193a16f5 fix 1.9 build 2010-11-19 23:14:08 -08:00
zhitomirskiyi
8524311c51 added the photo rake task 2010-11-19 16:46:23 -08:00
zhitomirskiyi
152998311f added the comments as well as loading of app config 2010-11-19 11:25:13 -08:00
zhitomirskiyi
481204a157 mongo cloudfiles backup task 2010-11-19 10:57:28 -08:00
zhitomirskiyi
ff5e32d2b8 begining of a rake task for mongo backup 2010-11-18 18:38:03 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
Raphael
78f2f74186 Fix photo exporting, I'm not sure how to use 
Kernel::system in this case, so using ``
 2010-11-18 16:41:34 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
Raphael
5a2b3cd0a7 Fix build 2010-11-18 16:06:44 -08:00
maxwell
c0d10ef174 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-18 15:36:47 -08:00
maxwell
747ab761a0 pushing mailer spec for ilya 2010-11-18 15:36:30 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
maxwell
970d56a007 basic batch inviter 2010-11-18 15:17:22 -08:00
maxwell
3db8da992a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:12 -08:00
maxwell
c08a991130 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:00 -08:00
Raphael
37a694ed1f Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects 2010-11-17 18:49:03 -08:00
Raphael
cb23ed1136 typo 2010-11-17 18:49:03 -08:00
Raphael
4f9547b300 Adding logging 2010-11-17 16:06:16 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
6c97899d5d Add logging statements, rescue callbacks in em-webfinger 2010-11-17 13:55:58 -08:00
Raphael
2d347ec36d Delete an accepted friend request 2010-11-16 16:47:06 -08:00
Raphael
538c6ce4b9 Take handle validations out of em-webfinger 2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Sarah Mei
9fa47c9bfa Fix a failing spec under 1.9 in receive_spec 2010-11-15 21:19:21 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
Raphael
98fe1d357b accept_friend_request no longer takes ids 2010-11-09 14:15:02 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -08:00
zhitomirskiyi
7d39f8ae5f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:36:11 -08:00
zhitomirskiyi
a6dff4f78e removing the posts from the aspect on unfriending 2010-11-08 15:35:37 -08:00
Raphael
70af10ee62 user#friends is now a many-foreign_key assoc, rather than a many-in 2010-11-08 15:19:23 -08:00
maxwell
26e1cfe955 MS RS actually fix the photo bug. without breaking the specs 2010-11-08 14:26:43 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
danielvincent
f4dba54ff3 posting to a person with a user on the same pod will send internally, skipping the http queue and encryption. 2010-11-04 15:33:16 -07:00
danielvincent
d5cc0ed6dc separating object receiving in user#receive 2010-11-04 15:33:16 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
Raphael
03b272db60 Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC 2010-11-03 15:26:58 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
zhitomirskiyi
c6e9b94f4f IZ MS moved contact_for to querying and added tests 2010-11-03 10:59:56 -07:00
maxwell
0343e7a226 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 00:10:11 -07:00
Sarah Mei
034d566564 CI has decided it wants a proper shell to launch the virtual display. So FINE. It can have one. 2010-11-02 21:49:24 -07:00
maxwell
545577a950 em-webfinger ssl should work 2010-11-02 19:16:08 -07:00
maxwell
8f5052fe61 Revert "Revert "making emwebfinger not try ssl first, for now"" 
This reverts commit 0db30bb221.
 2010-11-02 18:59:42 -07:00
maxwell
d482334ca2 Revert "Revert "IZ MS webfinger now trys ssl first, then http"" 
This reverts commit 153265aae8.
 2010-11-02 18:59:18 -07:00
Raphael
ae039442c3 Websocket now uses cookie to authenticate 2010-11-02 17:39:50 -07:00
maxwell
153265aae8 Revert "IZ MS webfinger now trys ssl first, then http" 
This reverts commit af3247b62f.
 2010-11-02 17:37:45 -07:00
maxwell
0db30bb221 Revert "making emwebfinger not try ssl first, for now" 
This reverts commit cc2766a0ea.
 2010-11-02 17:36:58 -07:00
maxwell
cc2766a0ea making emwebfinger not try ssl first, for now 2010-11-02 17:33:10 -07:00
maxwell
8c89f8d87a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 16:42:52 -07:00
danielvincent
da8124f8a7 hcard has searchable field, and is taken in to account when building Person from webfinger 2010-11-02 16:12:43 -07:00
maxwell
34f190ce75 MS IZ added a check for person in webfinger response in receive_salmon method 2010-11-02 16:10:17 -07:00
maxwell
af3247b62f IZ MS webfinger now trys ssl first, then http 2010-11-02 15:49:41 -07:00
maxwell
449a6f3ea0 MS IZ removed a refrence to REDFINGER 2010-11-02 15:14:40 -07:00
maxwell
3251b8ba2e MS IZ fixed a hole where another user could update another friends post 2010-11-02 13:58:27 -07:00
maxwell
c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	lib/diaspora/user/receiving.rb
 2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Raphael
c031416ca8 Merge branch 'master' into HEAD 
Conflicts:
	lib/diaspora/user/receiving.rb
	pkg/ubuntu/dist
 2010-11-02 10:54:37 -07:00
maxwell
9e1c6174bf IZ MS remove two unused methods from diaspora_parser 2010-11-02 10:06:41 -07:00
maxwell
15d6cff837 MS IZ everything now uses diaspora handle. this feels so good 2010-11-01 18:42:42 -07:00
maxwell
3c8b40c427 IZ MS retractions now use diaspora handle 2010-11-01 17:11:06 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
maxwell
3aab691c78 updating requests for me now that person is taken out of requests 2010-11-01 14:54:40 -07:00
maxwell
922aa85fb7 MS IZ refactor green 2010-11-01 14:54:40 -07:00
danielvincent
f6b4be97a3 requests are almost there 2010-11-01 14:54:40 -07:00
zhitomirskiyi
71ebc90714 Merge branch 'secure-command-exec' of http://github.com/himanshuc/diaspora into himanshuc-secure-command-exec 2010-10-31 22:53:10 -07:00
Derrick Camerino
b19cdf2e25 fixing N socketing bug 2010-10-31 03:15:58 -07:00
Sarah Mei
07c216f31b Putting the jasmine back in CI - changing selenium to be an external process. 2010-10-30 16:31:36 -07:00
Sarah Mei
2268cd204c Taking jasmine out of CI for now - selenium server isn't reliably starting up during jasmine:ci 2010-10-30 13:52:52 -07:00
Sarah Mei
08a70e4980 Moved default rake task to default.rake. Now runs cucumber, rspec, and jasmine. 2010-10-30 11:51:54 -07:00
Sarah Mei
d819c98718 can haz working jasmine 2010-10-29 22:21:08 -07:00
Himanshu Chhetri
4db521657d Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion. 2010-10-29 20:31:45 -07:00
danielvincent
5a9bfa7405 DG IZ; post senders are now verified by diaspora handles 2010-10-29 16:49:59 -07:00
maxwell
15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
 2010-10-29 16:23:33 -07:00
maxwell
c1c045a4cd mocking 2010-10-29 16:21:39 -07:00
Raphael
5b78a31d29 make_user now makes a user from fixtures 2010-10-29 15:53:21 -07:00
maxwell
7e7c4c3431 refactored message handler spec 2010-10-29 14:26:11 -07:00
maxwell
f75bd6bc2e whoops, taking out queue stuff untill i finish 2010-10-29 13:05:35 -07:00
maxwell
c6fbcd28f7 stubbing out the hub publish method 2010-10-29 12:09:10 -07:00
maxwell
a5eb4bf1a7 Merge branch 'emw-merge' 2010-10-29 11:38:47 -07:00
maxwell
39f66cc5d9 tests are green 2010-10-29 11:19:07 -07:00
maxwell
7c32649df4 rebasing master 2010-10-29 11:18:20 -07:00
maxwell
6d139ab946 more tests pass 2010-10-29 11:17:39 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
maxwell
b8a9025616 bad merge in receive 2010-10-29 11:16:11 -07:00
maxwell
a5ba14f89c nope that last fix I was too tired. the problem is when someone sends me a request saying it is a response from me 2010-10-29 11:16:11 -07:00
maxwell
09c4def70b bug; when someone sends you an unknown request, your server crashes. 2010-10-29 11:16:11 -07:00
maxwell
9f314f44d9 typo 2010-10-29 11:15:14 -07:00
zhitomirskiyi
d1de921d46 longer timeout 2010-10-29 11:15:14 -07:00
zhitomirskiyi
483960ae98 MS IZ more begin rescue 2010-10-29 11:15:14 -07:00
maxwell
68a44af856 making a few more cleanup and tests 2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
9a2e3ef158 making a few more cleanup and tests 2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
Derrick Camerino
5d0700001e changing shell command to use FileUtils 2010-10-28 20:46:45 -07:00
zhitomirskiyi
f484eb957f comments now don't imbed the person in the xml 2010-10-28 12:13:39 -07:00
zhitomirskiyi
21c75c08bb removed the http inspect 2010-10-26 19:19:34 -07:00
zhitomirskiyi
708927cc6d more debugging on remote, back to 5 sec timeout 2010-10-26 18:31:06 -07:00
zhitomirskiyi
d61ec0186f debugging, trying increasing the timeout 2010-10-26 18:21:47 -07:00
zhitomirskiyi
8b16dd25e7 trying better logging 2010-10-26 18:16:10 -07:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
zhitomirskiyi
acdbbe4dfc no mail for debugging for now 2010-10-26 15:34:02 -07:00
zhitomirskiyi
c0c8c6253c added a logging line for debugging 2010-10-26 15:13:16 -07:00
zhitomirskiyi
1024b8a3a7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-10-26 14:57:52 -07:00
zhitomirskiyi
8acdf21234 MS IZ got rid of the requests for me scope in the user 2010-10-26 14:49:37 -07:00
zhitomirskiyi
917d1838de MS IZ specs are green 2010-10-25 18:55:51 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
ilya
7083d2aa03 Moving friendships into a 'Contact' proxy object. 2010-10-22 18:11:04 -07:00
ilya
cbd3487705 moved the nailer to the end so setup of mailer doesnt mess with the communitcation 2010-10-22 12:00:14 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
ilya
80cd4761f3 started the new invitation email 2010-10-22 00:49:01 -07:00
Sarah Mei
669a7cabb2 Use diaspora gemset. Simplify rake runner. 2010-10-20 21:43:03 -07:00
Sarah Mei
560910b53d More cruisecontrol bits 2010-10-20 20:47:07 -07:00
Sarah Mei
73f0e17f5a Converting to cruisecontrol.rb 2010-10-20 20:39:13 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
8fddb4ecf5 MS IZ added test concerning people in multiple aspects 2010-10-20 13:19:32 -07:00
ilya
992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/models/aspect_spec.rb
 2010-10-20 11:30:06 -07:00
Raphael
0758f9245f Clean up specs a little, fix unfriending 2010-10-20 10:28:08 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
maxwell
e7f84f5434 fix hcard when parsing friend photo 2010-10-19 20:46:43 -07:00
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
11925ded2b moving branches 2010-10-14 19:15:32 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
maxwell
a86d965079 DG MS; importer now takes params for username, password, and diaspora handle 2010-10-13 17:07:16 -07:00
maxwell
f04934cbae DG MS; ensure aspect post_ids are only for user 2010-10-13 16:54:18 -07:00
maxwell
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
maxwell
637a79a99d DG MS; spec for clean_aspects 2010-10-13 13:28:10 -07:00
maxwell
55227f3f72 DG MS; filter_post method, aspect_clean method 2010-10-13 13:10:08 -07:00
Raphael
9a1590fa02 Move user module requires out to the user modules definition file 2010-10-13 11:18:06 -07:00
danielvincent
0315869a24 all specs should pass again after merge 2010-10-13 09:43:58 -07:00
danielvincent
59c3be41b3 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 09:21:27 -07:00
danielvincent
7ea3fe5bf1 MS DG; verifys implemented, but need more tests 2010-10-12 18:53:12 -07:00
danielvincent
92e5622247 DG MS; adding verification methods to importer. 2010-10-12 17:41:09 -07:00
ilya
9b249281a1 moved verify comment sig before any saving goes on 2010-10-12 16:01:36 -07:00
ilya
b53462ee93 Merge branch 'malicious_friend_refactor' of github.com:diaspora/diaspora 2010-10-12 15:55:02 -07:00
ilya
c00a70dde1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-12 15:54:37 -07:00
danielvincent
8720dfa950 DG MS; made test slower. posts now export correctly. 2010-10-12 15:33:08 -07:00
ilya
d8439c82ee going calling by webfinger only once 2010-10-12 12:21:57 -07:00
danielvincent
1d1ff7e330 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-12 11:34:31 -07:00
danielvincent
2e8bba1a04 MS DG adding more to exporter and importer 2010-10-12 11:34:13 -07:00
ilya
ee2d134cb0 receiving spec is green 2010-10-11 19:20:00 -07:00
danielvincent
948c5d9b02 DG MS; end of day. 2010-10-11 19:04:27 -07:00
ilya
03df0ff716 parser spec is green 2010-10-11 18:22:19 -07:00
Raphael
c8f864a69b Finish fixing move_private_key 2010-10-11 17:22:53 -07:00
danielvincent
b2f3074eb0 DG MS; scenario for importer spec 2010-10-11 17:00:42 -07:00
Raphael
a372ec33be fixing uninitialized constant in rake task 2010-10-11 16:36:34 -07:00
danielvincent
0f7807222b DG MS; cleaned up method 2010-10-11 11:38:08 -07:00
danielvincent
9162a4a168 DG MS; 404 show pages for objects that don't exist for given user 2010-10-11 11:32:20 -07:00
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack 
vector
 2010-10-09 21:34:53 -07:00
Sarah Mei
c646db956e CI does a proper export. FINALLY. 2010-10-08 21:13:13 -06:00
Raphael
d72c4de438 Revert "CGI unescape incoming salmons" 
This reverts commit 6cbe4075f4.
 2010-10-08 16:08:35 -07:00
Raphael
f09a54b67f Revert "arguments..." 
This reverts commit 8049aa20e8.
 2010-10-08 16:08:25 -07:00
Raphael
8049aa20e8 arguments... 2010-10-08 16:01:24 -07:00
Raphael
6cbe4075f4 CGI unescape incoming salmons 2010-10-08 15:59:32 -07:00
Sarah Mei
bc75c4acf5 Let's try putting display in the rake command. 2010-10-08 15:22:02 -06:00
Sarah Mei
4e3e6d9562 rake task starts a virtual framebuffer before running tests, stops it after 2010-10-08 14:55:53 -06:00
Sarah Mei
ebef212079 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:14:48 -06:00