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

369 commits

Author SHA1 Message Date
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
d0b25814b1 publisher retains text when filtering stream 2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2 publisher works through ajax filters 2011-01-08 13:11:52 -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
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
zhitomirskiyi
ddf95e2750 couple more passing cucumber stories, changed the queries on request and notification 2010-12-28 19:14:47 -08:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
zhitomirskiyi
1bc168d075 focusing a publisher on reshare 2010-12-22 09:51:50 -08:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
danielvincent
a6c5f420fa giving more pixels to photos on their show pages 2010-12-21 12:39:37 -08:00
danielvincent
6c12a4c562 photo show page shows more photo. 2010-12-19 21:53:57 -08: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
danielvincent
01e557ba7a put ajax:success for publisher where it belongs 2010-12-18 20:31:02 -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
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
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -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
Raphael
e63a8a4bfa Take contact.person query out of the views, only query people once in hashes_for_aspects 2010-12-14 12:11:36 -08:00
maxwell
2bc849fa90 only show permalink if the post is infact public. also, make destroy delete 2010-12-13 18:45:54 -08:00
zhitomirskiyi
7e3b2c6afd removed the query from the contact list partial 2010-12-13 17:53:27 -08:00
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00
danielvincent
68a51448e5 comment link shows up again on contact pages 2010-12-13 10:19:04 -08:00
danielvincent
2f2f8fef8a delete/reshare only if current_user on stream_element 2010-12-12 01:41:54 -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
danielvincent
c9b498d59c resolved 500 page on getting_started#step_3 2010-12-11 12:05:58 -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
maxwell
e4e3a7493c fixed a bug where reshare text was truncated 2010-12-08 15:09:41 -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
danielvincent
460081bc2f don't condense comments on show pages 2010-12-05 17:21:57 -08:00
danielvincent
47b6d66b83 fixed proportions in stream, etc. 2010-12-03 23:38:29 -08:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -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
Raphael
8d853a88a3 Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
Paweł Wilk
017251fef9 Added genderized variants of t() to views, controllers and helpers. 2010-12-01 18:19:48 +01:00
Raphael
4f3d031e89 Always set translations 2010-11-30 15:58:25 -08:00
Raphael
3dc3efc103 Move aspect contacts pane js to public 2010-11-30 15:57:32 -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
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
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
maxwell
96776f93f9 we need this for socketing... sorry 2010-11-29 16:19:36 -08:00
Raphael
760fed7016 No need for defined? 2010-11-29 12:10:41 -08:00
Raphael
812aaae63f Simplify stream_element partial 2010-11-28 11:31:31 -05:00
danielvincent
3ada121d0b contact-js as its own file 2010-11-28 00:29:22 -05:00
Raphael
68c0682ed0 Take a query out 2010-11-27 22:21:15 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
danielvincent
d65ba2f291 removing contact pictures from contact list re aspects#show 2010-11-27 17:25:40 -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
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
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -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
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -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
Paweł Wilk
c7059a58da Added i18n for "Sign up for invite" button. 2010-11-26 01:38:08 +01: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
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
Raphael
eeac6901b9 Revert "Change invite button text" 
This reverts commit d443b15c97.
 2010-11-24 21:01:48 -05:00
Raphael
d443b15c97 Change invite button text 2010-11-24 16:48:24 -05: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
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
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
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
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
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
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
maxwell
3a99ec3f8c uploader now shows current file uploading, and progress 2010-11-21 23:44:20 -08:00
danielvincent
8df864dec1 everyone -> 'all contacts' on home page. removed repeated user links. 2010-11-21 22:37:22 -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
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