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

311 commits

Author SHA1 Message Date
Dan Hansen & Sarah Mei
fbfe28bcfa added vimeo method, still needs support from lib/youtube_titles.rb. updated locales 2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88 Refactored the markdownify method. 2010-12-15 01:00:20 -05:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
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
zhitomirskiyi
7e3b2c6afd removed the query from the contact list partial 2010-12-13 17:53:27 -08:00
Raphael
d44df7e977 put remove contact link under aspect membership 2010-12-13 16:40:05 -08:00
MrZYX
3a13657087 fix for #557 2010-12-13 22:23:19 +01: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
d19353ed8f added newline support to markdownify 2010-12-12 00:44: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
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
5fb782a988 added post guid for local notifications 2010-12-09 13:56:53 -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
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
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
2e87bece60 Final fixes for person socketing 2010-12-02 19:03:15 -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
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
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
maxwell
e18b918676 MS DG only show three comments by default 2010-12-01 18:09:41 -08: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
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
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -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
Raphael
49e8347aa3 Use static helper for aspect links 2010-11-30 12:23:43 -08:00
Raphael
fce428826c Try to take photos query out of views 2010-11-29 23:41:03 -08:00
Raphael
03e3c3a202 Render comment partial with collection option 2010-11-29 17:50:30 -08:00
Hexagon
b0ff8f0f60 Mini refactor, removed terse_url function 2010-11-29 23:23:51 +01: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
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
Raphael
49f4ec1432 comment ids in the logs 2010-11-27 16:21: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
Raphael
d5d4a08f03 Start moving youtube title getting into the post/comment flow 2010-11-27 01:00:47 -05:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
MrZYX
6e5b097f81 try at fixing a translation 2010-11-26 18:33:52 +01:00
MrZYX
e916e33482 pulled and merged request 509, thanks siefca 2010-11-26 15:48:08 +01: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
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
Dan Hansen & Sarah Mei
e78a86897a Video links now use data attributes and render in an iframe 2010-11-25 16:07:39 -08: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
danielvincent
d7609ef647 fixed issue with photos#index not recognizing an already sent request. 2010-11-23 21:03:35 -08:00
danielvincent
0b36e955fe check if profile exists before fetching profile photo 2010-11-23 14:49:32 -08: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
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -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
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
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
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08:00
maxwell
4ce337bbed display a users username in the final step 2010-11-21 16:13:02 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -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
248e768846 search now sockets a person 2010-11-15 19:13:45 -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
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
58c3a4306f fixed the build 2010-11-05 18:16:28 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -07:00
maxwell
997f9ad8d0 making profile not look so bad 2010-11-05 00:54:09 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -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
Alec Leamas
fceffba261 Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor 2010-11-02 16:34:47 +01:00
livefromthemoon@gmail.com
aab74cf1ff Added markdown support for status messages 2010-11-02 03:55:14 +01:00
maxwell
3c8b40c427 IZ MS retractions now use diaspora handle 2010-11-01 17:11:06 -07:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
danielvincent
3f7955f978 removed two unused methods 2010-10-31 14:50:14 -07:00
livefromthemoon@gmail.com
bcb17aae16 Add support for markdown links 2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
ebf9dd464f Better support for imbricated markdown emphasis 2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
112088ace3 add support for markdown emphasis in status messages 2010-10-30 19:26:11 +02:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
maxwell
de04e717c0 made image or default to help with hcard parsing, deleted old default user picture 2010-10-22 16:57:01 -07:00
danielvincent
e9ced7b2e6 changing photo now updates all user images in page 2010-10-20 12:35:16 -07:00
Raphael
296afdc871 Beat Dan at bugfixing 2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1 Fix bug 376 2010-10-19 11:39:52 -07:00
Raphael
de0b240dbb Remove unused helper method 2010-10-19 11:36:33 -07:00
danielvincent
7e9585c5f0 default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
archi
1d9aa4c43d Modified spec (doesn't check Youtube handling due to disabled net::http) 2010-10-17 21:07:49 +02:00