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

2651 commits

Author SHA1 Message Date
danielvincent
52a3996ad0 textareas auto expand 2010-12-11 22:18:03 -08:00
Raphael
627561737c Just get rid of some whitespace 2010-12-11 20:34:25 -08:00
danielvincent
b4170dc991 badges on stream elements. say 'all aspects' instead of listing out all user's aspect names 2010-12-11 20:28:40 -08:00
MrZYX
0d70f78a12 small translation fix 2010-12-11 22:03:06 +01:00
danielvincent
c9b498d59c resolved 500 page on getting_started#step_3 2010-12-11 12:05:58 -08:00
danielvincent
fd2cbc1cf4 added invite link to search page 2010-12-10 18:28:51 -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
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
danielvincent
8de5c5babd fixing request bar on aspects#manage 2010-12-10 10:12:30 -08:00
MrZYX
36043845ca fixed requires for ruby 1.9 2010-12-10 17:25:02 +01:00
MrZYX
0374ee436e fixed untranslatable strings 2010-12-10 16:52:35 +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
maxwell
416a36ea9a ugh 2010-12-09 20:32:39 -08:00
maxwell
23e635bf20 i am an idiot 2010-12-09 20:30:38 -08:00
maxwell
78979bca6a Merge branch 'master' of github.com:diaspora/diaspora 2010-12-09 20:25:00 -08:00
maxwell
645519be32 require twitter and facebook? 2010-12-09 20:24:45 -08:00
danielvincent
abcd3ca5b0 time ago in words down to seconds 2010-12-09 20:13:46 -08:00
danielvincent
5731f32cfe add correct page titles 2010-12-09 20:09:20 -08:00
maxwell
58dafd6792 get rid of post in service 2010-12-09 20:00:56 -08:00
maxwell
30e86c9d6a add further warning 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
9d37b2a749 small bugfixes for services refactor 2010-12-09 19:29:25 -08:00
maxwell
8fe2eb3180 starting migrations 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
778c62e0b0 Use mail css partial 2010-12-09 19:11:47 -08:00
maxwell
3625a5f2f1 display a basic message for when nothing was searched for 2010-12-09 16:51:58 -08:00
maxwell
10ca0688f5 dont show get satisfaction unless you are on joindiaspora.com 2010-12-09 16:35:31 -08:00
zhitomirskiyi
10141742e5 Doing the query in mongo 2010-12-09 15:53:37 -08:00
Raphael
e406426b81 select only profile on most Person queries 2010-12-09 15:04:40 -08:00
maxwell
b54a72c240 Revert "Revert "fixed commenting bug on current user's profile page"" 
This reverts commit 166202d0b2.
 2010-12-09 13:57:43 -08:00
maxwell
5fb782a988 added post guid for local notifications 2010-12-09 13:56:53 -08:00
maxwell
166202d0b2 Revert "fixed commenting bug on current user's profile page" 
This reverts commit 8264c58e3e.
 2010-12-09 13:53:23 -08:00
danielvincent
8264c58e3e fixed commenting bug on current user's profile page 2010-12-09 13:42:11 -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
fa9caf00ca added tooltip text to public icon 2010-12-08 19:07:08 -08:00
danielvincent
aa628c090d highlight public posts in the stream 2010-12-08 18:59:02 -08:00
danielvincent
cdd225c076 don't show new comment form on a non-contact's post 2010-12-08 18:23:30 -08:00
danielvincent
faf27fe05a Merge branch 'master' of github.com:diaspora/diaspora 2010-12-08 17:06:39 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
maxwell
10df61a504 order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page 2010-12-08 16:35:48 -08:00
maxwell
e4e3a7493c fixed a bug where reshare text was truncated 2010-12-08 15:09:41 -08:00
maxwell
d6c5a88836 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-08 14:34:31 -08:00
maxwell
1f8f07f48d added slightly better error message on aspect update failure 2010-12-08 14:21:14 -08:00
maxwell
3dbb80bf9f added slightly better error message on aspect update failure 2010-12-08 14:14:49 -08:00
maxwell
f659ba58ef limit the new aspect form name to be less than 20 char in the form 2010-12-08 13:58:16 -08:00
maxwell
5f1f28923f fixed a comment counting bug, and the show_all_comments message when the comment count was three 2010-12-08 13:44:57 -08:00
danielvincent
497dcccb8f merge email and mail queues in resque 2010-12-07 23:40:07 -08:00
Hexagon
5c1c31b2b2 Final fix, really 2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00 Putting document.ready back 2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5 Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01: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
danielvincent
d3483c1cd5 forgot to remove something... 2010-12-07 00:00:34 -08:00
danielvincent
de0ecff5b7 aspects first on home contact list. 2010-12-06 23:59:16 -08:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
14a9bc02f9 Move aspect_contacts in to aspects 2010-12-06 17:20:21 -08:00
Raphael
c034113a7c Refactor to aspect partial 2010-12-06 17:20:21 -08:00
Raphael
32a2264af5 Refactor peoplecontroller index 2010-12-06 13:36:20 -08:00
danielvincent
460081bc2f don't condense comments on show pages 2010-12-05 17:21:57 -08:00
Raphael
3ef5ac5252 Add some specs to Invitation, use I18n in InvitationsController 2010-12-05 14:37:43 -08:00
Raphael
4b1c36ca04 Timestamp services 2010-12-05 14:37:00 -08:00
Raphael
5a5bd13ceb Take out extra person.save 2010-12-05 12:46:05 -08:00
MrZYX
6a4351378b fixed bug in the mailer that caused a invalid To: header in the mail 2010-12-05 20:48:18 +01:00
MrZYX
4df13d56e1 made that latest change translatable 2010-12-05 16:02:52 +01:00
MrZYX
b84b6ea9e4 some fixes to translations 2010-12-05 16:02:52 +01: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
danielvincent
648614aea5 add 4 sec timeout to restclient 2010-12-05 01:26:31 -08:00
maxwell
53b38a3bca fixing p-controller for real 2010-12-05 00:52:45 -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
c320dae589 Add a cuke for being invited by someone 2010-12-05 00:15:37 -08:00
maxwell
03a5514400 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 23:06:58 -08:00
maxwell
0a8af9e72b DG MS some fixes for getting started 2010-12-04 23:05:47 -08:00
Raphael
61e40debb5 Fix in find_for_authentication 2010-12-04 22:25:28 -08:00
Sarah Mei
9da69a4b01 Mobile log in form is usable. Also, added mixins for sass. 2010-12-04 20:45:52 -08:00
danielvincent
03961bce7b removed last reference to invitation fancybox 2010-12-04 20:06:24 -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
Sarah Mei
fea6884acc Mobile homepage looks decent. 2010-12-04 19:30:14 -08:00
maxwell
b3ca504c40 no periods in username 2010-12-04 19:28:08 -08:00
danielvincent
c4db32c253 adding jquery 1.4.4 back re sentientwaffle's fix. 2010-12-04 18:59:01 -08:00
maxwell
8fb97072df Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict 2010-12-04 18:40:17 -08:00
maxwell
55c0bd684b remove some puts 2010-12-04 17:43:15 -08:00
maxwell
e47730b63f Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 17:39:19 -08:00
danielvincent
948707ea23 rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers 2010-12-04 17:22:22 -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
maxwell
b9ab799569 ironing out invites 2010-12-04 16:49:45 -08:00
maxwell
b300adbef5 fixed a potentially bad bug with nil invite tokens 2010-12-04 16:13:44 -08:00
maxwell
4c3de52f68 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 16:03:54 -08:00
maxwell
8306cfffde add token back to invite form 2010-12-04 16:03:35 -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
maxwell
88aa67dba7 actually put the post in the xml param where we expecting it. also, throw the errors so we know in whats going on in resque 2010-12-04 13:54:39 -08:00
danielvincent
34a1a35bf1 skip getting started is not ajaxy 2010-12-04 12:06:08 -08:00
maxwell
544ab993ac only show the url when the post has photos 2010-12-04 11:58:34 -08:00
danielvincent
c29bc0ce65 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-03 23:40:25 -08:00
danielvincent
47b6d66b83 fixed proportions in stream, etc. 2010-12-03 23:38:29 -08:00
maxwell
c5f2e8bb2d now you can not invite yourself. we have a bug as send_contact_request_to was taken out but Invitation still used it 2010-12-03 22:58:37 -08:00
maxwell
7dce94814c fixing the invite user job 2010-12-03 22:41:16 -08:00
maxwell
94c7b86a55 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-03 19:34:12 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
danielvincent
5da5ee26bb two column aspect listing on manage page. made avatars smaller. 2010-12-03 16:22:20 -08:00
maxwell
0684c40660 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-03 15:51:44 -08:00
maxwell
b8ece9381a fixing up public image show 2010-12-03 15:48:27 -08:00
danielvincent
a7823485c7 made http calls synchronous. messagehandler enqueues POSTs into resque. 2010-12-03 15:26:52 -08:00
maxwell
f4fa3191bc just call Jobs::Receive directly for now 2010-12-03 15:03:32 -08:00
maxwell
c99bc05886 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-03 13:58:12 -08:00
maxwell
85a85716c6 made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions 2010-12-03 13:57:47 -08:00
Philip Champon
2633dbc268 Issue 658: user object creation comes before person object creation, 
preventing spurrious handle creation errors, if user creation
      fails
 2010-12-03 14:59:35 -05: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
dd326699bd changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :) 2010-12-03 16:04:37 +01:00
MrZYX
a605ab482b made sender address in notifier.rb configurable. This fixes #657 2010-12-03 15:49:34 +01:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
danielvincent
30668bf2e6 visual touchups 2010-12-02 23:19:30 -08:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -08:00
Raphael
2e87bece60 Final fixes for person socketing 2010-12-02 19:03:15 -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
11f04a060e frustrated 2010-12-02 18:48:50 -08:00
maxwell
b9131c0e46 pushing to my website for further debugging 2010-12-02 18:47:48 -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
maxwell
2fbf2ddd6f you dont have a pending request from everyone 2010-12-02 16:09:55 -08:00
Raphael
07fdabbbd4 Seperate queues for jobs 2010-12-02 15:34:54 -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
maxwell
7f5dc14726 fix dup comment showing with comments with more than three, also fixed veribage 2010-12-02 15:18:54 -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
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
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
c7b1fcc806 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master 2010-12-01 22:53:58 -08:00
Sarah Mei
a09f299cfa Revert "Added translation scaffold for inflection of nouns by grammatical gender in some languages." 
This reverts commit 65c796572d.
 2010-12-01 22:29:32 -08:00
Sarah Mei
967fcd9a52 Revert "Added genderized variants of t() to views, controllers and helpers." 
This reverts commit 017251fef9.
 2010-12-01 22:29:24 -08:00
Sarah Mei
d6e8873b64 Revert "View fixed after rebase according to latest changes." 
This reverts commit 76edca1366.
 2010-12-01 22:29:04 -08:00
Dan Hansen
d76ae86180 2010-12-01 22:13:15 -08:00
Dan Hansen
f3e3e0f344 2010-12-01 22:12:57 -08:00
maxwell
e18b918676 MS DG only show three comments by default 2010-12-01 18:09:41 -08:00
danielvincent
ee47a2ffda fixed diaspora logo asset on landing page 2010-12-01 16:18:13 -08:00