Commit graph

1559 commits

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