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

3406 commits

Author SHA1 Message Date
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
e56ba84094 friend finder basic styling 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
d976bf0966 fixed bug in facebook service finder 2011-01-26 12:16:46 -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
f9fbb63ecb Make 'not sharing' a button, eliminate xss in alert 2011-01-26 11:26:14 -08:00
Raphael
e4ad229a5a Requestors are now high in search 2011-01-25 18:24:11 -08:00
maxwell
4e60d2b92e update inf. scroll; fix pagniation showing/not showing in all the wrong places 2011-01-25 17:38:29 -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
maxwell
75f08f8cb9 limit results in people#show to 15 posts 2011-01-25 14:21:15 -08:00
Raphael
5fe0613a97 Remove extra token from search 2011-01-25 10:47:11 -08:00
Raphael
d1b1db25ed That needed to be formatted differently 2011-01-25 10:09:15 -08:00
Raphael
d288160c7f Add link to text request_accepted email 2011-01-25 10:07:45 -08:00
maxwell
cef10c1228 added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css 2011-01-24 23:18:24 -08:00
zhitomirskiyi
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -08:00
maxwell
d040de541a fix error in stream and puts in fake 2011-01-24 19:09:38 -08:00
maxwell
bc82dac61c make the more button work in the mobile site, also, i finally fixed the timeago stuff in the scroll 2011-01-24 19:09:37 -08:00
maxwell
8b3beba93f adding login page to mobile, and adding timeago WIP 2011-01-24 17:36:47 -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
zhitomirskiyi
4217aa75e0 swapped back icon in mobile header for list icon 2011-01-24 12:45:30 -08:00
zhitomirskiyi
2c230fb80d added menu notifications page aspect name header. 2011-01-24 12:23:52 -08:00
Dan Hansen
b533d31fad make the footer not so useless 2011-01-24 12:23:51 -08:00
danielvincent
21465c8f32 various mobile tweaks. logout link actually logs out 2011-01-24 12:22:18 -08:00
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
danielvincent
383876ddf4 mobile stream sass tweaks 2011-01-24 12:22:18 -08:00
danielvincent
1631452669 added in link to search page 2011-01-24 12:22:18 -08:00
danielvincent
b983746888 force all links to not be bold. 2011-01-24 12:22:17 -08:00
danielvincent
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
Dan Hansen
0d905a7124 i18n locale fix 2011-01-24 03:14:19 -06:00
Dan Hansen
8293016348 make the footer not so useless 2011-01-23 23:53:17 -06:00
danielvincent
c96098540b ask a question in the publisher. (not removing previous translation & method just yet). 2011-01-23 11:06:08 -08:00
danielvincent
77042f9d47 publisher always shows textarea. outline publisher textarea in blue 2011-01-22 18:49:50 -08:00
Sarah Mei
46dcd07f39 Oops, debugging statement 2011-01-22 15:59:30 -08:00
Sarah Mei
d4cb5b8dad Don't cache authenticity tokens 2011-01-22 15:56:31 -08:00
Dan Hansen
90f5192055 refactor process_youtube, escape vimeo titles 2011-01-22 16:26:45 -06:00
zhitomirskiyi
5ebd10e43f removing photo from publisher works 2011-01-22 13:48:26 -08:00
zhitomirskiyi
b7f78335e1 mousedown and fixed sass 2011-01-22 13:48:25 -08:00
zhitomirskiyi
ff375b71cb works need a middle stage 2011-01-22 13:48:25 -08:00
danielvincent
338e17ff87 cache login form & footer 2011-01-22 13:30:31 -08:00
MrZYX
852be182f5 made 'start sharing' translatable 2011-01-22 16:29:39 +01:00
Dan Hansen
67100aa7bb fix the build 2011-01-22 00:39:53 -06:00
Dan Hansen
c23811e1ab flash the user whether or not that person was moved to a different aspect 2011-01-21 20:02:42 -06:00
Raphael
eea5b0a748 fix hcard link in webfinger profile 2011-01-21 15:03:11 -08:00
zhitomirskiyi
01a4327c2b use google API instead of highcharts due to licensing 2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
maxwell
495154b2b5 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-21 11:15:40 -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
maxwell
4bff854a04 pass params to super 2011-01-21 11:11:00 -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
danielvincent
abfd9c355c make login seem faster. 2011-01-20 22:55:44 -08:00
maxwell
16b892ccec we really need to make our db case insensitive 2011-01-20 18:39:03 -08:00
Raphael
a688e47934 Make sure invites is not set to nil 2011-01-20 15:59:23 -08:00
Raphael
88fa595d59 Move seed_aspects to after accept_invitation 2011-01-20 15:03:33 -08:00
maxwell
b21b0adca7 remove single user redirect 2011-01-20 15:02:46 -08:00
maxwell
c6a3cff644 make the recover password error message slightly more informitive for people who signed up for invites but have not yet received them yet 2011-01-20 12:48:28 -08:00
Raphael
7217bba7e7 Allow no 2 character queries 2011-01-20 12:18:42 -08:00
Raphael
661d5e41a1 Join on contacts correctly in search 2011-01-20 12:05:25 -08:00
Raphael
4deec0cb38 Fix call to search in controller 2011-01-20 10:28:27 -08:00
Raphael
971c88da5e Sort search results by friend status 2011-01-20 10:20:17 -08:00
danielvincent
3d89e1f203 login page cleanup. totally simple. changed link color to something less jarring 2011-01-19 23:06:54 -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
maxwell
cd92b1dccb put timeago in document ready, not outside 2011-01-19 16:18:10 -08:00
Raphael
ad48f4796c Remove warning in aspectscontroller 2011-01-19 16:08:14 -08:00
Raphael
3c6dd3d721 Remove XSS in profile 2011-01-19 16:08:14 -08:00
danielvincent
4b74796c07 16 pictures on aspect listings 2011-01-19 16:06:35 -08:00
maxwell
120c07ddf5 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-19 16:04:54 -08:00
maxwell
35432880b2 adding timeago when the inf. scroll is involked 2011-01-19 16:04:46 -08:00
Raphael
f35f0212dd Show the right contacts 2011-01-19 15:54:49 -08:00
zhitomirskiyi
122f182a4c limit to 16 in the view 2011-01-19 15:52:52 -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
MrZYX
7f8ee17b40 pass @contacts to partial in aspects/index.js.erb 2011-01-19 21:09:06 +01:00
maxwell
85b824babc Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 22:12:11 -08:00
maxwell
7a02a31440 fix invitations#new, and a post spec which was mongo specific 2011-01-18 22:11:58 -08:00
Raphael
3935d978ac Take some queries out of views 2011-01-18 19:11:01 -08:00
zhitomirskiyi
21bccedf9b notification eagerly load the target 2011-01-18 17:22:48 -08:00
zhitomirskiyi
5ac194911f Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 17:07:03 -08:00
zhitomirskiyi
e7a4c47f0a include target for notification 2011-01-18 17:06:54 -08:00
Raphael
38dd58315d typo 2011-01-18 17:04:22 -08:00
zhitomirskiyi
38a3193a61 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 16:58:04 -08:00
zhitomirskiyi
63590e2e7e restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives" 2011-01-18 16:57:34 -08:00
danielvincent
511a48adde fixed publicscontroller specs 2011-01-18 16:52:11 -08:00
Raphael
3b394c1c89 One more defualt scope out 2011-01-18 16:48:02 -08:00
Raphael
e6e2ba9cfb Take out default scopes 2011-01-18 16:46:52 -08:00
zhitomirskiyi
ef1b7644f3 got rid of more hash from 2011-01-18 16:38:31 -08:00
zhitomirskiyi
3e6a271ad8 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-18 16:22:03 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
85bae12a00 Query on guid, not id 2011-01-18 16:07:58 -08:00
Raphael
9e5cf1e1a4 Fix person receive urls 2011-01-18 15:21:04 -08:00
zhitomirskiyi
41c83a7e19 mousedown so that new tab opening would make notification go down 2011-01-18 10:51:05 -08:00
zhitomirskiyi
0cb9f1c0d7 focus publisher on reshare 2011-01-18 10:51:05 -08:00
Raphael
28b7302c9e Specify type again 2011-01-17 19:42:49 -08:00
Raphael
6474ca9540 display photos correctly 2011-01-17 19:34:33 -08:00
zhitomirskiyi
8d86585928 profile spec passes 2011-01-17 18:22:54 -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
3f21a05e3e remove s3 setting 2011-01-17 16:46:39 -08:00
zhitomirskiyi
995d285fdd ssl s3, attrs 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0c8aca3ef8 rebasing 2011-01-17 15:56:06 -08:00
zhitomirskiyi
7ef89acf81 added the redirect to the nginx conf 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
zhitomirskiyi
fc92779ddc redirect after contact destroy 2011-01-17 14:46:38 -08:00
zhitomirskiyi
be92f3866c IZ MS fix 500 on commnet notificaions 2011-01-17 14:46:38 -08:00
Raphael
4ba58d8132 Simplify hashes_for_contacts 2011-01-17 14:23:50 -08:00
Raphael
6410355d71 Fix aspect edit page 2011-01-17 14:23:50 -08:00
zhitomirskiyi
79b613b0e5 MS IZ notifications now contain helpful test 2011-01-17 14:07:21 -08:00
Maxwell Salzberg
254c411bd9 prevent searching with spaces 2011-01-17 13:48:52 -08:00
Raphael
36781481bb Pulling in changes from master 2011-01-17 11:41:15 -08:00
danielvincent
e2fdad02f1 css fixes, incl. timeago style fix on stream_element 2011-01-14 22:12:31 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
zhitomirskiyi
aba03ed5b0 added the locales for timeago 2011-01-14 11:46:38 -08:00
Paweł Wilk
ee59f36b77 Added grammatical inflection support using I18n Inflector with Rails plug-in 2011-01-14 18:33:15 +01:00
maxwell
641b805da2 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-13 17:31:44 -08:00
maxwell
f509367a40 fix the 404 page to show the dun goofed guy 2011-01-13 17:31:18 -08:00
zhitomirskiyi
2c58630995 rails autoescapes in the link_to 2011-01-13 17:16:53 -08:00
maxwell
600e67d5d1 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-13 16:31:35 -08:00
maxwell
f97a9fa017 added timeago jquery plugin. we now need to figure out a js translation scheme 2011-01-13 16:29:13 -08:00
maxwell
fc09b0fb40 add a max char count to commnets (500) 2011-01-13 14:49:17 -08:00
maxwell
b116362c5d notifications for local comments 2011-01-13 13:02:02 -08:00
zhitomirskiyi
1748827f0a photos show spec passes 2011-01-13 10:19:17 -08:00
Dan Hansen
43658b4923 only show prev/next if there is more than one photo, fixes #813 2011-01-13 01:03:37 -06:00
Dan Hansen
ce4fe1938c remove references to fancybox, we use facebox 2011-01-13 00:24:10 -06:00
zhitomirskiyi
9b6faa5644 added a notificaions read button 2011-01-12 16:24:14 -08:00
maxwell
c832201bd9 remove trailing bracket from aspects#edit pane 2011-01-12 11:00:22 -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
MrZYX
137cde185f unscope contacts 2011-01-12 16:03:19 +01:00
MrZYX
1319099cf3 made some strings translatable 2011-01-12 15:58:10 +01:00
maxwell
73821859e6 require pubsubhubub in the job' 2011-01-11 16:24:59 -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
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
daab8e80ce basic receive cleanup 2011-01-11 14:23:18 -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
danielvincent
685b809248 resque requires a job to be assigned to a queue. enable resque logging on posting to a hub 2011-01-08 18:13:54 -08:00
danielvincent
f2f3059d72 fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl 2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab fixed all rspec/cucumber 2011-01-08 16:53:16 -08:00
danielvincent
6ca0b0014b fade in aspect badges on stream 2011-01-08 15:24:03 -08:00
danielvincent
55fa1646c7 swapped out delete text for 'x' on stream_elements. controls fade in on hover 2011-01-08 15:06:25 -08:00
danielvincent
9cf1f5a023 fixed reshare with filters 2011-01-08 13:11:55 -08:00
danielvincent
cadba3f2b7 fixed specs with a reload. added header gradient for firefox 2011-01-08 13:11:55 -08:00
danielvincent
c5e0c616b5 share with pane styles fixed 2011-01-08 13:11:54 -08:00
danielvincent
98ceb1ca6b fixups on people/show. make photos scroll over header on show pages. 2011-01-08 13:11:54 -08:00
danielvincent
c74dc120df fixed all cucumber tests 2011-01-08 13:11:54 -08:00
danielvincent
98bcad5c59 visual fixes on people/show. contact count on aspect filters. contact list searches again. 2011-01-08 13:11:54 -08:00
danielvincent
2e472ded94 new notification/request text on aspects/index 2011-01-08 13:11:54 -08:00
danielvincent
71ca93720b contact lists functional on aspects/index. edit panes facebox in from header 2011-01-08 13:11:53 -08:00
danielvincent
c9307305b3 collapsed aspect_listing and contact_listing on aspects/index 2011-01-08 13:11:53 -08:00
danielvincent
3ff4b67ff0 touched up stream_element and comment partial 2011-01-08 13:11:53 -08:00
danielvincent
f44b3cbe3d contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge. 2011-01-08 13:11:53 -08:00
danielvincent
422f17a648 switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials. 2011-01-08 13:11:53 -08:00
danielvincent
e1b6f4f074 aspect filters shown selected on photo and statusmessage show pages 2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder 2011-01-08 13:11:53 -08:00
danielvincent
5358ac32a1 photos can be posted to multiple aspects. header nav works from pages other than aspect/index. 2011-01-08 13:11:52 -08:00
danielvincent
0a07dd16b5 posts are properly socketed on filtered streams 2011-01-08 13:11:52 -08:00
danielvincent
b029475421 aspects now have edit pages accessible through the top nav 2011-01-08 13:11:52 -08:00
danielvincent
44d3c4bacd fixed inf scroll on filters issue. one spec failing in AspectsController. 2011-01-08 13:11:52 -08:00
danielvincent
d0b25814b1 publisher retains text when filtering stream 2011-01-08 13:11:52 -08:00
danielvincent
a773450650 aspect show fix 2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2 publisher works through ajax filters 2011-01-08 13:11:52 -08:00
danielvincent
f02c13ee73 filters are now working in ajax. inf. scroll and publisher pending ajax. 2011-01-08 13:11:52 -08:00
danielvincent
c64865d32e header touchup 2011-01-08 13:11:51 -08:00
danielvincent
f1564d068a pass @all_aspects as opposed to @aspects in stream 2011-01-08 13:11:51 -08:00
danielvincent
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -08:00
danielvincent
79b7f62520 filter logic in aspects_controller#index 2011-01-08 13:11:51 -08:00
maxwell
a82e59077b pass opts to the postman when creating a post 2011-01-06 17:49:24 -08:00
maxwell
49225568cb moar tests for pubsubjob 2011-01-06 17:34:40 -08:00
zhitomirskiyi
86154ba348 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-06 17:26:42 -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
Raphael
89a41826c1 Started raw post import 2011-01-06 17:01:17 -08:00
zhitomirskiyi
249b62445f added the files 2011-01-06 16:51:34 -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
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
danielvincent
8074e481a3 stream fix on aspects/show 2011-01-06 13:51:59 -08:00
maxwell
5818227904 adding job for posting to services 2011-01-06 13:13:09 -08:00
maxwell
27d8cc8003 added sync pubsubhubbub publisher client. we now should not longer require eventmachine, (in the server process, the websocket still requires it). this should also be in a job 2011-01-05 19:02:43 -08:00
maxwell
8b3a193156 added copyright notice to jobs 2011-01-05 18:52:43 -08:00
maxwell
beaeac2d42 comment out debug 2011-01-05 17:52:21 -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
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
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
67be774b7a setting the comment 2011-01-05 15:35:40 -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
zhitomirskiyi
2f06ec1dca don't display notificatification badge div if there is no notification count (permalink works) 2011-01-05 10:07:22 -08:00
zhitomirskiyi
c7ecab4933 the new request email links back to the pod 2011-01-05 09:35:47 -08:00
Sarah Mei
7f86a9e1ba ImportToMysql now loads users.csv. Spec currently failing on datetime conversion. 2011-01-04 22:43:32 -08:00
Raphael
d64fd2d222 Don't redirect to root_url on aspect destroy 2011-01-04 18:00:49 -08:00
Raphael
83d6b95c46 Merge remote branch 'nickvdb/763-notifications-paginate' 2011-01-04 16:18:46 -08:00
Raphael
0e55b0bf44 Merge remote branch 'tomk/721-wrong-person-link-when-creating-comment' 2011-01-04 16:14:39 -08:00
Raphael
8d5dc5d27b Merge remote branch 'tomk/ui-cosmetics' 2011-01-04 16:02:11 -08:00
Raphael
6102217a88 Don't display the invitations link unless the user has invitations, thanks Pasta 2011-01-04 15:59:53 -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
zhitomirskiyi
20efe06ad5 capturing mousedown instead of click to handle open in other tab 2011-01-01 21:14:36 -08:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Alec Leamas
3f2d48b26e handling http/https references 
See discussion in c92f80b2eb
 2010-12-30 23:22:43 +01:00
Thomas R. Koll
5c7d39505a Fixes #721 when creating a comment (ajax) the link to your own profile is fucked up and instead it linked to the user id 2010-12-30 00:48:43 +01:00
Thomas R. Koll
869cbdf9e9 * Localizeable "Rename aspect" button 
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
 2010-12-29 17:00:08 +01:00
Nick van der Burgt
e0f583d7d3 Fixed mistake of running will_paginate on @people instead of @notifications 2010-12-29 10:51:42 +01:00
Alec Leamas
c92f80b2eb Cleaning up some paths. 
Handling root_url if not ending w /, using http: for all cross-site
references.
 2010-12-29 10:10:26 +01:00
Sarah Mei
e2804dbbcb Replace old references to request.from with request.sender 2010-12-28 22:56:53 -08:00
zhitomirskiyi
bd05e97c29 requiring the websocket lib file 2010-12-28 19:53:45 -08:00
zhitomirskiyi
ddf95e2750 couple more passing cucumber stories, changed the queries on request and notification 2010-12-28 19:14:47 -08:00
Nick van der Burgt
b33056f72b Fixed a small mistake 2010-12-28 22:03:13 +01:00
Nick van der Burgt
c7f3a9abfd Pagination for the notifications 2010-12-28 21:54:41 +01:00
Raphael
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
zhitomirskiyi
be9101b51f Merge branch 'mysql' of github.com:diaspora/diaspora into mysql 2010-12-27 22:23:58 -08:00
zhitomirskiyi
11153cf2ca a couple more passing specs 2010-12-27 22:23:41 -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
Nick van der Burgt
e6127c6aa9 Included ie.js into the layout 2010-12-27 17:33:50 +01: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
MrZYX
74b5281a75 Merge branch '761-aspect-name-double-escaped-in-page-title' of https://github.com/Dorian/diaspora into dorian 2010-12-26 21:44:04 +01:00
MrZYX
f92eb1735f Merge branch '756-status-not-formatted-in-photo-page' of https://github.com/Dorian/diaspora into dorian 2010-12-26 21:43:23 +01:00
Dorian
346217ea46 Bug #761 : Aspect name double escaped in page title 2010-12-26 03:59:15 +01:00
Dorian
89ce11456a Markdownify message in photo page 2010-12-26 03:06:19 +01:00
Dorian
d6e72cd2bb Escape person.name in comment 2010-12-26 02:16:53 +01:00
danielvincent
7827968b52 removing <p> from statusmessage partial 2010-12-25 19:18:42 -05:00
danielvincent
0fb102a2ec right/left arrow keys functional on photo#show 2010-12-25 19:14:24 -05:00
danielvincent
30dd11b9fa mark notifications as read and update badge 2010-12-25 16:27:09 -05: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
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
Michael Sofaer and Raphael Sofaer
30d60021f4 11 Controller specs remain in mysql. ALMOST DONE 2010-12-24 14:12:55 -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
293445225a Don't let user put HTML in alt and title image attribute of avatar 2010-12-24 15:33:04 +01: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
zhitomirskiyi
7796776135 vimeo works, does not yet fetch the title 2010-12-23 15:36:29 -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
zhitomirskiyi
1bc168d075 focusing a publisher on reshare 2010-12-22 09:51:50 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
danielvincent
9b6d40544c fixed _comments bug on show pages 2010-12-21 17:36:14 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
danielvincent
dae5906b6a ownership render bug fixed on photoshow 2010-12-21 16:56:32 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
maxwell
ec826e8c05 Revert "fix for js selector" 
This reverts commit 0da4466da2.
 2010-12-21 12:56:38 -08:00
maxwell
c2c6c00db8 a bad fix for a 500 on notification show when the post is deleted 2010-12-21 12:55:07 -08:00
maxwell
0da4466da2 fix for js selector 2010-12-21 12:55:07 -08:00
danielvincent
a0e85dfea2 added missing translations to photo#show 2010-12-21 12:49:40 -08:00
danielvincent
2150cb505e fixed person_photo_path 2010-12-21 12:44:33 -08:00
danielvincent
a6c5f420fa giving more pixels to photos on their show pages 2010-12-21 12:39:37 -08:00
MrZYX
e10af7fc8a made "Notifications" translatable 2010-12-21 19:18:29 +01:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
maxwell
6d4696faf0 MS DG notifications are now pretty decent 2010-12-20 18:05:31 -08:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01: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
danielvincent
6c12a4c562 photo show page shows more photo. 2010-12-19 21:53:57 -08:00
zhitomirskiyi
e3f7bd319b 25 more passing tests 2010-12-19 21:41:46 -08:00
maxwell
c22894ff2a limit number of notifications in notifications#index 2010-12-19 19:05:45 -08:00
danielvincent
6d63a5d3c5 fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller. 2010-12-19 17:50:07 -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
b52718e913 small translation fix 2010-12-19 14:41:47 +01:00
MrZYX
1b6f341348 made linking more robust, this fixes #732 2010-12-19 13:49:46 +01:00
danielvincent
bb0375d2f8 uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages. 2010-12-18 22:40:42 -08:00
zhitomirskiyi
4425c3df83 reshare now works as expected opens the publisher and has the share button 2010-12-18 22:30:12 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
danielvincent
01e557ba7a put ajax:success for publisher where it belongs 2010-12-18 20:31:02 -08:00
danielvincent
d5916c9287 removed comment button from sight 2010-12-18 20:26:27 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
danielvincent
a42a773d3d dim service icons when not public. remove 'make public' label, now checkbox title. 2010-12-18 20:00:13 -08:00
danielvincent
ee9e187e5c fixed build, add photos has a solid border 2010-12-18 19:45:50 -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
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
Raphael
36b622c998 Fix build 2010-12-18 15:22:56 -08:00
MrZYX
c3a79f7298 some fixes to translations 2010-12-18 15:25:21 +01:00
maxwell
f1ae312e75 changes for person show page 2010-12-18 02:10:00 -08:00
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
Raphael
a64fa0839f Hide notifications link until we take out queries from it 2010-12-17 20:19:02 -08:00
maxwell
427cf18324 fix birthday spec 2010-12-17 19:41:42 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
maxwell
b3c63a3cc0 you can now unset the year of your birthday" 2010-12-17 18:05:13 -08:00
maxwell
96b907122b only show profile fields if they are filled out. 2010-12-17 17:40:08 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
maxwell
c749d81fe9 putting a link to notifications, make them unread in the controller when you view the index 2010-12-17 17:06:48 -08:00
maxwell
807187ded9 /notifications is now pretty cool 2010-12-17 17:06:48 -08:00
Raphael
b8648f631a Use ree in the chef scripts, might revert later 2010-12-17 12:49:44 -08:00
maxwell
3c3e03993a make the two links on comment notifications clearer 2010-12-17 11:48:08 -08:00
maxwell
5763b441be fixing order of Notification.for 2010-12-17 11:37:33 -08:00
maxwell
39deac62fb in words is not a helper 2010-12-17 11:05:58 -08:00
maxwell
0bdb6aaab5 more notification stuff 2010-12-16 19:00:32 -08:00
maxwell
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
danielvincent
a41f45b846 contact count on home page 2010-12-16 18:21:06 -08:00
danielvincent
bc9352eabd fix id/string error in receive local job 2010-12-16 18:21:06 -08:00
maxwell
b8a0abd122 updating notification views 2010-12-16 18:07:43 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
danielvincent
2758ea1625 fixed issue with diaspora handles not displaying in streams 2010-12-16 17:24:25 -08:00
Raphael
4da97be84b Add benchmarks and logging to resque jobs 2010-12-16 16:48:36 -08:00
danielvincent
f3ced6d96c randomize collections of similar contacts on people#show 2010-12-16 16:37:13 -08:00
danielvincent
b4b6189321 time out a user session via devise after 10 minutes of inactivity 2010-12-16 15:50:00 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -08:00
Raphael
d2199fa1eb Profile of requestor should be visible; no outgoing request instance variable needed 2010-12-16 14:09:55 -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
maxwell
f00e0ada78 do a bad thing in the helper to get comment links 2010-12-16 11:23:57 -08:00
maxwell
20ca2e2e93 make Notification.for return a query, not evaluate.. also limit notifications pulled back to 25 2010-12-16 11:16:09 -08:00
maxwell
1274dbbf5d Merge branch 'master' of github.com:diaspora/diaspora 2010-12-16 10:16:39 -08:00
maxwell
1451db6cd8 fixed rspec build 2010-12-16 10:15:16 -08:00
danielvincent
43810907f5 show all contacts in edit aspect pane 2010-12-16 10:00:18 -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
cb5982704e dont url escape, xml escape 2010-12-15 17:43:46 -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
zhitomirskiyi
d34964651c if aspect is not dropped it redirects back for consistency 2010-12-15 14:44:10 -08:00
zhitomirskiyi
4256ea34b6 rename aspect on the aspect show page 2010-12-15 14:15:07 -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
d5edc9b477 CGI::escaping for proper, good juju activity streams 2010-12-15 12:27:52 -08:00
zhitomirskiyi
2abcd8d147 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 12:11:58 -08:00
maxwell
a7d36615e6 adding basic notification class 2010-12-15 12:11:37 -08:00
Maxwell Salzberg
555542da31 remove extra slash 2010-12-15 12:01:20 -08:00
zhitomirskiyi
1212b34706 fadeOut on delete 2010-12-15 11:58:38 -08:00
Maxwell Salzberg
f8c2f15bb1 use the full pod_url in the template 2010-12-15 11:48:13 -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
2cf332e120 Remove sent boolean from requests, finish migration 2010-12-14 19:27:18 -08:00
danielvincent
dea8d248e2 user only pushes to non-pending contacts 2010-12-14 19:11:35 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -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
aef5abf631 Correct some queries, look at incoming requests in search, explicit pending false in activate_contact 2010-12-14 17:33:07 -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
maxwell
c38fbd27e4 prevent gifs thru getting through javascript uploader 2010-12-14 13:31:06 -08:00
Raphael
d3850292d5 Don't query current_user.contacts on every action 2010-12-14 12:38:48 -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
danielvincent
fd9d1332fc break service http into its own queue 2010-12-14 11:43:26 -08:00
maxwell
0bd13ec106 use blank instead of empty for the person#name helper 2010-12-14 11:30:06 -08:00
maxwell
2bc849fa90 only show permalink if the post is infact public. also, make destroy delete 2010-12-13 18:45:54 -08:00
maxwell
e3e3fd13e5 no trailing slash on pod url on login page. it just looks weird 2010-12-13 18:21:50 -08:00
zhitomirskiyi
7e3b2c6afd removed the query from the contact list partial 2010-12-13 17:53:27 -08:00
maxwell
8ba619029e adding about text on invite accept page 2010-12-13 17:24:33 -08:00
danielvincent
d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" 
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
 2010-12-13 17:16:56 -08:00
maxwell
c2ad170506 re add 'remember me' button 2010-12-13 17:05:35 -08:00
Raphael
d44df7e977 put remove contact link under aspect membership 2010-12-13 16:40:05 -08:00
Raphael
02d76441e4 Merge branch 'aspect-list-on-profile' 2010-12-13 16:12:29 -08:00
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00
maxwell
42c22cedf9 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-13 14:38:47 -08:00
maxwell
d9f25473d2 fix a bug with the notifier and attachment 2010-12-13 14:28:21 -08:00
maxwell
8eb9ab1781 making image names more generic 2010-12-13 14:02:11 -08:00
MrZYX
2ac54eeffe Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email 2010-12-13 22:48:58 +01:00
MrZYX
3a13657087 fix for #557 2010-12-13 22:23:19 +01:00
mblog
d0355fdd43 Feature #348: Change Email 2010-12-13 22:14:52 +01:00
maxwell
4fe42044ac removed homepage detail into a partial, which you should redefine 2010-12-13 12:52:08 -08:00
Raphael
f861955d80 profile.image_url is set to :thumb_large in update_profile 2010-12-13 12:11:54 -08:00
danielvincent
68a51448e5 comment link shows up again on contact pages 2010-12-13 10:19:04 -08:00
MrZYX
1284fcc92d fix for #699 2010-12-13 15:04:11 +01:00
MrZYX
6cacfde6a6 two fixes to translations 2010-12-12 15:55:51 +01:00
danielvincent
2f2f8fef8a delete/reshare only if current_user on stream_element 2010-12-12 01:41:54 -08:00
danielvincent
f7a7dff53b allow for newlines in profile bio 2010-12-12 00:50:30 -08:00
danielvincent
d19353ed8f added newline support to markdownify 2010-12-12 00:44:54 -08:00
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