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
Raphael Sofaer
7fd9b81e55
Fix spec in authorizations_controller, get rid of pp
2011-06-28 14:37:55 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f
fixed every spec but the activity stream photos controller spec
2011-06-23 15:22:36 -07:00
Raphael Sofaer
04b0705733
Faraday follows redirects
2011-06-22 12:53:18 -07:00
Raphael Sofaer
c12103aed9
Deal with ids from PG coming out as strings
2011-06-19 16:16:31 +02:00
Ilya Zhitomirskiy
b575983c22
WIP certs
2011-06-08 18:46:38 -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
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Sarah Mei
32d3219bf6
Fix that one freaking exporter example that was apparently failing spuriously. Actually, we had bad xpath that grabbed the wrong created_at, and it only passed when the created_at times were the same.
2011-05-29 00:08:11 -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
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
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
danielgrippi
55d39521c4
rescue redis connection attempts in websocket
2011-05-16 18:34: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
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
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
Raphael Sofaer
a0f98d888a
Try to fix annoying xml time spec failure
2011-04-12 16:21:42 -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
cbdbe1b29b
follow wip. 2 failures.
2011-04-04 19:22: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
Raphael Sofaer
22b9f92c27
FIx post socketing
2011-03-30 10:55:59 -07:00
zhitomirskiyi
18ea46710b
not delivering to local for profiles
2011-03-29 17:23:28 -07:00
Sarah Mei
44ca687100
Remove annoying constant warning from resque spec
2011-03-19 21:12:43 -07:00
Raphael Sofaer
325eeb0ca2
Fix expectation
2011-03-17 15:40:26 -07:00
Raphael Sofaer
0aa5193434
Use the new local batch receive job
2011-03-17 13:41:30 -07:00
danielgrippi
68479481cf
made websockets far less dumb. don't render partials for people not connected.
2011-03-15 18:21:09 -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
MrZYX
6d314e9394
fixed ostatus builder + spec
2011-03-10 15:17:56 +01:00
maxwell
90aac1d175
spec to have ostatus builder still build rss even if an object does not respond to activity
2011-03-09 18:54:09 -08:00
maxwell
337831bba2
move ostatus builder, actually added the file.
2011-03-09 18:01:48 -08:00
maxwell
5b73e9ca06
rename ostatus builder spec to have the correct name
2011-03-09 17:35:21 -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
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
cf93bfc89b
improve hash logger a bit
2011-03-09 14:06:48 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -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
d8956a7cd5
Add foreign key constraints
2011-02-28 15:18:35 -08:00
zhitomirskiyi
83576d75ef
stubbing the httpmulti in the test, now you can post to services individually
2011-02-24 17:50:01 -08: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
22c4ebd6de
return a string from a stub
2011-02-24 10:36:06 -08:00
