zhitomirskiyi
|
7f026e8271
|
now updating the open aspects in js
|
2011-02-01 16:58:33 -08:00 |
|
maxwell
|
5267365b4f
|
move js strings to application helper
|
2011-01-29 13:54:28 -08:00 |
|
maxwell
|
1b3c58c2c2
|
Use a fake to not allocate an AR model for every reference to a person
|
2011-01-24 15:13:52 -08:00 |
|
Dan Hansen
|
90f5192055
|
refactor process_youtube, escape vimeo titles
|
2011-01-22 16:26:45 -06:00 |
|
Raphael
|
bd4efe8c2d
|
Escape youtube titles
|
2011-01-17 15:39:46 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
maxwell
|
600e67d5d1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 16:31:35 -08:00 |
|
danielvincent
|
9cf1f5a023
|
fixed reshare with filters
|
2011-01-08 13:11:55 -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
|
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
|
a9195d7730
|
aspect filters now functional on aspects/index
|
2011-01-08 13:11:51 -08:00 |
|
Raphael
|
b642cd6840
|
Merging master into mysql
|
2010-12-26 16:30:17 -08:00 |
|
Dorian
|
d6e72cd2bb
|
Escape person.name in comment
|
2010-12-26 02:16:53 +01: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 |
|
zhitomirskiyi
|
7796776135
|
vimeo works, does not yet fetch the title
|
2010-12-23 15:36:29 -08:00 |
|
danielvincent
|
2150cb505e
|
fixed person_photo_path
|
2010-12-21 12:44:33 -08:00 |
|
MrZYX
|
1b6f341348
|
made linking more robust, this fixes #732
|
2010-12-19 13:49:46 +01:00 |
|
Mike Sofaer, Raphael Sofaer & Sarah Mei
|
5c21e220ff
|
post_spec now passes with mysql
|
2010-12-18 20:23:16 -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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Dan Hansen & Sarah Mei
|
5075a7384b
|
allow hyphens in YouTube video IDs
|
2010-11-25 21:05:54 -08: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 |
|
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
|
0b36e955fe
|
check if profile exists before fetching profile photo
|
2010-11-23 14:49:32 -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 |
|
maxwell
|
31d33054ef
|
added jammit, now js and css compress for production
|
2010-11-17 21:51:59 -08:00 |
|
MrZYX
|
9ceb3e2fd1
|
found some still untranslatable strings in helpers and stuff
|
2010-11-12 06:07:36 +01:00 |
|
maxwell
|
034d7ee2b1
|
first commit
|
2010-11-09 15:29:43 -08:00 |
|
maxwell
|
997f9ad8d0
|
making profile not look so bad
|
2010-11-05 00:54:09 -07:00 |
|
Raphael
|
a9b429d163
|
Merge remote branch 'ed0h/helper-method-for-markdown'
|
2010-11-02 12:14:41 -07:00 |
|
livefromthemoon@gmail.com
|
aab74cf1ff
|
Added markdown support for status messages
|
2010-11-02 03:55:14 +01: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 |
|