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

1175 commits

Author SHA1 Message Date
Dan Hansen & Sarah Mei
2d9a709212 Fix contacts spec - default order on the association means we need to reload after adding one 2011-07-28 23:38:17 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
maxwell
7a5852e73a fix a bug with openssl keys in development. note to future max and 
rafi.  never monkey patch anything on the top of a completely random
model. never again. ever.

TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
 2011-07-24 20:06:07 -07:00
Raphael Sofaer
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -07:00
Raphael Sofaer
4b1d5b772d Failing spec for the second retraction for a reshared post, reshares need to refer to guids 2011-07-22 14:19:58 -07:00
Raphael Sofaer
ad5dba052c First reshare retraction spec is green 2011-07-22 13:12:12 -07:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Raphael Sofaer
a1bf22fe7e More work on retracting posts with reshares, one failing spec on User#retract 2011-07-21 18:23:34 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
987d44c41c fixed reshare specs; all specs green 2011-07-21 18:22:18 -07:00
danielgrippi
a8400ad460 2 more specs failing. wip 2011-07-21 18:22:18 -07:00
danielgrippi
a32ef3c1d8 added xml response to the post 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
danielgrippi
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Raphael Sofaer
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Raphael Sofaer
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -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
1f448e8555 as_json wants a string 2011-07-07 10:56:55 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
Raphael Sofaer
a1ee8eb83b stub tests for not n-querying in the publisher 2011-07-07 09:06:24 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys 
1137 bad rsa keys
 2011-07-06 10:00:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
Ryan Hughes
2f89f19f34 Test sending to people with bad rsa keys. 2011-07-04 18:00:55 -07:00
danielgrippi
511a651377 don't query for mentioned people if mention syntax isn't present in message text. 2011-07-03 20:36:46 -07:00
danielgrippi
829c86823d remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them 2011-07-03 20:08:11 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Sarah Mei
1bbfa97e5f DH SM MS pending photo spec for Dan 2011-06-30 21:04:18 -07:00
Raphael Sofaer
7ee3fcd811 Fix app_config spec 2011-06-29 14:08:25 -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
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213 Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env. 2011-06-23 14:20:53 -07:00
Ilya Zhitomirskiy
c09fb776fb added a couple of validations on the Oauth models, added an index on a user's authorizations 2011-06-20 18:30:18 -07:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
f0cb2159c7 Make contacts appear at the beginning of search results in postgreSQL 2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
75a1012c1c moved the monkey patching to a model, need to do a couple of validations 2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
Sarah Mei
243699c8e9 Tumblr service swallows exceptions raised by tumblbeasts. 2011-06-04 20:45:09 -07:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
Maxwell Salzberg
7204ef8e26 the test that was failing should not exsist 2011-06-02 19:18:28 -07:00
Maxwell Salzberg
72c6efe41c basic specs 2011-06-01 22:38:15 -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
06217a0a1d Fix stream query 2011-06-01 14:19:27 -07:00
Raphael Sofaer
ee75426963 Add failing spec for being overloaded with updated pending photos 2011-06-01 14:05:25 -07:00
Sebastian
ea85daadc4 Added UsersController#confirm_email with route and some specs 2011-06-01 16:26:54 +02:00
Sebastian
f42055ae24 User#confirm_email with specs 2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153 Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update 2011-06-01 16:26:53 +02:00
Sebastian
5b408ecca3 Added User#unconfirmed_email and #confirm_email_token with specs 2011-06-01 16:26:53 +02:00
Sebastian
cd404b9210 Added spec for valid User#email validation 2011-06-01 16:26:53 +02: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
MrZYX
c937f76433 specs for new methods in user model 2011-05-29 18:46:30 +02:00
Sarah Mei
f16cf223eb This test was not testing how person objects are actually built. Fixed. 2011-05-28 20:14:18 -07:00
Sarah Mei
828cbab792 Keep pod_url and pod_uri settings in sync. 2011-05-28 20:13:38 -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
Jakob Kramer
0efaa77c46 fixes bug #1092 2011-05-27 18:59:02 +02:00
danielgrippi
d12944d57e record objectId in post (cant use object_id booo) 2011-05-25 12:16:52 -07:00
Sarah Mei
f29a605a7c Remove photo-related pending specs. 2011-05-25 09:08:49 -07:00
Raphael Sofaer
609439f948 Destroy notifications on contact destroy 2011-05-23 18:33:18 -07:00
Raphael Sofaer
cc84051541 Fall back to author if the diaspora_handle isn't set, that column just needs to be removed 2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0 Fix AS::Photo federation, hopefully 2011-05-23 13:56:42 -07:00
Maxwell Salzberg
d4d3b1e44c MSSM like notification are concatinated, and backfilled some like tests 2011-05-22 13:59:33 -07:00
danielgrippi
c8e31825c5 Bookmark -> ActivitiyStreams::Photo 2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0 only generate new token if admin 2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed. 2011-05-19 11:57:06 -07:00
Raphael Sofaer
c942f76d29 Turn off user collapse and turn up status messages to over 9000 2011-05-17 18:14:35 -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
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -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
Raphael Sofaer
84779c6773 typo in a test 2011-05-11 16:13:59 -07:00
Raphael Sofaer
970190fb7a OMG SO MANY EMAILS, fixed 2011-05-11 16:07:24 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
7e838fc778 only display contacts you are sharing with in aspect edit panes 2011-05-04 18:05:49 -07: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
cdf94a0275 #1019 comment/post handles multiple youtube links properly 2011-05-05 00:05:59 +08:00
Maxwell Salzberg
c20cd5381e create a new notifciation if previous was read, only concatinate when it is the same unread message 2011-05-02 18:18:30 -07: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
92b50c3d90 Add some comments, a test for pagination 2011-04-13 10:45:11 -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
Raphael Sofaer
080f08187d Disable typhoeus everywhere but the HTTPMulti specs 2011-04-11 14:52:21 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
maxwell
51b3cd9c77 attempt to fix the problem where people who wanted emails were no longer getting them 2011-04-07 14:05:40 -07:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Raphael Sofaer
a172e56290 Make the ordering in querying spec less brittle 2011-04-06 12:33:20 -07:00
Raphael Sofaer
3fb822c6c5 Fix distinct problem 2011-04-06 12:29:05 -07:00
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -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
danielgrippi
07f7eff782 fixed all specs 2011-04-05 10:00:54 -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
79e3438b11 Fix CI? 2011-04-04 14:32:37 -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
danielgrippi
c800b0bfef use fixtures in request spec; collapsed xml specs 2011-04-04 11:57:25 -07:00
MrZYX
9829f11498 fixed posting spec 2011-04-02 14:01:16 +02:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
maxwell
6364f2a332 clean activity streams, fix test 2011-03-30 14:27:20 -07:00
danielgrippi
d3c0f1b3d2 ruby objects, get outta my face. (conversationscontroller new) 2011-03-30 12:45:47 -07:00
maxwell
eff42b4219 make publish spec reflect the working job 2011-03-30 11:34:54 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
maxwell
ccaa9465ec remove puts 2011-03-29 11:06:44 -07:00
maxwell
5392b5c6ef strip more than 5 tags when updating profile so people with broken profiles can update again 2011-03-29 10:56:11 -07:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
Raphael Sofaer
b9af450628 Relayable retractions pretty much done 2011-03-25 16:09:37 -07:00
Raphael Sofaer
31f43696cb Initial work on retracting comments 2011-03-25 16:09:37 -07:00
zhitomirskiyi
7a31531258 added location to the profile 2011-03-23 15:56:46 -07:00
zhitomirskiyi
9abe22d5d2 added a dependant destroy to the service_users 2011-03-23 11:56:15 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names. 
Moved some logic from view into user model.
 2011-03-22 13:16:58 -07:00
Raphael Sofaer
fdd158d86a Make urls not change on processing 2011-03-21 18:42:36 -07:00
Raphael Sofaer
2b997e70c2 Refactor image processing to use 2 uploaders. Federation and s3 need testing 2011-03-21 16:40:53 -07:00
zhitomirskiyi
c929ce21ad fixed validation on tag length in profile 2011-03-21 16:01:34 -07:00
zhitomirskiyi
32f08ef345 fixed the nil photo_url and the all being called twice in the specs 2011-03-21 14:56:50 -07:00
zhitomirskiyi
aa5bef0c3f calls the job on login does a sync call if the cache friends was not called before, fixed the views 2011-03-21 14:56:50 -07:00
zhitomirskiyi
dcc80d5b43 almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
zhitomirskiyi
70d71ec491 service users is green 2011-03-21 14:56:50 -07:00
zhitomirskiyi
ede7d4e8e2 made the job, broke outthe save_users, still need to do lifecycle callbacks 2011-03-21 14:56:50 -07:00
zhitomirskiyi
3afa14d341 wip 2011-03-21 14:56:50 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
69c0d8e1d9 A bit of refactoring on the invitation spec. Remove old pending specs. 2011-03-19 23:10:20 -07: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
maxwell
8f9f24f383 fix for photo urls before they are processed 2011-03-18 19:00:24 -07:00
Raphael Sofaer
e2f78a8b8c Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.' 2011-03-18 14:52:27 -07:00
maxwell
924dc13adc profile tagging now federates #FO #REAL 2011-03-17 18:05:49 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
Raphael Sofaer
1c14e2676b Fix another expectation 2011-03-17 16:14:01 -07:00
Raphael Sofaer
bef06d18d8 Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
maxwell
4e419f7d1a photo specs pass 2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe wrote a test for the callback, need to make it pass... 2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f there is a job to process photos and it is called from the controller 2011-03-17 13:59:53 -07:00
Raphael Sofaer
d2cdc20e2b Finish receive local batch job 2011-03-17 12:56:23 -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
danielgrippi
f0df6deed3 added job and spec for BatchLocalReceive. wip 2011-03-17 12:56:23 -07:00
danielgrippi
8c7ad9a0a3 Remove unused receive local job 2011-03-15 16:13:09 -07:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -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
maxwell
b14ac9606f fix typo, puts in a test, and made the emails types a constant in UserPreferences 2011-03-14 12:21:30 -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
maxwell
adbd23ec50 more tests for mailing. the bug was i think we have to restart the resque workers 2011-03-14 11:32:59 -07:00
Sarah Mei
1702081af7 refactor querying spec a bit 2011-03-13 20:08:53 -07:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
maxwell
d825eeaaa0 updated to listen to disable mail 2011-03-11 15:43:40 -08:00
maxwell
52b970098b add specs for updating email settings in the controller, and user#mail 2011-03-11 15:43:29 -08:00
maxwell
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -08:00
Raphael Sofaer
7ac3692a92 Fix specs, migrate to downcase tags, still testing migration 2011-03-11 14:23:03 -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
zhitomirskiyi
35cabd469f fixed the merge for the author convention 2011-03-10 20:13:52 -08:00
zhitomirskiyi
9b00b2c786 Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends' 
Conflicts:
	app/models/user.rb
	spec/integration/receiving_spec.rb
	spec/models/mention_spec.rb
	spec/models/status_message_spec.rb
 2011-03-10 19:59:12 -08:00
Raphael Sofaer
ea98b1ca81 Tags now link to meaningless query in PostsController 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
Michael Nutt
8c5621158d notification now only created when message is received, not when message is first saved 2011-03-10 16:41:03 -05:00
Raphael Sofaer
8a419a84a6 fix up some specs 2011-03-10 12:55:05 -08:00
maxwell
9d480b0961 remove status_message#public_message: we never use it 2011-03-09 17:14:37 -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
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
c252cfa025 added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
zhitomirskiyi
8bcf1b49c7 notifier for the messages, we're so close 2011-03-08 10:53:49 -08:00
danielgrippi
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
Raphael Sofaer
909a198380 Post photos without text 2011-03-07 10:03:43 -08:00
zhitomirskiyi
80a3a3446a pulling in 2011-03-06 21:37:27 -08:00
zhitomirskiyi
e537104fb4 pulling in 2011-03-06 21:36:03 -08:00
danielgrippi
48fff29bf6 fixed conversation receive. made visibilities on conversation :dependent => :destroy 2011-03-04 11:19:01 -08:00
zhitomirskiyi
3812612c86 added a validation of participant, as well as messages controller spec wip 2011-03-01 19:24:07 -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
zhitomirskiyi
bd908a9b95 conversations federate 2011-03-01 12:25:55 -08:00
danielvincent
1072806d8f PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
danielvincent
c5801ffb37 basic views / controller actions for private messages 2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881 added PrivateMessage and PrivateMessageVisibility models and migrations 2011-03-01 12:14:31 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
Raphael Sofaer
8a4ca3af0e fix error on account deletion 2011-02-28 11:24:31 -08:00
MrZYX
afecfe5e93 save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db 2011-02-26 14:22:14 +01:00
Raphael Sofaer
22d83ec502 update http_multi to adjust urls when you get a redirect 2011-02-25 14:46:21 -08:00
Sarah Mei
40fa91ead9 Start refactor of comment_spec. 2011-02-24 20:46:05 -08:00
zhitomirskiyi
78b242b110 removed post to services since we are not using it 2011-02-24 17:31:54 -08:00
Raphael Sofaer
50cd06129a Adjust expected string in mention spec' 2011-02-24 16:01:36 -08:00
Raphael Sofaer
faf026dec6 Update dispatcher to use HttpMulti job 2011-02-23 16:06:55 -08:00
maxwell
638311125f typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install 2011-02-23 16:06:55 -08:00
maxwell
c9dd2d5b50 add files 2011-02-23 16:06:54 -08:00
Sarah Mei
dc499293b3 Took 90 seconds off the build. Fixture builder FTFW. 
Cleaned up spec_helper - moved stuff into support files.
 2011-02-20 00:35:51 -08:00
zhitomirskiyi
61dd5a835a default scope on contact 2011-02-18 17:38:02 -08:00
zhitomirskiyi
6dc35c516a added two pending specs for mnutt 2011-02-18 13:15:48 -08:00
zhitomirskiyi
ba779e18d6 aspect memberships are now dependant delete_all on contact 2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 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
cd7e4d6e8f Requests create a read, rather than unread, notification 2011-02-16 23:44:25 -05:00
danielvincent
a636ceec7f search does not wildcard on both sides of search term; is less dumb. 2011-02-16 12:41:45 -05:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
zhitomirskiyi
3b2d323448 fixed the notifications to call the base_class 2011-02-11 11:49:47 -08:00
zhitomirskiyi
36d7973005 fixed the problem where notifications are not keeping track of the target id as well as making notifications for a mention be destroyed when a post is 2011-02-10 19:23:01 -08:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
zhitomirskiyi
7b1abacfe6 wip 2011-02-10 12:39:05 -08:00
Raphael Sofaer
7b3a2b07ee Removed n-query, created mentions table 2011-02-09 16:07:25 -08:00
Raphael Sofaer
f8cec95d7a no authentication, n-query in stream 2011-02-09 16:07:24 -08:00
Raphael
0000185875 Status messages now process mentions and output links 2011-02-09 16:07:24 -08:00
Raphael
216a2c3cdb write formatted_message 2011-02-09 16:07:23 -08:00
zhitomirskiyi
e4d9ec64cd moved tests and slayed the profile not updating bug 2011-02-09 13:33:42 -08:00
zhitomirskiyi
6be63b88f0 added the pending request to the finder 2011-02-08 18:53:18 -08:00
zhitomirskiyi
d147da1b4a invitation text 
setting the invites

added requests to the fb hash

finder has options

remove the requester from the list

typo

making a block

another typo

remove the if statement for the notifications

checking on the right field

translations and correct indenting

fixed stuff added

added a temp puts

added a temp puts

now actually referencing the service

not double nesting

remove stream element

updated remote friends to old style

removed it from the h1 block

putting the stream element back
 2011-02-08 16:40:32 -08:00
zhitomirskiyi
a06ba9105b uniqueness of aspect name through user non case sensitive 2011-02-08 14:52:47 -08:00
zhitomirskiyi
4a925d192f refactored the api 2011-02-05 15:01:05 -08:00
zhitomirskiyi
78c30b847e added files 2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a WIP 2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4 resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01:04 -08:00
Raphael
8a2e0eef7c No semicolons in names 2011-02-02 16:57:04 -08:00
Raphael
7d18e2bcd8 Finish autocomplete 2011-02-01 11:56:56 -08:00
Raphael
518642d0d7 Move image_url defaulting logic into profile 2011-02-01 11:56:56 -08:00
zhitomirskiyi
7a667abc73 unread true on notification receive 2011-01-31 15:09:01 -08:00
zhitomirskiyi
ac50a0119a spec for not raising on already existant actor 2011-01-31 10:23:26 -08:00
zhitomirskiyi
cfef9a747e all green 2011-01-30 20:10:34 -08:00
zhitomirskiyi
a4988a28b4 WIP 2011-01-30 10:00:03 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
zhitomirskiyi
5940292840 build should be green now 2011-01-28 21:21:14 -08:00
zhitomirskiyi
9d091bbf6a facebook invitations actually work 2011-01-28 17:22:18 -08:00
Raphael
8151f3b540 correct partial name 2011-01-28 16:54:30 -08:00
zhitomirskiyi
3b68fc3e9a the friend finder is respecting of searchable 2011-01-28 13:45:58 -08:00
Raphael
a8306f9f37 don't select duplicate people 2011-01-27 13:41:22 -08:00
Raphael
31e4683183 Finished contacts of contacts for local users 2011-01-27 13:41:22 -08:00
Raphael
a23290986a add contacts_visible field in aspects 2011-01-27 13:41:22 -08:00
zhitomirskiyi
01ce26cbf3 fixed errror on services inviter action, specs 2011-01-27 10:58: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