zhitomirskiyi
02ca5793bc
checking the string
2011-01-05 17:21:54 -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
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
zhitomirskiyi
d3daa32558
mark a notification as read when you ignore a request
2011-01-04 11:27:25 -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
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
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
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
Dorian
5cbccda33a
Spec for not allowing user to do the XSS
2010-12-24 15:49:26 +01:00
danielvincent
a1f3ab3046
mark requests as read when a user responds to the request
2010-12-21 10:31:18 -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
MrZYX
1b6f341348
made linking more robust, this fixes #732
2010-12-19 13:49:46 +01: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
