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

1070 commits

Author SHA1 Message Date
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