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

3386 commits

Author SHA1 Message Date
danielgrippi
984eef25be UsersHelper -> GettingStartedHelper 2011-08-03 18:02:57 -07:00
danielgrippi
e589dd88b2 added has_connected_cubbies? 2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b added more translations; welcome text switch 2011-08-03 18:02:57 -07:00
danielgrippi
b8b4ad3d84 added helpers for each of the getting started steps; make step sections dull if completed 2011-08-03 18:02:56 -07:00
danielgrippi
d51e495925 fetch featured users from remote servers on app init unless already in the db 2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150 ms dg; profile (step 1) finished 2011-08-03 18:02:56 -07:00
Maxwell Salzberg
7e8f17cc31 refactoring this stuff 2011-08-03 16:58:55 -07:00
Raphael Sofaer
1aac60bee3 Make sure that not deleting the service_users doesn't leave them stale 2011-08-03 15:39:23 -07:00
Raphael Sofaer
7d0c796762 Make sure that related data for fb users is attached to them 2011-08-03 15:30:58 -07:00
Raphael Sofaer
168ccc11b0 Call collapseText on stream initialize 2011-08-03 12:47:48 -07:00
Raphael Sofaer
0b1ef41838 Scope stream scrolled events to new elements 2011-08-03 12:36:07 -07:00
Raphael Sofaer
5967f01dab Take out PostsFake, now that we ajax in comments it's not worth the extra complications 2011-08-03 11:09:21 -07:00
Raphael Sofaer
be5453f0b4 Fix photo show pages with likes 2011-08-02 10:17:49 -07:00
Raphael Sofaer
65c4b1ceaf Merge pull request #1711 from gandaro/1602-delete-profile-photo 
test for issue #1602's fix; typos
 2011-08-01 16:11:17 -07:00
Raphael Sofaer
8d88818ea0 Merge pull request #1712 from ticho/typofix-in-featured-contacts-test 
Fix typo for contacts_controller #featured test
 2011-08-01 16:10:43 -07:00
Raphael Sofaer
2a0df9841a Correct batch emailer fixture 2011-08-01 16:00:01 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Raphael Sofaer
3d88095ba2 Updating batch inviter 2011-08-01 14:49:21 -07:00
Andrej Kacian
a5e8db04a0 Fix typo for contacts_controller #featured test 2011-08-01 23:20:23 +02:00
Jakob Kramer
4b9c8487e6 test for issue #1602's fix; typos 2011-08-01 20:12:30 +02:00
Sarah Mei
b7b1c6b276 Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n. 2011-07-30 22:41:46 -07:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
danielgrippi
905a982d35 add two more default aspects for new users 2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7 added featured users dg iz 2011-07-29 19:00:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -07:00
Raphael Sofaer
54a5d96391 Add a couple tests for post federation, because Max is suspicious 2011-07-29 17:21:10 -07:00
Maxwell Salzberg
73616a3e7a new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about) 2011-07-29 17:20:10 -07:00
Raphael Sofaer
f9bf34a73e Fix defaults for activerecord models in i18n 2011-07-29 15:51:38 -07:00
Raphael Sofaer
bea333842f Make sure that a MissingInterpolationArgument in the english locale is raised 2011-07-29 14:30:20 -07:00
Raphael Sofaer
b56838e5b1 Fall back to english on MissingInterpolationError 2011-07-29 14:30:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
16bd3e4c2f less delay on search; start on 2 chars instead of 3 2011-07-29 12:26:04 -07:00
danielgrippi
f560321626 optimized people search 2011-07-29 12:04:10 -07:00
Raphael Sofaer
5e39368414 Get rid of 500 on mobile comment creation 2011-07-29 12:01:35 -07:00
Raphael Sofaer
091701e565 Pending spec for allowing an unknown commenter to comment on a public post 2011-07-29 11:08:38 -07:00
Maxwell Salzberg
9d0764dadb two failing tests for the mobile site. SOMEBODY FIX THEM 2011-07-29 10:14:59 -07:00
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 Salzberg
a325970e5d test to make sure mobile site does not 500 with all media types 2011-07-28 13:16:43 -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
99aafb18cd Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice 2011-07-22 17:13:31 -07:00
Raphael Sofaer
0e2936f069 Reshare spec, not repost spec 2011-07-22 16:03:54 -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
Raphael Sofaer
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
537766d0d7 Started working on repost integration test 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -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
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 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
Maxwell Salzberg
ad8ccbbeb9 added test for admin inviter 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
757c9169fc updated gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
eee2225f04 rspec is green 2011-07-21 14:32:10 -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
d30228abb8 Merge remote branch 'untitaker/1589-remove-unicode-smileys' 2011-07-17 21:12:20 -04:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Markus Unterwaditzer
d4257f4a68 Removed unicode smileys, #1589 2011-07-17 10:45:06 +02:00
danielgrippi
22fdf7f895 fix 500 on posts show on mobile 2011-07-15 22:37:21 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
danielgrippi
3e7e2b4d2a DH remove test pollution from EventBroker#subscribe spec 2011-07-14 18:03:30 -07:00
Dan Hansen
bdb4c888a9 Remove embedder spec from git repo, it's now in spec/javascripts/widgets/embedder-spec.js 2011-07-13 22:49:32 -07:00
Dan Hansen
ca2413ff6b Widgets now subscribe to a widget/ready event. Apply change to all widgets, added some tests & lots of cleanup. 2011-07-13 22:23:31 -07:00
Raphael Sofaer
abe10b3889 Comment out falsely failing JS tests, we should just stop using extend, it is needlessly hard to test. 2011-07-13 11:03:55 -07:00
Maxwell Salzberg
6523f0542a require haml in chubbies to kill error 2011-07-12 20:19:38 -07:00
Raphael Sofaer
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
Raphael Sofaer
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
danielgrippi
039b65b5cc a little js cleanup for post.js 2011-07-12 00:12:08 -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
e59f49aace Fix specs after merge 2011-07-11 14:38:51 -07:00
Raphael Sofaer
eafe6a7c85 Merge branch 'ajaxy-comments' 2011-07-11 14:05:45 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1 A admin is now able to allow open invitations 2011-07-11 13:32:02 -07:00
Raphael Sofaer
3f555eefc4 Server side of ajaxy comments done, need to modify comments/_comments and make it work. 2011-07-11 09:11:16 -07:00
Raphael Sofaer
2fb0fce1a8 Nest likes and comments routes in the post route 2011-07-10 21:44:34 -07:00
Raphael Sofaer
d1f2bc5fcb Remove object_path spec 2011-07-10 21:05:55 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
Raphael Sofaer
968100860a Don't show commented tags in the tag stream for now, until we optimize that 2011-07-07 15:39:28 -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
9d506231b1 querying correctly in tagscontroller to include posts with comments containing hashtag 2011-07-07 12:27:48 -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
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -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
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
027f096ca7 turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -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
9debec4410 fix the build. 2011-07-04 16:53:43 -07:00
Raphael Sofaer
af6547815e Some view helper cleanup 2011-07-04 07:36:01 -07:00
Michael Sofaer
d2b7168195 Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
Sarah Mei
58ac33607a Fix build - stub request in notifications#index specs 2011-07-03 20:48:42 -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
a104f4e309 if a user is logged in, redirect them to the proper authenticated view, not the public route 2011-07-03 09:13:39 -07:00
Raphael Sofaer
f161377480 Stop loading contact objects on the main page, all we need is people 2011-07-02 16:28:52 -07:00
Raphael Sofaer
290fb1e7f5 Cut 45 seconds out of the comments feature by using factories 2011-07-02 13:40:30 -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
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
Sarah Mei
1bbfa97e5f DH SM MS pending photo spec for Dan 2011-06-30 21:04:18 -07:00
Robin Wellner
91dd4f847a Adds support for converting <-> to ↔ in markdownify 2011-06-30 14:27:39 +02:00
danielgrippi
55efe132c5 corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577 only allow https and www.cubbi.es in authorizations controller for now 2011-06-29 16:40:43 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
daf52eb21f Put the source back in the second Gemfile... 2011-06-29 15:03:23 -07:00
Raphael Sofaer
7ee3fcd811 Fix app_config spec 2011-06-29 14:08:25 -07:00
Raphael Sofaer
02489bb7cf This should fix CI for real 2011-06-29 12:07:10 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Dan Hansen
eaf7fcd7fe speed up notifications controller index spec 2011-06-28 23:31:34 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
0eb31e3ba7 added jwt to the chubbies bundle, made the asterisk black 2011-06-28 17:52:38 -07:00
Raphael Sofaer
4683047ee0 point diaspora client to the right place in the gemfiles 2011-06-28 17:36:01 -07:00
Raphael Sofaer
3078220bc0 Point diaspora-client to git 2011-06-28 17:25:02 -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
Raphael Sofaer
7fd9b81e55 Fix spec in authorizations_controller, get rid of pp 2011-06-28 14:37:55 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -07:00
Raphael Sofaer
17917528f6 IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302. 2011-06-27 12:31:47 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
John Drummond
cc6f82fbc1 Added test for new plantext tag without a # symbol and fixed broken code. 2011-06-25 23:37:51 -07:00
Raphael Sofaer
b3556870d3 Merge remote branch 'yithian/1049-allow-plaintext-tags' 2011-06-25 11:23:55 -07:00
danielgrippi
54ef22b83e lol, just needed to remove 'http://' in the specs to get the controllers passing again 2011-06-24 18:38:30 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f9b09d32f8 cucumber is passing rspec is red 2011-06-24 12:02:15 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0 added temporary special casing on app_url in authorizations controller 2011-06-23 19:13:26 -07:00
danielgrippi
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -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
Alex Chvatal
a9d4ac45ac Adds a test spec for plaintext tags 2011-06-23 12:24:36 -04:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -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
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
c12103aed9 Deal with ids from PG coming out as strings 2011-06-19 16:16:31 +02: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
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07: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
9366b7243a configured the testmode 2011-06-15 16:04:38 -07:00
Raphael Sofaer
dd67107ab1 Make LikesController spec a bit more specific 2011-06-15 15:19:36 -07:00
Ilya Zhitomirskiy
844bf48851 changed back to the git repo for client 2011-06-14 18:35:36 -07:00
Ilya Zhitomirskiy
ec9932e491 green on all the cucumbers WOOT 2011-06-14 18:30:43 -07:00
Ilya Zhitomirskiy
af8ce13ee5 added the public key to the manifest 2011-06-14 18:21:57 -07:00
Raphael Sofaer
cba63030c9 Use rescue_from in CommentsController 2011-06-14 18:06:13 -07:00
Ilya Zhitomirskiy
dfb48d343f config in chubbies and blank public key check ms iz 2011-06-14 17:34:27 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07:00
Ilya Zhitomirskiy
2a4932ea34 WIP verifying sig in the pre-registration endpoint 2011-06-13 22:57:56 -07:00
Ilya Zhitomirskiy
ef0e48a7ff A user can now revoke an application's token iz ms 2011-06-13 16:48:52 -07:00
MrZYX
0847d09950 ignore whitespace inside markdown links 2011-06-10 15:13:16 +02:00
Ilya Zhitomirskiy
f31a78f23f updated the Gemfile to point to repo instead of path 2011-06-09 17:42:33 -07:00
Raphael Sofaer
7fd86924ee Fix pagination in AppsController 2011-06-09 16:23:15 -07:00
Raphael Sofaer
6d5169d707 Chubbies is working with local diaspora-client gem 2011-06-09 15:01:09 -07:00
Raphael Sofaer
775dbda2b2 Chubbies now uses diaspora-client 2011-06-09 12:40:30 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
Arzumy MD
c0f5571795 do not unnecessary build the feed in users_controller#public when we want to redirect anyway 2011-06-08 17:50:13 +08:00
danielgrippi
67eaafe3a9 Chubbies no longer saves diaspora_handle from the browser 2011-06-06 15:42:58 -07:00
Raphael Sofaer
6d105e5c09 Don't n query in UsersController#public 2011-06-04 22:34:48 -07:00
Sarah Mei
243699c8e9 Tumblr service swallows exceptions raised by tumblbeasts. 2011-06-04 20:45:09 -07:00
Sarah Mei
9dce7eab5d Fix logging shared behavior 2011-06-04 20:30:12 -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
21463582d4 Fix pagination on notifications page, it was getting all notifications for a user 2011-06-04 15:48:10 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Maxwell Salzberg
7aeb3a3649 Remove enabling sessions 2011-06-03 16:24:12 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d chubbies tests mow take diaspora handle 2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d Chubbies now sees that it has no secret and registers itself. 2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -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
Dan Hansen
bc465848c9 MS DH fixed like sizes, everywhere 2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63 fix status message show page and break out Post to it's own javascript widget 2011-06-02 17:45:45 -05:00
Maxwell Salzberg
72c6efe41c basic specs 2011-06-01 22:38:15 -07:00
Maxwell Salzberg
1ef9d43262 added pagination for people on tag pages 2011-06-01 18:59: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
0af9aa7716 Filled out pending sepc for Notifier.confirm_email 2011-06-01 16:26:54 +02: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
602382e24e Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en). 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
0770d6e8fd Most of the stream.js stuff needs to be live, unfortunately. 2011-05-31 16:00:57 -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
Nicolas Berens
c9417ec93f optimized images (safes a few bits and makes pagespeed shut the fuck up ) 2011-05-31 17:34:22 +02:00
MrZYX
3db4772652 ignore searchable if one searches by handle in people#index 2011-05-29 22:58:33 +02:00
MrZYX
502f467012 fix youtu.be links 2011-05-29 22:13:42 +02:00
MrZYX
c937f76433 specs for new methods in user model 2011-05-29 18:46:30 +02: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
5b6eca893b Put jasmine.Clock.tick back down to 200 (bumped to 400 during debugging & accidentally checked in) 2011-05-28 22:23:07 -07:00
Sarah Mei
6d6445b00a Fix locale loading in stream spec 2011-05-28 21:22:35 -07:00
Raphael Sofaer
cfd077a90d Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec 2011-05-28 20:37:12 -07:00
Sarah Mei
5676fdc73e fix jasmine specs 2011-05-28 20:18:40 -07: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
Raphael Sofaer
503de3efe1 Fix facebox close button and loading gif 2011-05-28 18:18:22 -07:00
Jakob Kramer
0efaa77c46 fixes bug #1092 2011-05-27 18:59:02 +02:00
Raphael Sofaer
17521f99cf Fix build for those without integration environments configured 2011-05-25 15:49:57 -07:00
Raphael Sofaer
38289b1a47 Multi-server integration tests are now possible 2011-05-25 15:16:14 -07:00
MrZYX
ba08c38a74 fixed activity_streams::photo controller spec 2011-05-26 00:01:10 +02:00
MrZYX
0c5bdece5a warn and exit if there's no config at all 2011-05-25 23:39:54 +02:00
MrZYX
47dd3ba076 when you get a mail from CI, look at it 2011-05-25 23:08:00 +02:00
Maxwell Salzberg
52487e87de added a very basic page for the stream of all public activity stream photos 2011-05-25 12:57:29 -07:00
danielgrippi
d12944d57e record objectId in post (cant use object_id booo) 2011-05-25 12:16:52 -07: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
Sarah Mei
f29a605a7c Remove photo-related pending specs. 2011-05-25 09:08:49 -07:00
Sarah Mei
85eb2d9de0 Unpending the relayable spec 2011-05-25 08:54:57 -07:00
Sarah Mei
5e56b8a0ee HULK SMASH PENDING SPEC 2011-05-24 23:36:00 -04:00
MrZYX
db22be43a8 really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF 2011-05-24 17:03:48 +02:00
MrZYX
f4213b63a6 fixed notification helper spec 2011-05-24 16:25:48 +02: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
Raphael Sofaer
6a88abb6dd Add in photoscontroller spec for as 2011-05-23 13:56:41 -07:00
MrZYX
c732940b58 match trailing slash for vimeo links 2011-05-23 14:32:16 +02:00
Maxwell Salzberg
4fa842de96 remove puts 2011-05-22 17:41:49 -07:00
Maxwell Salzberg
d776105558 grammer nazi cleanup of notification_people_link and refactor + tests 2011-05-22 17:18:44 -07:00
Maxwell Salzberg
77fc40d404 add application helper to notification helper spec, made the link an object_link rather than status_message_link 2011-05-22 14:59:04 -07:00
Maxwell Salzberg
2f6d079635 added failure test for deleted likes 2011-05-22 14:45:16 -07:00
Maxwell Salzberg
66c28c4caf notification page now has links for likes 2011-05-22 14:35:35 -07:00
Maxwell Salzberg
d4d3b1e44c MSSM like notification are concatinated, and backfilled some like tests 2011-05-22 13:59:33 -07:00
MrZYX
a68031179b prevent inviting yourself, #515 2011-05-22 14:48:07 +02:00
Raphael Sofaer
286f1b876d Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions. 2011-05-20 15:14:23 -07:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
Arzumy MD
a060acffeb add spec for admins_controller#add_invites 2011-05-20 10:51:04 +08:00
Arzumy MD
0ee41b3be5 removed user variable from admins_controller#user_search 2011-05-20 09:37:32 +08: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
c95ce3bd0c Raise translation errors in specs 2011-05-19 17:01:42 -07:00
Maxwell Salzberg
8796c5b722 fixed build, added debugging info for notification 500s 2011-05-19 14:48:09 -07:00
danielgrippi
e7095ba788 Tests now pass, stream_element needs de-hacking 2011-05-19 12:19:27 -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
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -07:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -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
Raphael Sofaer
f409ace067 Merge remote branch 'evant/354-long-post' into evant_log_post_merge 
Conflicts:
	config/assets.yml
 2011-05-17 18:02:36 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
Raphael Sofaer
5218bd89c6 Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated. 
This reverts commit 0a8ce3b9f2.
This reverts commit f9ef9a4b47.
This reverts commit 164226a3d7.
 2011-05-17 10:33:33 -07:00
Raphael Sofaer
0a8ce3b9f2 Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge 2011-05-17 10:24:28 -07:00
Raphael Sofaer
f9ef9a4b47 Make FakeServiceUser assoc methods tolerant of nil 2011-05-17 10:14:39 -07:00
danielgrippi
7542d36abc Merge branch 'master' of github.com:diaspora/diaspora 2011-05-16 18:57:02 -07:00
danielgrippi
2ab39013fd Merge branch 'work-in-process'. yo dawg, RUN YO' PROCESS IN YO' PROCESS. 2011-05-16 18:56:01 -07:00
Raphael Sofaer
164226a3d7 Replace ServiceUser with fakes in ServicesController 2011-05-16 18:48:03 -07:00
danielgrippi
55d39521c4 rescue redis connection attempts in websocket 2011-05-16 18:34:37 -07:00
Raphael Sofaer
a357cf9217 Fix build... damn question marks. 2011-05-16 16:33:05 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -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
43ab8cfcfa Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6 Users can log in on their phones again. 
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
 2011-05-14 14:58:52 -07:00
Sarah Mei
c8e9225dfb For the love of god, normal Rails logs in test & development. 
There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere.
 2011-05-14 13:29:54 -07:00
danielgrippi
a02b9c01c8 eager loading aspect memberships 2011-05-13 18:22:42 -07:00
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
danielgrippi
ee49fb3547 no more n-query in the view problem 2011-05-13 16:49: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
Maxwell Salzberg
cd4c792908 clear tmp image uploads after you run tests 2011-05-13 14:34:45 -07:00
danielgrippi
a9a1280e17 one cuke failing. wip 2011-05-12 20:41:56 -07:00
Evan Tatarka
5f406b18d5 Updated code to work with lastest master. Tests should now pass. 2011-05-12 20:38:05 -04: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
71e77d59b3 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500 slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08: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
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f unliking works right now minus on-page feedback 2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0 Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec" 
This reverts commit bd74ab4acc.

This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
 2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec 2011-05-10 23:19:36 -05:00
Raphael Sofaer
37be13d4e0 Fix facebook finder and tests 2011-05-10 11:22:52 -07:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
Raphael Sofaer
aa4fbfbe1a Use a fixture in stream-spec 2011-05-08 19:01:26 -07:00
Sarah Mei
a904204f46 Content updater refactor complete for posts 2011-05-08 14:22:40 -07:00
Dan Hansen
50e67524c1 content update wip 2011-05-08 15:18:02 -05:00
Dan Hansen
fc25c9bedb Flash message handling is now a widget 2011-05-08 10:53:09 -05:00
Raphael Sofaer
8edb6ad649 Take double memoization out of aspects controller spec 2011-05-07 16:29:50 -04:00
Raphael Sofaer
a67b32d047 Add tag to rspec specs that generate jasmine fixtures 2011-05-07 13:54:55 -04:00
Dan Hansen
535954dcc2 make incrementing the notification count optional 2011-05-07 07:28:52 -05:00
Arzumy MD
3767cce149 moved render_views out of controller specs to spec_helper. 
cleaned up indentation and spacing in controller specs.
 2011-05-07 18:38:40 +08: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
Arzumy MD
2c4954bac8 spec for application_helper#page_title, with default text 2011-05-06 00:14:18 +08: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
MrZYX
77bae90d0e moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
Raphael Sofaer
45c5cd4b95 Don't test for nonexistent instance variable 2011-05-03 11:19:27 -07:00
MrZYX
a92b28b4bf general search and replace in markdownify (#1042) 2011-05-03 17:46:29 +02: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
899963d487 Move created_at back a second in .post 2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
MrZYX
ff58d63191 minor cleanup to routes.rb 2011-04-30 16:28:39 +02:00
Dan Hansen
73680a54e5 Fix incorrect jasmine spy usage.. GREEN? 2011-04-29 23:19:37 -05:00
Sarah Mei
09ac4c789e Remove debugging statements 2011-04-29 21:00:39 -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
MrZYX
6623dbb1f1 fixed #1039 2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
Dan Hansen
78585f5a65 Add license to specs and notifications.js 2011-04-27 16:34:30 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
Dan Hansen
e8a1ca70e3 WidgetCollection#subscribe now accepts a parameter that will be the context of the callback 2011-04-26 21:37:19 -05:00
Raphael Sofaer
24ea518b6f Fix some JS bugs, delegate doesn't work if you remove the element 2011-04-25 16:15:33 -07:00
Dan Hansen
efd9e61f45 Add new infinite scroll location to jasmine config 2011-04-22 20:35:15 -05:00
Dan Hansen
3d11b402e0 Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks 2011-04-22 20:33:21 -05:00
Raphael Sofaer
9731871ca9 Register services before embedder render spec 2011-04-20 15:11:29 -07:00
Dan Hansen
296824c92b add basic pub/sub functionality to WidgetCollection 2011-04-15 18:29:48 -05:00
Dan Hansen
0b85600e0a diaspora.js cleanup; don't pollute global namespace in spec 2011-04-15 17:31:19 -05:00
Raphael Sofaer
9969dbd109 Start refactoring aspect-filters.js 2011-04-13 15:55:10 -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
Raphael Sofaer
85993a694e Fix people#show sort order 2011-04-13 10:30:32 -07:00
Raphael Sofaer
a0f98d888a Try to fix annoying xml time spec failure 2011-04-12 16:21:42 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -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
MrZYX
8b4c8e77cb added direction detector widget to jasmine.yml 2011-04-11 22:23:21 +02: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
8631b6cc1e I stop coding for today, sorry -.- 2011-04-11 19:47:29 +02:00
MrZYX
e063f619a0 fixed jasmine 2011-04-11 19:44:31 +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
914e35dcad stub hydra for great success. also, make local_luke, local_leia, and remote_raphael fixtures. 2011-04-08 18:24:02 -07:00
Raphael Sofaer
0b9575af5d JS cleanup 2011-04-08 16:11:13 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
Raphael Sofaer
f8359bd77d Fix PeopleController#show mobile 2011-04-08 10:37:08 -07:00
Raphael Sofaer
761411e153 Mostly fix PeopleController#show for mobile 2011-04-08 10:37:08 -07:00
Raphael Sofaer
c7dc6ce817 Fix jasmine specs 2011-04-07 18:30:29 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
Raphael Sofaer
a05b141366 Add tagged posts to db seed, make people#show and tags#show infinite scroll 2011-04-07 16:36:14 -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
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
Raphael Sofaer
fd0fa61d53 Fix query in TagsController#show 2011-04-06 10:52:10 -07:00
MrZYX
4c696603c6 some better http status codes 2011-04-06 17:16:39 +02: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
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
maxwell
f3a62bf76b update jquery to latest 2011-04-02 15:03:41 -07:00
MrZYX
2ba1198b90 fixed embedder (again) 2011-04-02 17:19:56 +02:00
MrZYX
9829f11498 fixed posting spec 2011-04-02 14:01:16 +02:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
zhitomirskiyi
3e008a54d4 fixed typo in publisher jasmine spec 2011-03-31 16:49:51 -07:00
Raphael Sofaer
435b16b30a Don't index on just hidden 2011-03-30 19:17:52 -07:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
Raphael Sofaer
3387c20b5f Fix redirect away from conversation 2011-03-30 17:17:16 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc wip holding off until the follow model is done 2011-03-30 16:43:28 -07:00
maxwell
72d8b4a7e6 honk if you dont like the 1.9 build being slow 2011-03-30 15:47:59 -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
Raphael Sofaer
5c7bd6298a Fix 500 on tags index 2011-03-30 12:43:44 -07:00
maxwell
73256d598a fix public test to include .atom format 2011-03-30 11:34:54 -07:00
maxwell
cb87ba68b8 fix public test to include .atom format 2011-03-30 11:34:54 -07:00
maxwell
eff42b4219 make publish spec reflect the working job 2011-03-30 11:34:54 -07:00
zhitomirskiyi
70d1c31733 fixed the issue of nothing showing up for empty aspects 2011-03-30 11:29:12 -07:00
zhitomirskiyi
4a7326e035 WIP 2011-03-30 11:29:12 -07:00
danielgrippi
c4295a7693 fix aspect_memberships_controller specs 2011-03-30 11:15:40 -07:00
Raphael Sofaer
22b9f92c27 FIx post socketing 2011-03-30 10:55:59 -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
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
zhitomirskiyi
62a815f6d3 controller specs are passing 2011-03-29 15:03:10 -07:00
zhitomirskiyi
a5bb26a3c4 almost done 2011-03-29 15:03:09 -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
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
Raphael Sofaer
a0d3921d72 Fix 500 on tag show with comments 2011-03-28 10:01:19 -07:00
Sarah Mei
ae106e71ae Move sort order to a before filter, because this index method is waaaaay too big. 2011-03-27 18:52:43 -07:00
Sarah Mei
c4bc24d485 Add spec for remembering sort order 2011-03-27 10:56:08 -07:00
Sarah Mei
56b0d7821d Move a few specs out of an expensive context they don't need 2011-03-27 10:47:04 -07:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
3a5f8d814d fixed spec 2011-03-27 00:23:14 +01:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
MrZYX
38673158f6 actually it was the other way around, we have to tell ruby that it's utf8, though now the build fails because (first guess) \w probably doesn't include utf8 chars in 1.9 2011-03-26 18:43:31 +01:00
MrZYX
9ff0ceab07 Revert "someone doesn't save his files as UTF8 :\" 
This reverts commit c84f767174.
 2011-03-26 18:28:47 +01:00
MrZYX
c84f767174 someone doesn't save his files as UTF8 :\ 2011-03-26 18:21:07 +01:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
6855447204 unicode fix in tags 2011-03-25 17:39:44 -07:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -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
31f43696cb Initial work on retracting comments 2011-03-25 16:09:37 -07:00
danielgrippi
f5a03fd6ed Make public timeline of a user publicly accessible 2011-03-25 15:06:22 -07:00
danielgrippi
c0ce0d71b8 Make pending specs green, I think there are still some to_jsons where there should be as_json 2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65 added users_profile_image, home_timeline, fixed public_timeline 2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802 statuses/ and users/ GET routes 2011-03-25 15:06:22 -07:00
maxwell
2dca7b4807 fix test 2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c initial public api' 2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -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
danielgrippi
43315e14f9 sort contacts by name, not by a potentially nil field 2011-03-23 10:16:55 -07:00
Sarah Mei
4ff67b0200 Merge branch 'master' of github.com:diaspora/diaspora 2011-03-22 21:03:43 -07:00
Sarah Mei
87fb4b0552 alert is not the way to indicate a pending jasmine spec. >.< Try xit and xdescribe instead! 2011-03-22 21:03:33 -07:00
zhitomirskiyi
e45a3503d0 on aspect edit the contacts are now sorted by first name 2011-03-22 18:01:17 -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
maxwell
413acc59ca remove stray puts in test" 2011-03-22 12:32:48 -07:00
maxwell
a036a8035f add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
maxwell
dc60181033 404 googlebotz left and right on public remote person pages 2011-03-22 11:26:39 -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
93d69c4ec7 fixed the views for the friend finder 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
c3612ee66d Remove empty helper and spec files. 2011-03-19 22:39:21 -07:00
Sarah Mei
c3b9da8d37 Add specs to conversations#new. Unpending spec for create. 2011-03-19 22:30:58 -07:00
Sarah Mei
44ca687100 Remove annoying constant warning from resque spec 2011-03-19 21:12:43 -07:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
Sarah Mei
1bd693eb14 Added cucumber step for searching, and feature for searching for tags. 2011-03-19 19:06:24 -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
MrZYX
dce54f3d40 fixed #947 2011-03-19 15:05:45 +01:00
Raphael Sofaer
42a361dcce Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests 2011-03-18 21:07:31 -07:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -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
93f7f28b07 if you search for a hash (with a '#') it will just take you to that hash page 2011-03-17 19:16:29 -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
325eeb0ca2 Fix expectation 2011-03-17 15:40:26 -07:00
Raphael Sofaer
bef06d18d8 Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -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
bca184eaf3 photos are now successfully delayed 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
0aa5193434 Use the new local batch receive job 2011-03-17 13:41:30 -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
Raphael Sofaer
3718a72f46 log renders of collections of partials with more info 2011-03-17 11:36:16 -07:00
zhitomirskiyi
a30affe8d3 moved the fixture to the right place 2011-03-17 10:56:59 -07:00
zhitomirskiyi
3d34e3bd35 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-17 10:56:58 -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
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
MrZYX
00bb5167f8 fixed spec 2011-03-15 18:35:27 +01:00
Raphael Sofaer
1666843aa9 Fix 500 in publicsController 2011-03-14 16:48:07 -07:00
Raphael Sofaer
ae22dcc274 Fix jasmine spec 2011-03-14 12:37:20 -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
2cd6e89e5c Fix merge error from message - text refactor 2011-03-14 11:49:10 -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
03f90a999d refactor aspects controller spec 2011-03-13 21:32:59 -07:00
Sarah Mei
1d6a69ea82 refactor photos controller spec 2011-03-13 20:54:47 -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
580f0576c8 added test for edit 2011-03-11 15:43:29 -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
Raphael Sofaer
8f1a6f502e Change equals to sort-of-equals 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
danielgrippi
9ad96726de just use tag search for now 2011-03-10 19:42:24 -08:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -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
Dan Hansen
10345b14a8 generate jasmine fixture with posts 2011-03-10 19:12:16 -06:00
Dan Hansen
d7c7775b6c fallback gracefully, break build if videos can't embed 2011-03-10 18:26:55 -06:00
Raphael Sofaer
05f9d79689 Fix public posts page when signed in 2011-03-10 15:26:55 -08:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -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
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -08:00
MrZYX
6d314e9394 fixed ostatus builder + spec 2011-03-10 15:17:56 +01:00
maxwell
1baafac84b added content to rss feed 2011-03-09 19:11:09 -08: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
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
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
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
Raphael Sofaer
c259fc65f0 You can now pass hashes to the logger 2011-03-09 11:48:29 -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
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
danielgrippi
48fff29bf6 fixed conversation receive. made visibilities on conversation :dependent => :destroy 2011-03-04 11:19:01 -08:00
Raphael Sofaer
435451bc5b admins can resend invitations 2011-03-03 16:59:33 -08:00
Raphael Sofaer
da12954d22 Move statusmessage create view out to partial 2011-03-03 11:10:44 -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
770091e82b Don't retrieve all the user's contacts again unnecessarily 2011-03-02 12:11:25 -08:00
zhitomirskiyi
f58c477673 added the forgotten files 2011-03-01 23:55:11 -08:00
Sarah Mei
1590b69569 WTF. Seriously. It works with 1.9 now though. 2011-03-01 21:43:49 -08:00
zhitomirskiyi
3812612c86 added a validation of participant, as well as messages controller spec wip 2011-03-01 19:24:07 -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
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
a179bac689 fixed migrations, added unread to PrivateMessageVisibilities 2011-03-01 12:25:54 -08:00
danielvincent
979d9d7fb4 added delete actions for private messages 2011-03-01 12:14:31 -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
ebfebb16d7 Fix integration spec 2011-02-28 17:22:40 -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
Sarah Mei
cd8deca4bb fix jasmine specs 2011-02-26 06:16:34 -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
maxwell
782dc55d63 remove puts, fix admins controller test 2011-02-26 14:22:13 +01:00
Dan Hansen
c1e679ff8d fix syntax error and spec 2011-02-25 18:56:03 -06: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
83576d75ef stubbing the httpmulti in the test, now you can post to services individually 2011-02-24 17:50:01 -08:00
zhitomirskiyi
c27e2de478 removed pending test 2011-02-24 17:31:54 -08:00
zhitomirskiyi
ec93faa2c4 added the post to services icon on every page added a manage icon and moved the RSS link to the public explain 2011-02-24 17:31:54 -08:00
zhitomirskiyi
adfcc59631 can now select individual services to be added 2011-02-24 17:31:54 -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
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
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
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
zhitomirskiyi
97e00f9ee3 changed the delete to a destroy on retraction, also removed a puts 2011-02-23 12:00:42 -08:00
maxwell
16e8ecc72c fixing debugging statement in smcontroller, also fix the spec 2011-02-22 22:38:23 -08:00
maxwell
ec21230756 make status_message_controller#create return the error message 2011-02-22 22:01:08 -08:00
Dan Hansen
f41bc0c14d <3z 2011-02-22 23:19:57 -06:00
Raphael Sofaer
74b8921c09 make video urls have correct href 2011-02-22 18:51:40 -08:00
Sarah Mei
33c7400919 clean up fixture builder 2011-02-21 20:06:54 -08:00
Sarah Mei
814ef38fa9 Don't actually need 36 notifications. 2011-02-21 13:20:39 -08:00
Sarah Mei
26779889d0 To run specs without perf tests: rake spec SPEC_OPTS="--tag ~performance" 2011-02-20 14:40:51 -08:00
Sarah Mei
183c840108 And this is why we pair. ::sigh:: 
(Revert silly change to aspects#index spec.)
 2011-02-20 01:54:06 -08:00
Sarah Mei
8c1fc12d82 Don't use sleep when you want different timestamps on your posts. Just set created_at directly. 2011-02-20 01:47:10 -08:00
Sarah Mei
ad141bc5a2 rm -f the fixture builder yml file, to avoid the no-such-file warnings. 2011-02-20 01:17:28 -08:00
Sarah Mei
ee8796fc79 I should know better than to commit after midnight when I'm soloing. 
(Let's require the support files in the right order.)
 2011-02-20 01:08:13 -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
Sarah Mei
b0d98b9ce8 Add people#show specs around showing the right set of posts. 2011-02-19 22:17:45 -08:00
Sarah Mei
77adc02cbd Fix spec failure related to presence of app config settings. Also, you can't test application controller directly. 2011-02-19 22:17:22 -08:00
Sarah Mei
51df11aafc Fix build failure related to addition of default scope on Contact 2011-02-19 21:44:37 -08:00
Sarah Mei
edf15aa5bd Add specs for people#show when you're viewing your own page 2011-02-19 21:13:30 -08:00
Sarah Mei
11a4544882 Refactor people controller specs to be more sensible 2011-02-19 12:15:37 -08:00
MrZYX
3a26673298 fixed the spec I broke… 2011-02-19 17:55:31 +01:00
zhitomirskiyi
61dd5a835a default scope on contact 2011-02-18 17:38:02 -08:00
maxwell
37a699ace1 stream order can take created at to be sorted by origin post time 2011-02-18 16:01:04 -08:00
zhitomirskiyi
6dc35c516a added two pending specs for mnutt 2011-02-18 13:15:48 -08:00
maxwell
a1fdd3cdf9 i think the ci app_config has some setup i am unaware of, so this makes it not depend on that setting 2011-02-18 12:38:29 -08:00
maxwell
585ca4820b make redirect_to test more explicit, hopefully 1.9.2 will like it slightly more 2011-02-18 11:58:04 -08:00
maxwell
0bf3cae54a MS IZ added spec from admin page, moved it to its own controller where it belongs 2011-02-18 11:35:24 -08:00
Raphael Sofaer
5823da8d25 Make translation failure error out, there are at least 1 uncovered translation failures (share with lightbox) 2011-02-18 11:12:20 -05:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -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
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705 wip 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
51bc26c3df Fix notificationscontroller spec 2011-02-17 15:27:50 -05:00
MrZYX
dc74aed79b I </3 those performance specs… 2011-02-17 15:23:29 +01: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
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
Gonzalo Rodriguez
2b3926c629 Disable share button when whitespaces on status message input. 2011-02-15 09:50:39 -02:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
Raphael Sofaer
6a0a945986 Switch dispatch_post and add_to_streams 2011-02-12 13:36:46 -08:00
Raphael Sofaer
de475ec4eb Take error out of posting status messages with photos 2011-02-11 19:20:19 -08:00
Raphael Sofaer
ff0f37ceea eliminate one source of dup pvs 2011-02-11 18:25:57 -08:00
maxwell
2784f641ba fix 500 when viewing a nonexsitaint status message 2011-02-11 18:13:01 -08:00
maxwell
fd6d6350c8 make html status message create redirect, also correctly name status_messageS_controller_spec.rb 2011-02-11 18:00:23 -08:00
maxwell
e78ab6bca1 make html status message create redirect, also correctly name status_messageS_controller_spec.rb 2011-02-11 18:00:07 -08:00
maxwell
4b47de5b9e do not 500 on public photo viewing, also redirect if there is no photo rather than 500ing 2011-02-11 17:47:29 -08:00
Raphael Sofaer
fcad60d908 Delete empty spec file 2011-02-11 12:18:59 -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
f1fe913527 Change up logging a little bit 2011-02-10 11:52:00 -08:00
Raphael Sofaer
7a6d1d3378 add shadow/transparency to autocompletion. removed a hide()/show() from publisher hide and show functions. 2011-02-10 11:09:14 -08:00
Raphael Sofaer
f1c63939f9 Revert "added sliding animation to stream elements, shadow on autocomplete box." 
This reverts commit dc760f9583.
 2011-02-10 10:36:30 -08:00
danielvincent
dc760f9583 added sliding animation to stream elements, shadow on autocomplete box. 2011-02-09 20:07:25 -08:00
zhitomirskiyi
4105f90aaa forgot to add 2011-02-09 19:07:02 -08:00
Raphael Sofaer
5eb487ed20 204, not 201 2011-02-09 18:04:44 -08:00
zhitomirskiyi
1da965616b added an option to remove a contact from the last aspect, after a prompt 2011-02-09 17:47:27 -08:00
Raphael Sofaer
acd55cf7d6 Put keycodes.js in jasmine 2011-02-09 17:42:53 -08:00
Raphael Sofaer
04f33c8034 Render an empty 201 in users update with a js request 2011-02-09 17:22:45 -08:00
Raphael Sofaer
7b3a2b07ee Removed n-query, created mentions table 2011-02-09 16:07:25 -08:00
Raphael Sofaer
c11ffe93c0 Actually close the publisher on and with Publisher.close() 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 Sofaer
99f84de368 Javascript for mentions is functional 2011-02-09 16:07:24 -08:00
Raphael Sofaer
0ec2d918bb adding keycodes file, moving keyup stuff to keydown 2011-02-09 16:07:24 -08:00
danielvincent
2b25823253 autocomplete wip. separated keyup and keydown. wip. 2011-02-09 16:07:24 -08:00
danielvincent
3efc31c68f mention js working minus tracking keypresses with the hidden message field. 2011-02-09 16:07:24 -08:00
danielvincent
7d21f7bfdd publisher autocomplete correctly adds name into status_message_fake textarea 2011-02-09 16:07:24 -08:00
danielvincent
77403596aa mentions in publisher autocomplete within context 2011-02-09 16:07:24 -08:00
Raphael Jedidiah Sofaer
150f676332 Do a bunch of work on publisher autocompletion JS 2011-02-09 16:07:23 -08:00
Raphael
216a2c3cdb write formatted_message 2011-02-09 16:07:23 -08:00
Raphael Sofaer
51e129b5c6 Don't call hashes_for_people if it is a json request in search 2011-02-09 16:05:02 -08:00
zhitomirskiyi
dbf1452968 fixed an outdated integration test 2011-02-09 15:59:17 -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
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial" 
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
 2011-02-08 16:40:33 -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
maxwell
a649d18cd7 add tests to see if timestamps are updated on recevie...they are not 2011-02-08 14:07:25 -08:00
danielvincent
bf20e5a9e8 remove some js assets from mobile 2011-02-06 23:09:04 -08:00
zhitomirskiyi
59f0dca7c7 Revert "publisher is now a hot widget" 
This reverts commit 8039ab312a.
 2011-02-05 15:24:20 -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
Dan Hansen
8039ab312a publisher is now a hot widget 2011-02-05 16:47:43 -06:00
Raphael
8a2e0eef7c No semicolons in names 2011-02-02 16:57:04 -08:00
Raphael
cd8d9989cf Refactor publisher JS, use hidden field for submitting 2011-02-02 14:27:14 -08:00
maxwell
3b77663481 people controller takes so much time on CI 2011-02-02 13:37:54 -08:00
zhitomirskiyi
21e3c2ae73 Merge branch 'open-aspects' 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/home_controller.rb
	app/helpers/application_helper.rb
	db/migrate/20110201013408_add_open_aspects_to_user.rb
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/home_controller_spec.rb
 2011-02-01 17:32:08 -08:00
zhitomirskiyi
59f1bff046 storing it as a boolean in the aspect 2011-02-01 17:25:15 -08:00
zhitomirskiyi
7f026e8271 now updating the open aspects in js 2011-02-01 16:58:33 -08:00
Raphael
cfd6639f4d Revert "Merge branch 'open-aspects'" 
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
 2011-02-01 13:15:20 -08:00
zhitomirskiyi
27f1231479 Merge branch 'master' of github.com:diaspora/diaspora 2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4 Merge branch 'open-aspects' 2011-02-01 12:10:12 -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
Raphael
9080649180 Starting work on an autocomplete feature 2011-02-01 11:56:56 -08:00
maxwell
06013fabec fix sm show 2011-01-31 21:50:06 -08:00
maxwell
13f482f3fe Merge branch 'master' of github.com:diaspora/diaspora 2011-01-31 21:45:05 -08:00
maxwell
7bb7bb396a Revert "persists open aspects across logins also fixed the status message controller spec broken in master" 
This reverts commit 9e7f03236e.
 2011-01-31 21:41:05 -08:00
Sarah Mei
59a6c3b3a0 Fix import database errors by not importing notifications 2011-01-31 21:36:10 -08:00
zhitomirskiyi
9e7f03236e persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:37:20 -08:00
zhitomirskiyi
789ff679a9 persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:31:41 -08:00
zhitomirskiyi
a6c1b5bf59 mark notification as read on the status message show page 2011-01-31 15:26:20 -08:00
zhitomirskiyi
7a667abc73 unread true on notification receive 2011-01-31 15:09:01 -08:00
zhitomirskiyi
d6ab633e2c Merge branch 'notification-migration' 2011-01-31 14:41:15 -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
Dan Hansen
a5365559d7 specs for view.flashes.render 2011-01-30 16:01:28 -06: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
Dan Hansen
55bee713e9 add more specs 2011-01-29 16:45:03 -06:00
Dan Hansen
be2413b9a8 load timeago widget 2011-01-29 16:02:04 -06:00
Dan Hansen
4484bf33fa fix javascript i18n specs 2011-01-29 13:31:45 -08:00
Dan Hansen
9046273ebd some specs for the i18n widget 2011-01-29 13:31:45 -08:00
Dan Hansen
d03119f7e9 Embedder is now a widget, show videos before comments 2011-01-29 13:22:34 -06:00
zhitomirskiyi
5940292840 build should be green now 2011-01-28 21:21:14 -08:00
Raphael
7302a54710 Fix translation missing error 2011-01-28 17:50:34 -08:00
zhitomirskiyi
9d091bbf6a facebook invitations actually work 2011-01-28 17:22:18 -08:00
Raphael
07850c7cb2 fix fb finder, flesh out test 2011-01-28 17:13:20 -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
dde8fd65e5 Fix build 2011-01-28 12:18:56 -08:00
Raphael
5967ce25fd add spec for youtube_titles 2011-01-28 11:43:15 -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
Raphael
a6f8b2c14e Add splunk logging for errors 2011-01-27 11:44:35 -08:00
zhitomirskiyi
01ce26cbf3 fixed errror on services inviter action, specs 2011-01-27 10:58:09 -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
a037575ebc added invites in the tests 2011-01-26 18:14:17 -08:00
zhitomirskiyi
a610618057 display resend link if already sent invitation in friend finder 2011-01-26 16:57:39 -08:00
zhitomirskiyi
9e22f4a6e6 checks if you already invited the person 2011-01-26 16:31:34 -08:00
zhitomirskiyi
1a911a8b99 translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier) 2011-01-26 16:01:57 -08:00
zhitomirskiyi
6242ac64ed removed unique index on email to a regular index in order to make inviting users through fb work (no email present) 2011-01-26 15:04:46 -08:00
zhitomirskiyi
be57170bf9 added the empty email spec 2011-01-26 14:22:04 -08:00
zhitomirskiyi
89a8817ce6 made service#invite redirect to the right place 2011-01-26 12:16:48 -08:00
zhitomirskiyi
3392f11b64 Job::InviteUser -> Job::InviteUserByEmail 2011-01-26 12:16:48 -08:00
zhitomirskiyi
5c5e450a1e Invitation.new_or_existing_user_by_email -> Invitation.new_or_existing_user_by_service_and_identifier 2011-01-26 12:16:47 -08:00
zhitomirskiyi
d595a64169 new interface to send invitation WIP 2011-01-26 12:16:47 -08:00
zhitomirskiyi
b3467b5d17 pending specs for facebook inviter 2011-01-26 12:16:47 -08:00
zhitomirskiyi
cf45f31712 facebook friend finder is now contact-aware 2011-01-26 12:16:47 -08:00
zhitomirskiyi
f3f38cf4fd fetch person object associated with facebook id in friend finder 2011-01-26 12:16:46 -08:00
zhitomirskiyi
8bc52cdb55 facebook friend finder gathers fb friends. 2011-01-26 12:16:46 -08:00
Raphael
e890d73de7 Remove mocha 2011-01-26 11:52:14 -08:00
Raphael
e4ad229a5a Requestors are now high in search 2011-01-25 18:24:11 -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
Raphael
def20a4d31 Make person_id on profile unique, delete duplicate profiles in migration 2011-01-25 12:10:24 -08:00
Raphael
5fe0613a97 Remove extra token from search 2011-01-25 10:47:11 -08:00
zhitomirskiyi
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -08:00
zhitomirskiyi
716899f919 don't dispatch locally on comments if you're the post owner 2011-01-24 19:13:48 -08:00
maxwell
d040de541a fix error in stream and puts in fake 2011-01-24 19:09:38 -08:00
zhitomirskiyi
8f05b638b3 holy crap fixed that comment dispatch bug 2011-01-24 18:21:27 -08:00
maxwell
ed1dc584d1 make aspects#index slow for ci 2011-01-24 18:03:14 -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
Dan Hansen
ace9e8c3d8 whoops, add license to embedder.js and it's spec 2011-01-22 23:43:48 -06:00
Dan Hansen
bdf559bb2b remove video embedding from stream.js, use embedder.js 2011-01-22 23:40:08 -06:00
Dan Hansen
8619a2035c green for the night 2011-01-22 01:16:52 -06:00
Dan Hansen
67100aa7bb fix the build 2011-01-22 00:39:53 -06:00
Raphael
eea5b0a748 fix hcard link in webfinger profile 2011-01-21 15:03:11 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd getting rid of gruff and it's imagemagic deps. made graphs on stats pending. 2011-01-21 11:11:58 -08:00
zhitomirskiyi
403490364a fixed datapoint_spec. fixed labels on graph 2011-01-21 10:50:53 -08:00
zhitomirskiyi
46cb9dd346 before auth filter 2011-01-21 10:39:10 -08:00
zhitomirskiyi
46b94bc130 all the specs pass with before each 2011-01-21 10:29:07 -08:00
zhitomirskiyi
56831cec63 stats WIP 2011-01-21 10:29:07 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -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
ecb059b661 added Statistic and DataPoint models 2011-01-21 10:29:06 -08:00
Maxwell Salzberg
fe0f16812f ci sucks 2011-01-20 18:57:20 -08:00
maxwell
b21b0adca7 remove single user redirect 2011-01-20 15:02:46 -08:00
Raphael
7217bba7e7 Allow no 2 character queries 2011-01-20 12:18:42 -08:00
Raphael
971c88da5e Sort search results by friend status 2011-01-20 10:20:17 -08:00
Maxwell Salzberg
a612f55739 aspects needs more time on ci 2011-01-19 19:12:46 -08:00
Raphael
5eb0bf6736 Speed up person show 2011-01-19 18:45:45 -08:00
Raphael
0f978b983a be more generous to CI with times 2011-01-19 18:20:40 -08:00
Raphael
2c68bb0305 Remove n-query problem from contact_list 2011-01-19 18:06:35 -08:00
Raphael
e97081e8cd Delete some pending specs, fix a minor bug 2011-01-19 17:11:33 -08:00
Raphael
a5b4dd2604 fix js bug, add spec 2011-01-19 16:58:01 -08:00
Raphael
ad48f4796c Remove warning in aspectscontroller 2011-01-19 16:08:14 -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
Sarah Mei
b43c29745b Fix build by turning off transactional fixtures in the import spec. 2011-01-19 00:16:11 -08:00
maxwell
72e10cfad6 remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times 2011-01-18 22:45:43 -08:00
maxwell
7a02a31440 fix invitations#new, and a post spec which was mongo specific 2011-01-18 22:11:58 -08:00
danielvincent
4f25dfa6d3 publics controller merge fix 2011-01-18 17:14:32 -08:00
danielvincent
3dd2384458 Merge branch 'fixturebuilder' 
Conflicts:
	spec/controllers/people_controller_spec.rb
	spec/controllers/publics_controller_spec.rb
	spec/lib/diaspora/parser_spec.rb
 2011-01-18 17:05:44 -08:00
danielvincent
1fa39ad20d fixed issue in attack_vectors_spec 2011-01-18 16:58:59 -08:00
danielvincent
511a48adde fixed publicscontroller specs 2011-01-18 16:52:11 -08:00
zhitomirskiyi
ef1b7644f3 got rid of more hash from 2011-01-18 16:38:31 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
6ccf8a4d2d Fixed connecting spec, magic import failure disappearance 2011-01-18 16:05:50 -08:00
Raphael
bad7399eeb Remove yml files from git 2011-01-18 15:18:58 -08:00
Raphael
88ebd14799 Fixture builder working, need to make specs not require a clean db 2011-01-18 14:53:46 -08:00
Raphael
1353929d44 Made specs work with fixtures, spec_helper needs work 2011-01-18 13:31:10 -08:00
Raphael
ac3d037dc4 Comments controller spec using fixtures 2011-01-18 10:48:06 -08:00
Raphael
b580b7bd2c Putting fixtures in specs... 2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7 Fix specs in the presence of fixture_builder 2011-01-18 10:25:26 -08:00
Raphael
345d346224 Initial fixture_builder 2011-01-18 10:00:48 -08:00
Raphael
6474ca9540 display photos correctly 2011-01-17 19:34:33 -08:00
maxwell
0c24510682 remove an invalid spec 2011-01-17 18:33:30 -08:00
zhitomirskiyi
8818a9bb6f Merge branch 'master' of github.com:diaspora/diaspora 2011-01-17 18:04:21 -08:00
zhitomirskiyi
c28b5a22fb here you go 2011-01-17 18:03:15 -08:00
Raphael
8bd784e5ab Fix aspect edit 2011-01-17 17:36:36 -08:00
zhitomirskiyi
0c8aca3ef8 rebasing 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
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Raphael
bd4efe8c2d Escape youtube titles 2011-01-17 15:39:46 -08:00
Raphael
a7e30adc28 Better test for unique contacts 2011-01-17 14:23:50 -08:00
Raphael
6410355d71 Fix aspect edit page 2011-01-17 14:23:50 -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
Raphael
36781481bb Pulling in changes from master 2011-01-17 11:41:15 -08:00
Sarah Mei
2c91bfca96 Fix spec that fails under ruby 1.9. 2011-01-15 15:00:45 -08:00
Sarah Mei
eeba0e7a63 Remove a spec that tests a method that doesn't exist anymore. 2011-01-15 14:28:15 -08:00
Sarah Mei
795f715833 Fix notification spec to stub the right association. 2011-01-15 14:20:25 -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
Dan Hansen
d4f30ded1b Diaspora.js 2.0, added an official widget, don't use native alerts anymore 2011-01-14 14:54:44 -06: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
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
maxwell
27162e59b8 adding new js file to jasmine 2011-01-13 17:00:08 -08:00
maxwell
b116362c5d notifications for local comments 2011-01-13 13:02:02 -08:00
Dan Hansen
f807bc25d1 whitelist certain keyCodes, e.g. tab, fixes #795 2011-01-13 01:24:05 -06:00
Sarah Mei
9c87fff295 Log specs don't check for specific number of renders. 2011-01-12 22:43:45 -08:00
Dan Hansen
ce4fe1938c remove references to fancybox, we use facebox 2011-01-13 00:24:10 -06:00
Sarah Mei
57141fc305 Pull logging out to a shared behavior. Remove 4 pending specs. 2011-01-12 21:57:05 -08:00
zhitomirskiyi
9b6faa5644 added a notificaions read button 2011-01-12 16:24:14 -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
Sarah Mei
756471be43 Fix 1.9 build. MAXWELL. 2011-01-11 19:58:27 -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
Raphael
3684546335 Require pubsubhubbub 2011-01-11 14:34:30 -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
220c6894fa --amend 2011-01-11 14:23:18 -08:00
maxwell
daab8e80ce basic receive cleanup 2011-01-11 14:23:18 -08:00
Sarah Mei
68eedd578a mysql timezones: PWND. 2011-01-10 20:40:27 -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
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
47ed820dea Invitations and requests importing 2011-01-10 11:51:34 -08:00
Raphael
52f1ce81fb No syntax errors, but invitation and request importing still not working 2011-01-10 11:34:04 -08:00
Sarah Mei
f273d6938e Fix pagination spec - we don't care which 25 things are returned, just that 25 are returned. 2011-01-09 20:44:23 -08:00
Sarah Mei
545fbe4679 Fix jasmine specs by replacing fancybox with facebox, and changing expectation to match new view. 2011-01-09 19:41:18 -08: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
danielvincent
6cc5d6e3ab fixed all rspec/cucumber 2011-01-08 16:53:16 -08:00
danielvincent
cadba3f2b7 fixed specs with a reload. added header gradient for firefox 2011-01-08 13:11:55 -08:00
danielvincent
44d3c4bacd fixed inf scroll on filters issue. one spec failing in AspectsController. 2011-01-08 13:11:52 -08:00
danielvincent
79b7f62520 filter logic in aspects_controller#index 2011-01-08 13:11:51 -08:00
Raphael
e8d46982d8 Aspect memberships now importing 2011-01-07 16:58:39 -08:00
Maxwell Salzberg
24942d2f77 remove all keydown tests 2011-01-07 16:54:55 -08:00
maxwell
c7fb3d7296 remove keydown test since we do not do that anymore 2011-01-07 16:39:27 -08:00
Raphael
6abedf5f87 Contacts now importing 2011-01-07 16:28:52 -08:00
maxwell
047217f50c fixed test to have postzord only socket on comments.... need to figure out a better way to abstract this exception... 2011-01-07 16:15:13 -08:00
Raphael
aa624b4df0 People now importing, additional failing tests on imported times 2011-01-07 16:09:08 -08:00
Raphael
8885b8a354 Services now importing 2011-01-07 15:19:04 -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
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
maxwell
3fa0af8b56 make the test slightly less pedantic 2011-01-06 18:19:15 -08:00
zhitomirskiyi
86154ba348 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 17:26:42 -08:00
zhitomirskiyi
3e569c0c30 using set comparison instead of strict array comp. 2011-01-06 17:26:30 -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
zhitomirskiyi
8f2cad776b Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 17:14:59 -08:00
zhitomirskiyi
a92a374b96 added the files and fixed the tests 2011-01-06 17:14:39 -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
maxwell
cff387d651 make sure receive unescapes the payload before sending it to the job 2011-01-06 16:30:22 -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
zhitomirskiyi
0c8e6b0ba1 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 15:56:20 -08:00
zhitomirskiyi
3fae950905 also commented notification and sending ids into resque so that it works 2011-01-06 15:56:03 -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
maxwell
5818227904 adding job for posting to services 2011-01-06 13:13:09 -08:00
maxwell
1d5b6fa675 unstubing and restubbing before doing pubsubhubub 2011-01-06 12:50:48 -08:00
Raphael
9ba43b148f Move resque modifications out to spec/support 2011-01-06 12:33:12 -08:00
Raphael
0284f0fd6d Write fixture for mysql export 2011-01-06 12:33:12 -08:00
Raphael
f4d176011d Got some fixtures in, comment import specs are passing 2011-01-06 12:20:42 -08:00
maxwell
f02ed1e3c4 unstubing and restubbing before doing pubsubhubub 2011-01-06 12:19:36 -08:00
maxwell
11808e3233 adding tests for pubsub client' 2011-01-06 11:47:16 -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
7ea6b4dd8d more cleanup 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
zhitomirskiyi
02ca5793bc checking the string 2011-01-05 17:21:54 -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
zhitomirskiyi
82852db5ec added the files this time 2011-01-05 15:04:28 -08:00
zhitomirskiyi
7254db5cbc Revert "Revert "added comment on post mail method"" 
This reverts commit c9b3066599.
 2011-01-05 14:59:15 -08:00
zhitomirskiyi
c9b3066599 Revert "added comment on post mail method" 
This reverts commit c00226238b.
 2011-01-05 14:56:04 -08:00
zhitomirskiyi
c00226238b added comment on post mail method 2011-01-05 14:55:17 -08:00
Raphael
079e2f4cb2 Get a little further in importing times 2011-01-05 11:51:36 -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
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
Raphael
429087ef83 Merge remote branch 'tomk/729-retain-input-on-failure' 2011-01-04 16:39:07 -08:00
Raphael
83d6b95c46 Merge remote branch 'nickvdb/763-notifications-paginate' 2011-01-04 16:18:46 -08:00
zhitomirskiyi
f134cfd43f moved the test to the controller 2011-01-04 15:44:55 -08:00
Raphael
06d7ddbe0d Hopefully get rid of some problems with deleted accounts moving forward 2011-01-04 15:36:42 -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
0966889ab9 continue work on mongo export 2011-01-04 10:58:22 -08:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Thomas R. Koll
5e1f5ff5b1 Starting spec for rails.js 2010-12-29 17:43:50 +01:00
Nick van der Burgt
8bbb142c85 Set a limit on the second page 2010-12-29 12:32:24 +01:00
Nick van der Burgt
46e9be88d1 Wrote spec test for notifications pagination 2010-12-29 12:27:39 +01:00
Alec Leamas
215d6a8504 Build test diaspora_handle properly. 2010-12-29 10:10:08 +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
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
Sarah Mei
787d550a1f Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly. 2010-12-27 21:48:51 -08:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831 Fix a couple more specs in mysql 2010-12-26 20:52:15 -08:00
Raphael
a6dcaa2327 Photo specs passing, 9 failures left in mysql 2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a 14 failures after updating mysql branch to master 2010-12-26 17:25:07 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Dorian
b348f094ab Test for XSS in comment 2010-12-26 02:16:53 +01:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
Sarah Mei
de502bf67c Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec. 2010-12-24 18:39:20 -08:00
Sarah Mei
a1ea193fb9 Methods to generate jasmine fixtures in controller specs, and methods to load those fixtures in jasmine specs. 2010-12-24 16:08:45 -08:00
Michael Sofaer and Raphael Sofaer
7175200779 Fix a spec, need to move to a computer with firefox. 2010-12-24 15:17:24 -08:00
Sarah Mei
9c50f900ed Merry Christmas! I got you someting green. 
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
 2010-12-24 14:14:24 -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
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
Michael Sofaer and Raphael Sofaer
82b226712f Posting spec green 2010-12-24 09:58:11 -08:00
Dorian
5cbccda33a Spec for not allowing user to do the XSS 2010-12-24 15:49:26 +01:00
Michael Sofaer and Raphael Sofaer
331e6645c6 Just don't use count with select DISTINCT 2010-12-24 00:31:36 -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
Sarah Mei
2b7eeffd5b Fix searching in mysql. It now does one query for all tokens. And person_spec is green! 2010-12-22 22:24:04 -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
dcf630fd9a Request spec passes, no more scope on requests 2010-12-20 13:59:46 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
maxwell
e0883fb176 remove object_id for notifications thx sarahmei for pointing out my evil ways 2010-12-20 12:06:50 -08:00
maxwell
ed0e739ac3 updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with 2010-12-20 11:22:52 -08:00
Sarah Mei
c1bfbd358e Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know. 2010-12-20 02:50:38 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Raphael
51083e9659 Another 50 passes in mysql 2010-12-19 13:57:46 -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
MrZYX
1b6f341348 made linking more robust, this fixes #732 2010-12-19 13:49:46 +01: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
Raphael
36b622c998 Fix build 2010-12-18 15:22:56 -08:00
Raphael
02f745900f Get rid of youtube-title failure 2010-12-18 15:16:05 -08:00
maxwell
427cf18324 fix birthday spec 2010-12-17 19:41:42 -08:00
Raphael
a64d8943b4 Pulled in spec refactor, thanks blackxored 2010-12-17 18:49:34 -08:00
maxwell
13407f700e fix test 2010-12-17 17:25:11 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
Raphael
5e6c14fce8 Simplify connect_users for a huge test speedup 2010-12-16 14:47:37 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -08:00
Raphael
eb56521a66 Don't query inside of loops... 2010-12-16 12:25:31 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
Raphael
b467d12d83 Fix spec in peoplecontroller 2010-12-16 11:37:16 -08:00
maxwell
226d95ec2c Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 19:15:26 -08:00
Raphael
837ad20045 unpend spec in aspects controller spec 2010-12-15 18:11:09 -08:00
maxwell
d5ba34f245 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 18:05:54 -08:00
Raphael
e881edab96 Fix missing partials on last commit, you can now accept a request from the requestor's profile page 2010-12-15 18:05:18 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12 basic notifications 2010-12-15 17:31:36 -08:00
Raphael
b22398951e Send requests from the aspect list on the person show page 2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
maxwell
9555fae33d no notifications on retractions 2010-12-15 13:14:46 -08:00
maxwell
61b2bbbd7d Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 12:28:09 -08:00
maxwell
b6754d92b7 adding basic notification class 2010-12-15 12:11:47 -08:00
maxwell
a7d36615e6 adding basic notification class 2010-12-15 12:11:37 -08:00
Dan Hansen & Sarah Mei
82e2f23f91 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3 Fix request validations, build. 2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa added vimeo method, still needs support from lib/youtube_titles.rb. updated locales 2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88 Refactored the markdownify method. 2010-12-15 01:00:20 -05: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
maxwell
d24be269f2 small refactor of admin mail. don't call deliver in the method 2010-12-14 17:36:26 -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
Raphael
06b7b1c99a WIP pending contacts 2010-12-14 17:11:42 -08:00
Raphael
251cdec2ec Add full request cycle cucumber feature 2010-12-14 17:11:42 -08:00
Raphael
e63a8a4bfa Take contact.person query out of the views, only query people once in hashes_for_aspects 2010-12-14 12:11:36 -08:00
maxwell
0bd13ec106 use blank instead of empty for the person#name helper 2010-12-14 11:30:06 -08:00
maxwell
42c22cedf9 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-13 14:38:47 -08:00
MrZYX
045ba7c419 Merge branch 'email-validation' of https://github.com/themasch/diaspora into themasch-email-validation 2010-12-13 22:49:50 +01:00
maxwell
502db347cc removed homepage detail into a partial, which you should redefine 2010-12-13 12:52:23 -08:00
Raphael
f861955d80 profile.image_url is set to :thumb_large in update_profile 2010-12-13 12:11:54 -08:00
Mark Schmale
4cc62ffaca added spec for email validation 2010-12-13 15:46:19 +01:00
MrZYX
1284fcc92d fix for #699 2010-12-13 15:04:11 +01:00
Sarah Mei
3eaf7c48e6 white space police 2010-12-12 13:43:01 -08:00
Sarah Mei
7cd8e0f16b Fix jasmine specs so that they fail when they're supposed to. 2010-12-12 12:57:11 -08:00
danielvincent
d19353ed8f added newline support to markdownify 2010-12-12 00:44:54 -08:00
Sarah Mei
646603ffe0 Don't show rake output when running migrations_spec 2010-12-11 12:32:33 -08:00
danielvincent
6f62161442 invitation emails stripped of whitespace from form 2010-12-10 18:10:24 -08:00
danielvincent
2c5d5d9328 show already invited users on invitation#new 2010-12-10 18:05:08 -08:00
MrZYX
0b57ccd47f fixed require 2010-12-10 21:49:09 +01:00
Raphael
2c141baf78 Capitalization... 2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d Correctly stub the websocket redis method 2010-12-10 11:53:18 -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
MrZYX
36043845ca fixed requires for ruby 1.9 2010-12-10 17:25:02 +01:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
Raphael
fc73c02c3a Fix hashes_for_person spec 2010-12-09 20:01:37 -08:00
maxwell
dfbc01ca7a added a test for the converter rake task 2010-12-09 19:29:25 -08:00
maxwell
bf56364019 tests for post to services resque job 2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1 added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run 2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72 moar tests for services 2010-12-09 19:29:25 -08:00
maxwell
041e747db6 MSSM services are now broken out into seperate classes, and we cleaned up posting to them 2010-12-09 19:29:25 -08:00
Raphael
2be0666d80 Remove query from aspects manage, correct spec in User spec 2010-12-09 19:11:47 -08:00
Raphael
e406426b81 select only profile on most Person queries 2010-12-09 15:04:40 -08:00
maxwell
13740da9b9 fix for people controller where Person.search was returning a non-deterministic order of people 2010-12-09 14:37:07 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
Raphael
b8589c457d Refactor people edit page, now using form_tag 2010-12-09 13:03:30 -08:00
zhitomirskiyi
23d2a92bf1 pushing the profile to to all the contacts 2010-12-09 11:51:35 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
danielvincent
b94e6ae4a0 shift+enter submits new messages/comments 2010-12-07 21:30:29 -08:00
Raphael
18319f8e42 Hopefully cut down the stream rendering time by memoizing the new comment form 2010-12-07 09:28:11 -08:00
Raphael
f421f1327c Take nested queried out of aspects manage 2010-12-07 00:21:05 -08:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
8a19e9f961 Fix spec 2010-12-06 13:56:40 -08:00
Raphael
32a2264af5 Refactor peoplecontroller index 2010-12-06 13:36:20 -08:00
maxwell
97c1ce54c1 fixed the batch emailer tests... sorry it took me so long 2010-12-06 10:56:04 -08:00
Raphael
3ef5ac5252 Add some specs to Invitation, use I18n in InvitationsController 2010-12-05 14:37:43 -08:00
danielvincent
e9742acc32 reverting http_post to a working state 2010-12-05 02:08:29 -08:00
danielvincent
d7407b7aa6 request -> resource 2010-12-05 02:03:03 -08:00
danielvincent
737e6084df actually setting the timeout in restclient 2010-12-05 01:54:16 -08:00
Sarah Mei
ecc537c737 Stub Jobs::ReceiveSalmon.perform in controller test 2010-12-05 01:31:19 -08:00
maxwell
65c22020e8 fixing photo controllers spec 2010-12-05 00:45:13 -08:00
maxwell
2c09c35425 MS DG photos now delete sm if they are empty status messages, and status messages delete their photos 2010-12-05 00:45:13 -08:00
maxwell
a415ff5c5f fixed the build. made photos dependent destroy with parent status message 2010-12-05 00:45:13 -08:00
Raphael
36e1fb8b2c Fix a couple local-posting specs 2010-12-04 23:38:31 -08:00
Raphael
c99796f5db Extra spec on find_for_authentication 2010-12-04 23:15:22 -08:00
maxwell
03a5514400 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 23:06:58 -08:00
Raphael
61e40debb5 Fix in find_for_authentication 2010-12-04 22:25:28 -08:00
maxwell
fb310560df Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 19:37:47 -08:00
Michael Sofaer
9e575ea765 MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues 2010-12-04 19:36:22 -08:00
danielvincent
4c4f5c6aa4 dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND. 2010-12-04 19:36:22 -08:00
maxwell
b56b2fbd1b added spec for periods in usernames; unpendify a couple of specs 2010-12-04 19:33:58 -08:00
Sarah Mei
c9f7866955 Random extra spec for people_controller 2010-12-04 18:13:15 -08:00
Michael Sofaer
3ca89bde57 Put photos create spec back in. I am not going to check who left it pending. 2010-12-04 17:18:08 -08:00
danielvincent
d1ad2efed1 HttpPost job now follows redirects 2010-12-04 15:23:54 -08:00
danielvincent
177cc16e2f fixed the build 2010-12-04 14:26:13 -08:00
OhaiBBQ
ba23bd7a0a Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs 2010-12-04 11:54:59 +03:00
maxwell
7dce94814c fixing the invite user job 2010-12-03 22:41:16 -08:00
Sarah Mei
713c98ce51 don't require redis for cucumber 2010-12-03 20:49:41 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -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
71cae6b89f Move request mail into resque 2010-12-03 11:51:04 -08:00
maxwell
c43077d318 fixed twitter, added logging for constants, added job for local recieve 2010-12-03 11:34:42 -08:00
MrZYX
acc8803cee try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9 2010-12-03 16:33:28 +01:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -08:00
maxwell
579a288351 public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable 2010-12-02 18:48:50 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
danielvincent
756824d072 removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec. 2010-12-02 18:42:21 -08:00
danielvincent
6c05d01177 enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index. 2010-12-02 17:36:46 -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
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
c76f38ca23 Write webfinger job for search 2010-12-02 12:35:26 -08:00
Raphael
6cfa6577a5 Add first resque job 2010-12-02 12:35:26 -08:00
Raphael
cee5e4c26e Bring in resque recipes and rake tasks 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
maxwell
119599bfeb Revert "Commented-on posts bubble up to the top" 
This reverts commit 6da410079b.
 2010-12-02 09:51:26 -08:00
MrZYX
c3356af8d1 mardownify doesn't strip _/__/*/** without context anymore and allow __/** to be escaped with \__/\** instead of \_\_/\*\*. probably makes it less robust against weired constructs though 2010-12-02 13:54:39 +01:00
Sarah Mei
1f789e5f2b typeof regex implemented inconsistently across browsers...sigh 2010-12-01 23:08:57 -08:00
Sarah Mei
c7b1fcc806 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master 2010-12-01 22:53:58 -08:00
Sarah Mei
ef89d49b1a Revert "Added some specs for grammatical_gender (User model and Users controller)." 
This reverts commit 1295417224.
 2010-12-01 22:29:19 -08:00
Dan Hansen
f81dc0fed6 remove empty specs 2010-12-01 21:25:58 -08:00
root
5d31a24e9e fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function 2010-12-02 02:54:38 +03:00
Raphael
6da410079b Commented-on posts bubble up to the top 2010-12-01 15:38:56 -08:00
Raphael
8d853a88a3 Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
Raphael
f0df1ec8df Remove dev utilities controller 2010-12-01 15:38:56 -08:00
Raphael
c07b9b1874 Fix rest of specs 2010-12-01 15:38:56 -08:00
Raphael
199eb8945d clean up posting spec, move socket_to_uid into add_to_streams 2010-12-01 15:38:56 -08:00
Raphael
836b5685f7 Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post 2010-12-01 15:38:56 -08:00
Raphael
e63a29be64 Change v_aspect_ids to prune_aspect_ids 2010-12-01 15:38:55 -08:00
root
5cd0a60073 Moved to it's own file, added specs 2010-12-02 02:22:05 +03:00
maxwell
75caecc6a3 reset to local to english in tests 2010-12-01 12:16:21 -08:00
maxwell
7fc9d239b9 you can no longer send a request to yourself at the Request model level 2010-12-01 11:37:54 -08:00
Raphael
ef083c6770 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-01 11:21:36 -08:00
Raphael
5791ffba79 Add administrative mail method 2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations 2010-12-01 19:13:39 +01:00
Paweł Wilk
1295417224 Added some specs for grammatical_gender (User model and Users controller). 2010-12-01 18:19:48 +01:00
Josh Lubaway
ecd1d2ecd6 Bug #624 Can't unset birthday 
This change allows users to "unset" their birthday.

Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.

Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
 2010-11-30 21:23:47 -08:00
Dan Hansen & Sarah Mei
b2f4e064fc stream.js now semi-split into functions (still needs work); specs for toggling comments 2010-11-30 16:24:11 -08:00
Raphael
a520c756ea Fix spec 2010-11-30 16:02:14 -08:00
danielvincent
601284a171 make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo. 2010-11-30 15:58:26 -08:00
maxwell
c5f71184be profile now knows about three images sizes, even in federation case 2010-11-30 15:58:25 -08:00
Hexagon
160198c152 Added rake task to check pod_url and terse_pod_url 2010-11-30 15:58:25 -08:00
maxwell
fdbc7dff86 profile now knows about three images sizes, even in federation case 2010-11-30 15:56:43 -08:00
Hexagon
b15032de39 Added rake task to check pod_url and terse_pod_url 2010-11-30 15:56:43 -08:00
Raphael
366734ca5e Take queries out of aspect contacts pane on home page 2010-11-30 15:35:32 -08:00
Raphael
57485e7093 Move aspect contacts pane js to public 2010-11-30 13:55:37 -08:00
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
Hexagon
ec5145777e Added rake task to check pod_url and terse_pod_url 2010-11-30 13:32:46 -08:00
Hexagon
c98f6f21c8 config spec now makes sense 2010-11-30 22:27:19 +01:00
danielvincent
185e84537e fixed build 2010-11-30 13:19:25 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
Hexagon
4fa3e801a8 Added rake task to check pod_url and terse_pod_url 2010-11-30 20:48:55 +01:00
Raphael
fcb0e07dd7 Stop regenerating fixtures on every spec run 2010-11-29 23:22:49 -08:00
Hexagon
7d2b46c7c0 public helper spec superfluous, fixing build 2010-11-30 00:17:01 +01: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
danielvincent
2c22941e2f fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show. 2010-11-28 20:16:57 -05:00
Sarah Mei
5ae8a06016 unpendingify comment specs 2010-11-28 17:16:22 -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
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
Raphael
4e15745170 Add spec to comment 2010-11-28 00:55:20 -05:00
Raphael
cbe98a1479 Add spec to commentscontroller 2010-11-28 00:39:23 -05:00
Raphael
703e8e0426 Add spec for js requests on stmc create 2010-11-28 00:36:05 -05:00
Raphael
6d6b07fb92 Use form_tag, not form_for, in _new_comment 2010-11-27 23:24:29 -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
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -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
Raphael
7030ed0fed Putting youtube titles back into status messages 2010-11-27 11:43:24 -05:00
Raphael
d5d4a08f03 Start moving youtube title getting into the post/comment flow 2010-11-27 01:00:47 -05:00
Raphael
fef6d84f4b markdownify performance spec 2010-11-26 22:16:33 -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
Raphael
e09b544f26 Add specs to log overrider 2010-11-26 21:15:02 -05:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
Raphael
fb85ffe406 Adding specs for log_overrider 2010-11-26 18:38:08 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
Sarah Mei
f8229d07e8 Adding copyright to js files 2010-11-26 12:16:10 -08:00
Michael Sofaer and Raphael Sofaer
b54164cef8 Don't do expensive things on invalid users 2010-11-26 11:55:54 -05:00
Dan Hansen & Sarah Mei
257d6f414a Top-level Diaspora object for js widget management 2010-11-25 22:24:25 -08:00
danielvincent
417301088f fixed build 2010-11-26 00:56:53 -05:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
Dan Hansen & Sarah Mei
5075a7384b allow hyphens in YouTube video IDs 2010-11-25 21:05:54 -08:00
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -05:00
Raphael
33ba00377e Add performance spec 2010-11-25 23:53:45 -05:00
Dan Hansen & Sarah Mei
eb314aa300 Fix application helper specs around youtube links 2010-11-25 16:29:30 -08:00
Sarah Mei
ef2fa21d06 person_image_link and object_path return empty strings if parameter is nil. 2010-11-25 12:26:46 -08:00
Sarah Mei
050918a310 Added link to manage aspects page from sidebar. 
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
 2010-11-25 10:29:35 -08:00
Sarah Mei
287b79ab17 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-24 22:09:25 -08:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
Raphael
a85f47041a This file is generated by rake fixtures:users 2010-11-24 14:07:00 -05:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
zhitomirskiyi
a9b503b65e made the dev. util things pending 2010-11-23 15:49:50 -08:00
zhitomirskiyi
3f737116d6 since there is only one person with that name in the db, it returns a redirect 2010-11-23 11:02:17 -08:00
zhitomirskiyi
ebaf2c081e returning nothing on empty query and limit the returning of the query to 90 2010-11-23 10:02:01 -08:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
709e348457 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/fixtures/users.yaml
 2010-11-23 00:15:26 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
maxwell
7c09117230 fixing build 2010-11-22 19:05:35 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
zhitomirskiyi
7df35ade12 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
danielvincent
9a18b7e6f3 photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level. 2010-11-22 00:32:46 -08:00
danielvincent
c841a47a37 status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE. 2010-11-21 23:42:49 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
4ce337bbed display a users username in the final step 2010-11-21 16:13:02 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
Raphael
b991df9d3a WSR spec working 2010-11-21 16:19:25 -05:00
Raphael
6f0d008914 Move WebSocketReceiver out to a js file 2010-11-21 16:14:36 -05:00
Raphael
0daffb7fed Add a couple specs, refactor in connecting 2010-11-21 14:09:39 -05:00
Raphael
4ce2de55e2 Fix photo show, js on people search page 2010-11-21 13:29:50 -05:00
zhitomirskiyi
3d5cf8f625 added a panding cross path request spec 2010-11-19 18:53:46 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
zhitomirskiyi
c2dcf9a074 fixed the invite spec 2010-11-18 16:55:44 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -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
Raphael
61692c1da6 Fix translation missing in inv mailer 2010-11-18 12:50:46 -08:00
Raphael
be55384628 Add pending spec to invitations 2010-11-18 11:21:35 -08:00
maxwell
9882fa183d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
Sarah Mei
64237534fd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:31:21 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
maxwell
f01fca1877 letting jammit do its default thing 2010-11-17 22:18:15 -08:00
danielvincent
1a9041a3c0 DG MS; fixed cucumber tests to work with new landing page flow 2010-11-17 19:49:01 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
maxwell
2c627cdb2b updating jas 2010-11-17 00:16:11 -08:00
maxwell
f81bb1d7e7 i broke the jasmine tests. this is me fixin them 2010-11-16 22:02:18 -08:00
Raphael
2d347ec36d Delete an accepted friend request 2010-11-16 16:47:06 -08:00
Raphael
f3a301d314 Don't expect raises in request specs, redirect to :back on all requesting 2010-11-16 16:18:16 -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
44bd4534ce I found where we needed the one-line addition. Ruby 1.9 build now works. 
I feel pretty badass.
 2010-11-15 22:44:55 -08:00
Sarah Mei
2cf4350fab Clean up unused variable 2010-11-15 22:42:09 -08:00
Sarah Mei
686cea6595 1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9. 2010-11-15 21:52:02 -08:00
Sarah Mei
9fa47c9bfa Fix a failing spec under 1.9 in receive_spec 2010-11-15 21:19:21 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Raphael
70bcab3abc adding a couple specs to invitation_spec 2010-11-15 16:34:59 -08:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Sarah Mei
23c1ac4936 Cucumber feature for managing contact requests 2010-11-14 21:49:56 -08:00
Sarah Mei
45e47513c2 AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly 2010-11-14 21:49:36 -08:00
Sarah Mei
830a43ec2f Add destroy specs for RequestsController. 
Cucumber feature for contact requests.
 2010-11-14 09:43:28 -08:00
Raphael
2ad74d397c fix build 2010-11-13 19:05:12 -08:00
danielvincent
86470dc15b jasmine references move_contact instead of move_friend 2010-11-12 20:39:49 -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
danielvincent
a21af7cac6 friend_users -> connect_users in helper_methods 2010-11-12 20:22:54 -08:00
Sarah Mei
6c439608f0 started specs for AspectEdit.deletePersonFromAspect 2010-11-12 17:04:15 -06:00
Sarah Mei
9586ebb67e specs for AspectEdit.onMovePersonSuccess 2010-11-12 16:44:22 -06:00
Sarah Mei
737c812e08 Specs for AspectEdit.onDeleteRequestSuccess 2010-11-12 16:38:02 -06:00
Sarah Mei
506d13335a Finally have complete specs for AspectEdit.onDropMove. 2010-11-12 16:05:17 -06:00
Sarah Mei
b77547e940 Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend 2010-11-12 14:51:16 -06:00
Raphael
1e842f1a88 Render mail css as a partial, fix spec 2010-11-12 12:26:34 -08:00
Raphael
a4d7b25bac Merge branch 'master' of github.com:diaspora/diaspora 2010-11-12 11:54:19 -08:00
Raphael
ae9f4ab969 Refactor mail views, add a spec to make sure CSS is rendered 2010-11-12 11:47:59 -08:00
Sarah Mei
feec6d971d More specs for aspect edit JS 2010-11-12 13:40:23 -06:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
Sarah Mei
c113ee2b7c Finish specs for AspectEdit#stopDrag. 2010-11-10 10:54:12 -07:00
Sarah Mei
72bf683c87 Renaming publisher_spec to publisher-spec since js likes dashes. Fix typo in spec. 2010-11-10 10:53:23 -07:00
maxwell
4037ae9f33 fixing controller test 2010-11-09 16:55:54 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
98fe1d357b accept_friend_request no longer takes ids 2010-11-09 14:15:02 -08:00
Raphael
bfa0917ce4 add a couple specs 2010-11-09 14:07:26 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
ae28a6f70c Don't pluralize in model spec name 2010-11-09 14:07:26 -08:00
Raphael
4818973643 Beginning to refactor invitations into an Invitation class 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
Sarah Mei
16e2ccc614 Specs for aspect edit during and stop drag. 2010-11-09 06:53:55 -08:00
Sarah Mei
16ea7a321b specs for AspectEdit#animateImage 2010-11-08 21:19:49 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -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
zhitomirskiyi
cbabc547a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032 the profile cannot massassign diaspora handle 2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Sarah Mei
1a4fa2713a More specs for aspect-edit.js. Initialize now fully covered. 
Also, bundler upgraded our cucumber and rspec.
 2010-11-07 16:58:51 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07: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
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Raphael
c69e2b8900 rename spec file 2010-11-05 11:26:49 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Raphael
4eba0595f9 Fix 328 profile images dying, thanks to theBernd 2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -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