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

3624 commits

Author SHA1 Message Date
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
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
Raphael
6da410079b Commented-on posts bubble up to the top 2010-12-01 15:38:56 -08:00
Raphael
8d853a88a3 Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
Raphael
f0df1ec8df Remove dev utilities controller 2010-12-01 15:38:56 -08:00
Raphael
c07b9b1874 Fix rest of specs 2010-12-01 15:38:56 -08:00
Raphael
199eb8945d clean up posting spec, move socket_to_uid into add_to_streams 2010-12-01 15:38:56 -08:00
Raphael
836b5685f7 Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post 2010-12-01 15:38:56 -08:00
Raphael
e63a29be64 Change v_aspect_ids to prune_aspect_ids 2010-12-01 15:38:55 -08:00
root
5cd0a60073 Moved to it's own file, added specs 2010-12-02 02:22:05 +03:00
root
9e7d7f420f hate text editing in nano 2010-12-02 00:57:56 +03:00
root
b1c1175c67 javascript validations for username 2010-12-02 00:54:35 +03:00
danielvincent
d392239355 removed brandongrotesque from repo, logos are now assets. 2010-12-01 11:45:54 -08:00
maxwell
7fc9d239b9 you can no longer send a request to yourself at the Request model level 2010-12-01 11:37:54 -08:00
Raphael
ef083c6770 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-01 11:21:36 -08:00
Raphael
5791ffba79 Add administrative mail method 2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations 2010-12-01 19:13:39 +01:00
Paweł Wilk
76edca1366 View fixed after rebase according to latest changes. 2010-12-01 18:23:21 +01:00
Paweł Wilk
017251fef9 Added genderized variants of t() to views, controllers and helpers. 2010-12-01 18:19:48 +01:00
Paweł Wilk
65c796572d Added translation scaffold for inflection of nouns by grammatical gender in some languages. 2010-12-01 17:29:04 +01:00
Paweł Wilk
279b08ae4a Added inflection of nouns by the grammatical gender for some languages. 
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
 2010-12-01 17:29:04 +01:00
Josh Lubaway
ecd1d2ecd6 Bug #624 Can't unset birthday 
This change allows users to "unset" their birthday.

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

Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
 2010-11-30 21:23:47 -08:00
danielvincent
601284a171 make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo. 2010-11-30 15:58:26 -08:00
Raphael
4f3d031e89 Always set translations 2010-11-30 15:58:25 -08:00
Raphael
f2cb43bb4e Take queries out of aspect contacts pane on home page 2010-11-30 15:58:07 -08:00
Raphael
3dc3efc103 Move aspect contacts pane js to public 2010-11-30 15:57:32 -08:00
Raphael
d733d2c3bf Take out print statements 2010-11-30 15:51:37 -08:00
Raphael
bfcae7fd80 Always set translations 2010-11-30 15:44:27 -08:00
Raphael
366734ca5e Take queries out of aspect contacts pane on home page 2010-11-30 15:35:32 -08:00
Raphael
57485e7093 Move aspect contacts pane js to public 2010-11-30 13:55:37 -08:00
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
Raphael
a683512e6e Take queries out of reshare 2010-11-30 13:31:48 -08:00
danielvincent
fa66162de5 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/helpers/application_helper.rb
	app/views/comments/_comment.html.haml
	app/views/people/_person.html.haml
	app/views/shared/_stream_element.html.haml
 2010-11-30 13:19:17 -08:00
Raphael
f44b02e22c Clean up people/person 2010-11-30 13:07:02 -08:00
Raphael
93bbfd19d2 Move back to image link helper, but static 2010-11-30 13:07:02 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
Maxwell Salzberg
7bce44ef28 remove brandon from author_info 2010-11-30 12:30:36 -08:00
Raphael
b5ed2ec5b0 Actually use the photos set in the controller 2010-11-30 12:25:56 -08:00
Raphael
49e8347aa3 Use static helper for aspect links 2010-11-30 12:23:43 -08:00
Raphael
b84d2bcc56 Don't use owns? in streamelement 2010-11-30 11:58:41 -08:00
Raphael
b0522535ac Take queries out of reshare 2010-11-30 11:43:27 -08:00
Raphael
fce428826c Try to take photos query out of views 2010-11-29 23:41:03 -08:00
maxwell
2d3f2df1fd dont use object_path 2010-11-29 19:57:20 -08:00
Raphael
03e3c3a202 Render comment partial with collection option 2010-11-29 17:50:30 -08:00
maxwell
17a890676e added a link in footer to this instances code. obey the agpl yo. 2010-11-29 16:46:43 -08:00
maxwell
96776f93f9 we need this for socketing... sorry 2010-11-29 16:19:36 -08:00
maxwell
e7fb70cdd1 we need this for socketing... sorry 2010-11-29 16:00:25 -08:00
maxwell
9707c5a124 remove single comment partial for speed in rendering 2010-11-29 15:47:24 -08:00
Hexagon
b0ff8f0f60 Mini refactor, removed terse_url function 2010-11-29 23:23:51 +01:00
MrZYX
8ffa5df927 Merge branch 'master' of https://github.com/masterdot/diaspora into masterdot-master 2010-11-29 22:01:13 +01:00
Raphael
760fed7016 No need for defined? 2010-11-29 12:10:41 -08:00
maxwell
e0efaa6317 made the checking for already connected more explicit. also, the check itself had a bug when we were calling self.to_id on a request, rather than self.to.id 2010-11-29 10:57:54 -08:00
masterdot
09d82fd08d fix for intendation 2010-11-29 12:46:13 +01:00
masterdot
35feccbb2c added support for tracking via piwik. 
if piwik_id is not set no javascript will be included. it may be both enabled, aganalytics and piwik.
 2010-11-29 10:26:47 +01:00
danielvincent
2c22941e2f fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show. 2010-11-28 20:16:57 -05:00
Raphael
ec6f42eaf0 Take JS out of landing page 2010-11-28 16:47:41 -08:00
danielvincent
c35be73978 added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive) 2010-11-28 18:51:27 -05:00
danielvincent
05174436c0 comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner). 2010-11-28 18:51:27 -05:00
Raphael
812aaae63f Simplify stream_element partial 2010-11-28 11:31:31 -05:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
danielvincent
017075e480 actually include the javascript in the view... 2010-11-28 00:36:46 -05:00
danielvincent
3ada121d0b contact-js as its own file 2010-11-28 00:29:22 -05:00
Raphael
5041a84882 Fix immediate response on status_message create 2010-11-28 00:23:53 -05:00
Raphael
5b29cff56a Take out comment rendering logging 2010-11-27 23:46:13 -05:00
Raphael
6d6b07fb92 Use form_tag, not form_for, in _new_comment 2010-11-27 23:24:29 -05:00
danielvincent
f59c6e2427 refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now. 2010-11-27 23:06:34 -05:00
Raphael
68c0682ed0 Take a query out 2010-11-27 22:21:15 -05:00
Raphael
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
Raphael
7b3aac923a Take image_tag out 2010-11-27 18:05:47 -05:00
Raphael
e8310f2a19 Take benchmarks out of real_name, memoize it 2010-11-27 18:04:31 -05:00
Raphael
cedf4302a7 real_name takes time 2010-11-27 17:43:07 -05:00
Raphael
8e2c74bdd2 Take out link_to for real 2010-11-27 17:28:18 -05:00
danielvincent
d65ba2f291 removing contact pictures from contact list re aspects#show 2010-11-27 17:25:40 -05:00
Raphael
c46b6d80aa Correct math, take out link_tos 2010-11-27 17:07:35 -05:00
Raphael
49f4ec1432 comment ids in the logs 2010-11-27 16:21:40 -05:00
maxwell
62b4e85b0b DG MS move dispatch post to EM::next_tick in controller so the post response returns to the poster much faster. also fixed a bug in the logs refrencing an object that did not exsist 2010-11-27 16:20:46 -05:00
Raphael
be463f8f7f Logging for comment partial rendering 2010-11-27 16:17:12 -05:00
Raphael
7030ed0fed Putting youtube titles back into status messages 2010-11-27 11:43:24 -05:00
Hexagon
702abddce3 1900 was too far back for rails, 1904 were accepted. 2010-11-27 14:13:29 +01:00
Hexagon
033eea9f50 Fixed #550, diaspora now support seniors up to 110 2010-11-27 14:02:42 +01:00
Hexagon
894f112b75 Removing duplicate id in layout/application 2010-11-27 10:37:04 +01:00
danielvincent
06ff5923c5 fix photos#show and status_messages#show from previous commit 2010-11-27 01:35:57 -05:00
danielvincent
a932547d12 minimizing some queries in the views. only select aspect names and ids in application controller. 2010-11-27 01:05:55 -05:00
Raphael
d5d4a08f03 Start moving youtube title getting into the post/comment flow 2010-11-27 01:00:47 -05:00
maxwell
119680d209 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 16:10:56 -08:00
maxwell
80f8e4d29a removing invite partial, with a switch, and updated app_config.yml.example 2010-11-26 16:10:42 -08:00
maxwell
a507927bb3 Revert "invitations are not sent from magent queue (a problem in itself)" 
This reverts commit 9e5eb86866.
 2010-11-26 16:02:57 -08:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
maxwell
9e5eb86866 invitations are not sent from magent queue (a problem in itself) 
Revert "Revert "removing the form for user creation thru signup".  Shutting down magent is a less annoying solution."

This reverts commit b9cafc0579.
 2010-11-26 15:52:34 -08:00
Michael Sofaer and Raphael Sofaer
b9cafc0579 Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution. 
This reverts commit 4c96e12a31.
 2010-11-26 17:16:11 -05:00
Raphael
77d46b2d66 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 17:09:38 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
danielvincent
bf66be9ea4 fixed template error on statusmessage controller 2010-11-26 13:29:49 -05:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
maxwell
e83271ef22 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 09:57:18 -08:00
maxwell
4c96e12a31 removing the form for user creation thru signup 2010-11-26 09:56:30 -08:00
MrZYX
6e5b097f81 try at fixing a translation 2010-11-26 18:33:52 +01:00
Michael Sofaer and Raphael Sofaer
b54164cef8 Don't do expensive things on invalid users 2010-11-26 11:55:54 -05:00
Paweł Wilk
7e2e95df76 Added i18n for 'make public' message in views/shared/_publisher.haml 2010-11-26 16:09:19 +01:00
MrZYX
e916e33482 pulled and merged request 509, thanks siefca 2010-11-26 15:48:08 +01:00
MrZYX
8cc57aed82 Merge branch '597-add-i18n-to-sign-up-button' of https://github.com/siefca/diaspora into siefca-597-add-i18n-to-sign-up-button 2010-11-26 15:34:46 +01:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
Dan Hansen & Sarah Mei
5075a7384b allow hyphens in YouTube video IDs 2010-11-25 21:05:54 -08:00
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -05:00
danielvincent
e56df5c159 fixed issue rendering partial for a comment in comments#create 2010-11-25 23:34:59 -05:00
Michael Sofaer and Raphael Sofaer
502b4dde30 Merge branch 'invitation_flow' 2010-11-25 23:18:01 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd Make the getting_started aspects page more like the manage page 2010-11-25 23:17:27 -05:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Raphael
6e14018abb Fixing http referer 2010-11-25 19:50:14 -05:00
Paweł Wilk
c7059a58da Added i18n for "Sign up for invite" button. 2010-11-26 01:38:08 +01:00
zhitomirskiyi
037f822287 removed the puts 2010-11-25 19:37:05 -05:00
zhitomirskiyi
421078bd0b if you create an aspect from the aspect manage page it redirects back there 2010-11-25 19:37:05 -05:00
Dan Hansen & Sarah Mei
e5673b304d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:29:00 -08:00
zhitomirskiyi
a2d3a940a6 removed the puts 2010-11-25 16:20:09 -08:00
zhitomirskiyi
de75617070 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:19:30 -08:00
zhitomirskiyi
16d023e800 if you create an aspect from the aspect manage page it redirects back there 2010-11-25 16:18:39 -08:00
Dan Hansen & Sarah Mei
792690bb80 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:07:53 -08:00
Dan Hansen & Sarah Mei
e78a86897a Video links now use data attributes and render in an iframe 2010-11-25 16:07:39 -08:00
Paweł Wilk
8138473b91 Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly. 2010-11-26 00:47:02 +01:00
Paweł Wilk
e1a965c2fb Added multiple plurals for translations of 'contacts' and 'requests'. 
- Added multiple plurals handling for .contacts token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .new_requests token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .contacts token in views/aspects/show.html.haml.
 2010-11-26 00:47:02 +01:00
Raphael
a061999e30 Don't inspect people in logging statements 2010-11-25 18:03:34 -05:00
Sarah Mei
ef2fa21d06 person_image_link and object_path return empty strings if parameter is nil. 2010-11-25 12:26:46 -08:00
Sarah Mei
050918a310 Added link to manage aspects page from sidebar. 
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
 2010-11-25 10:29:35 -08:00
Sarah Mei
287b79ab17 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-24 22:09:25 -08:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
Raphael
12c049fec2 Add logging to inviting 2010-11-25 01:06:25 -05:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
Raphael
eeac6901b9 Revert "Change invite button text" 
This reverts commit d443b15c97.
 2010-11-24 21:01:48 -05:00
Raphael
38a2ea5199 Remove auto-friending in db:reset for dev servers 2010-11-24 17:55:51 -05:00
Raphael
93ebbbb65f put some logging in the mailer 2010-11-24 17:13:28 -05:00
maxwell
062593ee0f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-24 14:06:17 -08:00
maxwell
bd1cbdb297 adding drag to add people above friend accept box 2010-11-24 14:03:11 -08:00
Raphael
d443b15c97 Change invite button text 2010-11-24 16:48:24 -05:00
Sarah Mei
fa602cabf2 fix messaging around invitation success/failure 2010-11-24 09:34:05 -08:00
MrZYX
849072f283 this should fix #572 2010-11-24 17:48:47 +01:00
danielvincent
d7609ef647 fixed issue with photos#index not recognizing an already sent request. 2010-11-23 21:03:35 -08:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
danielvincent
0b36e955fe check if profile exists before fetching profile photo 2010-11-23 14:49:32 -08:00
danielvincent
7c6bc7f7ea removed debug info from layout 2010-11-23 12:32:39 -08:00
danielvincent
c24150eca0 socketed posts now show up on home page. delete links are back in the stream. 2010-11-23 11:47:54 -08:00
zhitomirskiyi
546e7876d5 correct logging of the invitation acceptance 2010-11-23 11:46:45 -08:00
danielvincent
efab6449b3 message for closed signups on users#sign_in 2010-11-23 11:14:26 -08:00
maxwell
ec41ace9bf Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 11:07:48 -08:00
maxwell
52b02176db invited users seed aspects 2010-11-23 11:07:33 -08:00
zhitomirskiyi
ebaf2c081e returning nothing on empty query and limit the returning of the query to 90 2010-11-23 10:02:01 -08:00
danielvincent
9d98afb94f took out fade on photos#index, because it only displayed all photos half the time. 2010-11-23 09:44:58 -08:00
maxwell
dab3725a9c hotlinking image for invite 2010-11-23 09:39:53 -08:00
Raphael Sofaer
31a851e787 No guarantees on functionality here, editing from a browser. 2010-11-23 06:14:36 -08:00
MrZYX
ed3dc10f79 various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit 2010-11-23 14:02:13 +01:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
82d0e193e7 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 01:17:05 -08:00
maxwell
bd31bc423f MSSM added links to github and blog in header 2010-11-23 01:16:51 -08:00
danielvincent
376d403651 made publisher semi-hidden on home page 2010-11-23 00:34:28 -08:00
maxwell
709e348457 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/fixtures/users.yaml
 2010-11-23 00:15:26 -08:00
maxwell
32390933e8 PALINDROME message for multiple emails 2010-11-23 00:14:26 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
danielvincent
f725641eaf added shadow on diaspora text on landing page. 2010-11-22 20:53:20 -08:00
danielvincent
69cac02ade landing page fix 2010-11-22 20:35:30 -08:00
maxwell
7c09117230 fixing build 2010-11-22 19:05:35 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
maxwell
ffedd9fa77 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 17:30:00 -08:00
maxwell
b283f5c579 pulling back needed partial 2010-11-22 17:29:51 -08:00
maxwell
08aaccbdf1 Revert "--amend" 
This reverts commit 7650870502.
 2010-11-22 17:11:38 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
danielvincent
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -08:00
maxwell
21a90656fd fixing translations 2010-11-22 16:55:06 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-22 16:40:01 -08:00
maxwell
7650870502 --amend 2010-11-22 16:38:29 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
Sarah Mei
bedc7ca41b Made landing page and log in views content-type agnostic. 
Added an un-minified version of jquery-mobile for debugging.
 2010-11-22 15:02:25 -08:00
danielvincent
0e7b1f5eb7 status messages and comments made by user will ajax onto the current page, and websocket everywhere else. 2010-11-22 14:52:13 -08:00
MrZYX
e72f4e1da7 translatable status is good again 
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
 2010-11-22 22:30:37 +01:00
zhitomirskiyi
7df35ade12 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
danielvincent
8c6f3bddc3 added diaspora handle to home page with help text. added email address to account settings page. 2010-11-22 11:19:50 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
maxwell
f4ff48f5c0 commenting out mobile for now. photos now post from only a users photos 2010-11-22 10:26:00 -08:00
danielvincent
c7ac90538a added some spacing between photos and text on stream 2010-11-22 01:57:51 -08:00
maxwell
cdbd9df15e Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 01:50:23 -08:00
maxwell
ae2b3d75c2 added some copy to the landing page, and some basic styling 2010-11-22 01:50:15 -08:00
danielvincent
108ac9fd7c resolved stray h3 tag in stream 2010-11-22 01:31:21 -08:00
danielvincent
cb837f5fd7 moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading. 2010-11-22 01:24:04 -08:00
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
danielvincent
9a18b7e6f3 photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level. 2010-11-22 00:32:46 -08:00
maxwell
7da5accee8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-21 23:48:44 -08:00
maxwell
3a99ec3f8c uploader now shows current file uploading, and progress 2010-11-21 23:44:20 -08:00
danielvincent
c841a47a37 status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE. 2010-11-21 23:42:49 -08:00
maxwell
60dd2f8e60 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-21 23:03:21 -08:00
danielvincent
55952d00c0 fixed failing photoscontroller spec. 2010-11-21 22:58:24 -08:00
maxwell
ce1768d0d3 fixing dropdown, and removing margin on publisher 2010-11-21 22:58:01 -08:00
danielvincent
8df864dec1 everyone -> 'all contacts' on home page. removed repeated user links. 2010-11-21 22:37:22 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00
maxwell
c4a270ef8b putting mobile interface back in so we can get it cleaned up 2010-11-21 17:14:43 -08:00
danielvincent
069b372c19 photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http. 2010-11-21 16:30:47 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
danielvincent
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
4742f61925 made the rss button a link to the feed, and aligned correctly 2010-11-21 16:13:03 -08:00
danielvincent
a9a91c436a user menu is a button. fixed remove aspect button on aspect#show 2010-11-21 16:13:03 -08:00
maxwell
4ce337bbed display a users username in the final step 2010-11-21 16:13:02 -08:00
maxwell
9f5ba1a1ea added finished state to sidbar for getting started 2010-11-21 16:13:02 -08:00
danielvincent
6e603bf2af aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts. 2010-11-21 16:13:02 -08:00
maxwell
39f596462e saying sent on requests via js 2010-11-21 16:13:01 -08:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
ea7bdfde28 fix validation and order of status message sent 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812 MS DG form now works reasonably well. still need to limit number of photos 2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e added photos to status messages 2010-11-21 16:13:00 -08:00
danielvincent
f6491816a3 adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing. 2010-11-21 16:13:00 -08:00
maxwell
9471f01040 making photo uploader work better 2010-11-21 16:11:55 -08:00
maxwell
6fb1479d0d fixed publisher...whoops 2010-11-21 16:11:55 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
danielvincent
52cde14221 more touchups 2010-11-21 16:11:54 -08:00
danielvincent
2b54d9a0c5 adjusting more page structure. drafting about there. 2010-11-21 16:10:54 -08:00
danielvincent
7a259d6d53 drafted a basic structure 2010-11-21 16:09:27 -08:00
Raphael
6f0d008914 Move WebSocketReceiver out to a js file 2010-11-21 16:14:36 -05:00
Raphael
bf8190dbd5 Refactoring websocket JS 2010-11-21 15:38:24 -05:00
Raphael
53d3ac92a2 Fix WS JS 2010-11-21 14:26:07 -05:00
Raphael
4ce2de55e2 Fix photo show, js on people search page 2010-11-21 13:29:50 -05:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Jonne Hass
f426c08dcc made shared/_contatct_list.html.haml 
and the type after "viewing:" in shared/_author_info.html.haml translatable
 2010-11-19 17:25:05 +01:00
MrZYX
7200c007e5 made file uploader translatable 2010-11-19 15:25:14 +01:00
maxwell
466120cd58 fixing extra = 2010-11-18 20:07:57 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
Raphael
bad76d8cef Use pod url in host-meta 2010-11-18 17:02:13 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
Raphael
6841ffbecc Disable_with on comment form 2010-11-18 15:41:51 -08:00
Raphael
c7b8c185bd Disable with on publisher form 2010-11-18 15:41:51 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
zhitomirskiyi
c8c0b5c8a2 made the service image the same size 2010-11-18 15:22:14 -08:00
maxwell
970d56a007 basic batch inviter 2010-11-18 15:17:22 -08:00
zhitomirskiyi
f95fd33ed4 typo 2010-11-18 12:22:39 -08:00
zhitomirskiyi
9a31d15c92 added icons for the connected services and to indicate the rss feed 2010-11-18 12:19:58 -08:00
Raphael
c564d2819e Fixing no contacts link in _no_contacts. Thanks to alepane21. 2010-11-18 11:55:03 -08:00
Raphael
589c36d1ed Merge remote branch 'hex/duplicate-ids' 2010-11-18 11:39:03 -08:00
Matt Baker
b2e6caafed Don't show skip link if user.getting_started == false 2010-11-18 11:16:18 -08:00
maxwell
597258615b adding star back to title 2010-11-18 11:06:17 -08:00
maxwell
9882fa183d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
Sarah Mei
d1a745c9cd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:42:04 -08:00
danielvincent
eda346e283 use google's jquery within current protocol (http/https) 2010-11-17 22:36:01 -08:00
Sarah Mei
64237534fd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:31:21 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
maxwell
5e375a30d8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:06:08 -08:00
maxwell
c6778b942f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/views/layouts/application.html.haml
 2010-11-17 21:57:48 -08:00
danielvincent
558c175c2b resolved translation issue in diaspora.en in user dropdown. second login link on landing page works. 2010-11-17 21:57:27 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
danielvincent
9041a81fea cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing 2010-11-17 21:21:00 -08:00
danielvincent
1a9041a3c0 DG MS; fixed cucumber tests to work with new landing page flow 2010-11-17 19:49:01 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
danielvincent
a7c1733093 firefox fixes and added links to press articles on landing page 2010-11-17 19:37:08 -08:00
danielvincent
f59f6be4b0 users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp. 2010-11-17 19:37:08 -08:00
Raphael
37a694ed1f Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects 2010-11-17 18:49:03 -08:00
maxwell
1a279de573 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 16:18:07 -08:00
maxwell
f442c6fe3e taking out the if true 2010-11-17 16:17:52 -08:00
Raphael
5e269edb5a Adding logging to webfinger in people_controller 2010-11-17 15:56:39 -08:00
Raphael
2ecf1e8b71 No name fields on invitation accept 2010-11-17 15:45:40 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
6c97899d5d Add logging statements, rescue callbacks in em-webfinger 2010-11-17 13:55:58 -08:00
maxwell
045c8f1aac updated magent, now using my fork untill bugfix gets pulled 2010-11-17 13:49:12 -08:00
maxwell
e959e529ff ga looks like it only likes if the code is pasted...hrmpf 2010-11-17 12:29:58 -08:00
maxwell
ba620e5400 spell vendor correctly 2010-11-17 12:25:09 -08:00
maxwell
643950cf52 added google a 2010-11-17 12:16:44 -08:00
maxwell
5561ab9cec adding get satisfaction 2010-11-17 12:08:06 -08:00
maxwell
afc3bd63fe added button to end of getting started 2010-11-17 11:30:22 -08:00
maxwell
6a695479f7 adding updated jquery UI for compatability 2010-11-16 23:58:16 -08:00
maxwell
f55509085a upgraded jquery, and deleted a second version of both jqueries 2010-11-16 21:41:20 -08:00
maxwell
092f0ef7a8 invite link when you get a webfinger error 2010-11-16 19:07:19 -08:00
Raphael
ece1dc2cf9 In progress invites in _manage_aspect_contacts 2010-11-16 18:10:15 -08:00
Raphael
e2412d2e43 Add error messages for friending from aspect-manage 2010-11-16 18:00:55 -08:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Raphael
d1a56e9ef2 Fix to websocket js 2010-11-16 14:35:46 -08:00
Alec Leamas
90b86690d9 Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4 2010-11-16 16:25:32 +01:00
Sarah Mei
44bd4534ce I found where we needed the one-line addition. Ruby 1.9 build now works. 
I feel pretty badass.
 2010-11-15 22:44:55 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
zhitomirskiyi
c5ae73f96d websocket secure params in app_config 2010-11-15 17:45:52 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Hexagon
35095f8859 Update of sv.yml to reflect latest changes + small fix to en.yml 2010-11-15 22:28:36 +01:00
Hexagon
9f8ef8ae3b Translation fix "Invite someone" 2010-11-15 22:28:36 +01:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Raphael
03eea3fc08 Class not class_name 2010-11-15 11:49:16 -08:00
Raphael
2ad74d397c fix build 2010-11-13 19:05:12 -08:00
danielvincent
60b272b243 remove validations on url for now to support ip addresses in pod_url field in app_config.yml 2010-11-13 14:55:40 -08:00
danielvincent
969c668518 translation fix on _person.haml. button tweak 2010-11-13 12:10:09 -08:00
Hexagon
958be06ff1 Removed duplicate id generation in _new_comment form 2010-11-13 13:54:48 +01:00
danielvincent
988e2afe3d resolved missing translation, tweaked button css, commented out mobile_fu in application controller 2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
Raphael
1a5aa02c77 Removing :value => on hidden_field_tag. Thanks npouillard. 2010-11-12 14:10:49 -08:00
Raphael
1e842f1a88 Render mail css as a partial, fix spec 2010-11-12 12:26:34 -08:00
Raphael
ae9f4ab969 Refactor mail views, add a spec to make sure CSS is rendered 2010-11-12 11:47:59 -08:00
Raphael
0e8b1efefd Merge remote branch 'MrZYX/en.yml-refactor' 2010-11-12 11:28:05 -08:00
danielvincent
716a77f0cc fixing a refactor that broke friend requesting from the ui 2010-11-11 21:26:40 -08:00
MrZYX
5ae4248b30 some more fixes I overlooked. Sorry 2010-11-12 06:07:37 +01:00
MrZYX
f55a973685 two small fixes 2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0 just found the mailer... :) 2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
MrZYX
748efb1860 eliminated senseless duplicates in en.yml 2010-11-12 06:07:36 +01:00
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7 fixes to be in sync with latest commits 2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
381c53b775 found some untranslatable strings 2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6 refactored en.yml 
removed unused keys out of en.yml
replaced some ' with "
 2010-11-12 06:04:05 +01:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
Raphael
d62a7c4ce2 Fix request views, refactor identical forms into partial. 2010-11-10 20:12:09 -08:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
Sarah Mei
ca9331970a Renaming image_picker to image-picker since js likes dashes better than underscores 2010-11-10 10:52:33 -07:00
maxwell
71da954a76 removing deletetion 2010-11-09 15:29:43 -08:00
maxwell
f7cc01ceb2 more work done. much more to go 2010-11-09 15:29:43 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
4818973643 Beginning to refactor invitations into an Invitation class 2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -08:00
maxwell
18505bf23c resubmmiting object path bug. not sure how it got overwritten 2010-11-09 00:24:27 -08:00
maxwell
56c152ac6a fixed a bug in the stream partial to use object_path 2010-11-08 21:16:46 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
091d98ea15 invite friends actually calls up the invite friends pane on all aspects 2010-11-08 18:00:36 -08:00
maxwell
7d6be51cfb making photos#show be in no aspect 2010-11-08 17:53:47 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
Raphael
70af10ee62 user#friends is now a many-foreign_key assoc, rather than a many-in 2010-11-08 15:19:23 -08:00
zhitomirskiyi
cbabc547a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032 the profile cannot massassign diaspora handle 2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
maxwell
7e40558dc4 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:33:05 -08:00
maxwell
80c8451bf2 fixing translation text of services page 2010-11-08 10:25:11 -08:00
maxwell
0d26348e69 remove arnold from the inviter mail form 2010-11-08 10:05:34 -08:00
danielvincent
58ce81f674 Add a person to aspect contains a searchable list as opposed to a dropdown. 2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif 2010-11-07 11:07:37 -08:00
danielvincent
a4df6a8a53 bugfix in peeople#_person partial displaying relationship status 2010-11-07 10:51:33 -08:00
danielvincent
f594fa1d80 Stream is its own partial, which takes a collection of posts 2010-11-07 10:38:00 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
maxwell
a971985884 removed private info if you are not friends 2010-11-06 16:34:41 -07:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e Post a message to aspect dialog will only display if people are present. 2010-11-05 21:14:00 -07:00
Raphael
8023b6f344 Check for birthday before putting in birthday paramaters 2010-11-05 18:32:18 -07:00
danielvincent
58c3a4306f fixed the build 2010-11-05 18:16:28 -07:00
danielvincent
ddb4b2b6ee Clicking 'make public' label on everyone publisher selects respective checkbox 2010-11-05 17:49:15 -07:00
maxwell
32ed7e3b0f forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have 2010-11-05 17:48:33 -07:00
maxwell
1a642e044a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-05 17:43:30 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
maxwell
4a39d1a516 date now has a default nil value 2010-11-05 17:38:51 -07:00
danielvincent
9a055b6cba Photo partial now has a description and a link to view all photos by that person. 2010-11-05 17:27:36 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
maxwell
4300b20c34 cleaned up profile page a bit more 2010-11-05 14:28:39 -07:00
danielvincent
3ed10a22ff xml_accessor creates attr_accessors in addition to xml_readers 2010-11-05 14:25:45 -07:00
Raphael
6468f0003b Take out some xml accessors 2010-11-05 14:24:56 -07:00
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04 more testing 2010-11-05 11:46:43 -07:00
maxwell
53b25728ce yay for typo 2010-11-05 11:46:43 -07:00
maxwell
4154cec28a made mailer query based on ids, rather than making them serialize ruby objects 2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
Raphael
4233e45bc5 Adjust wording 2010-11-05 11:23:21 -07:00
maxwell
997f9ad8d0 making profile not look so bad 2010-11-05 00:54:09 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
 2010-11-04 20:05:57 -07:00
Derrick Camerino
087f7e90d4 removing aspect in ui only if ok is clicked on confirmation 2010-11-04 19:54:11 -07:00
Raphael
abebd18c98 Move getting_started self link color to a css class 2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-04 18:56:43 -07:00
Raphael
4eba0595f9 Fix 328 profile images dying, thanks to theBernd 2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -07:00
danielvincent
be916384a1 collapsed remove from aspect and remove person into one function on aspects#manage 2010-11-04 17:50:48 -07:00
Raphael
20508ad37a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-04 16:45:03 -07:00
Raphael
3634658cbf The Governator's party has lost the election. 2010-11-04 16:44:17 -07:00
danielvincent
b74dfcf5fd comments autolink 2010-11-04 16:18:49 -07:00
danielvincent
f4dba54ff3 posting to a person with a user on the same pod will send internally, skipping the http queue and encryption. 2010-11-04 15:33:16 -07:00
danielvincent
b4679c9041 Take application_controller before filters out of publicscontroller 2010-11-04 15:33:16 -07:00
zhitomirskiyi
ea0f0fbdc5 add moved dev controller to use the user post api 2010-11-04 15:07:24 -07:00
zhitomirskiyi
7f5b98a6cb the photo image url is now randomized 2010-11-04 14:37:08 -07:00
danielvincent
9da7272e59 should query the correct collection on perform 2010-11-04 12:58:24 -07:00
MrZYX
1102fcd565 made flash messages translatable 2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
MrZYX
f84b14bd19 unscope are_you_sure in photos/show.html.haml 2010-11-04 20:49:50 +01:00
danielvincent
b33aa9a0fb retracting on a non existant post does not raise a permissions error. 2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
Raphael
03b272db60 Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC 2010-11-03 15:26:58 -07:00
zhitomirskiyi
7771219a0a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 13:16:57 -07:00
zhitomirskiyi
0ac4c5b04f IZ MS refactored invites to use user.build 2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
danielvincent
3e001c74d6 Albums#index hidden from views. Photos must be accessed through a person. 2010-11-03 12:21:14 -07:00
Raphael
c8a8849518 Move to build_post and dispatch_post in most controllers 2010-11-03 09:30:41 -07:00
Raphael
d5a4de58b3 User#post is now like a future controller, Photo#instantiate no longer saves 2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc Move post dispatching to dispatch_post 2010-11-02 19:16:02 -07:00
maxwell
0ecc27a935 MS IZ posts should now update 2010-11-02 18:56:00 -07:00
maxwell
4de89df4dc MS IZ setting the diaspora handle in photo instantiate 2010-11-02 18:32:02 -07:00
danielvincent
a31c22adb3 mailer doesn't break everything anymore. attachments are also inlined. 2010-11-02 17:59:50 -07:00
maxwell
8c350282d3 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 17:52:22 -07:00
maxwell
2f1fbaf686 temp. logging statement 2010-11-02 17:52:04 -07:00
Raphael
ae039442c3 Websocket now uses cookie to authenticate 2010-11-02 17:39:50 -07:00
danielvincent
a79d1f5240 tabbing on publisher to everyone focuses submit button 2010-11-02 17:35:12 -07:00
danielvincent
a995d250f1 added white text on grey asset to mailer 2010-11-02 17:19:49 -07:00
Raphael
5cdeed6c54 Add a spec to people_controller, make those specs a little clearer 2010-11-02 17:10:19 -07:00
danielvincent
e9f3efea79 person searchable by diaspora_handle 2010-11-02 16:48:58 -07:00
maxwell
8c89f8d87a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 16:42:52 -07:00
maxwell
51d419f41a removed diaspora handle method from user 2010-11-02 16:42:37 -07:00
Raphael
a5dedc9bdb User.build no longer saves people, user now has attr_accessible 2010-11-02 16:28:55 -07:00
danielvincent
da8124f8a7 hcard has searchable field, and is taken in to account when building Person from webfinger 2010-11-02 16:12:43 -07:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
Raphael
6503cefd68 Get rid of some repeated ids, fix infieldlabels on manage page 2010-11-02 15:37:06 -07:00
maxwell
c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	lib/diaspora/user/receiving.rb
 2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
Raphael
bfcb2a9e18 Remove random href 2010-11-02 12:37:32 -07:00
Raphael
a9b429d163 Merge remote branch 'ed0h/helper-method-for-markdown' 2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4 Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'" 
This reverts commit 2b128d88ec, reversing
changes made to 8778bdab3b.
 2010-11-02 12:14:12 -07:00
Raphael
2b128d88ec Merge remote branch 'ed0h/336-markdown-for-status-messages' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-02 11:45:16 -07:00
Raphael
8778bdab3b Merge remote branch 'ed0h/503-language-html-tag' 2010-11-02 11:43:12 -07:00