danielgrippi
b9b9d7e07d
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
2011-03-23 10:29:34 -07:00
MrZYX
7cd1789669
allwow https youtube links
2011-03-19 22:19:31 +01:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
Dan Hansen
490a2c6a9e
remove extra protocol in the link
2011-03-10 21:16:45 -06:00
Dan Hansen
214c677169
process videos last so there aren't conflicts with other markdownify methods
2011-03-10 18:29:08 -06:00
Dan Hansen
d7c7775b6c
fallback gracefully, break build if videos can't embed
2011-03-10 18:26:55 -06:00
Dan Hansen
93bdf1e91e
add space before link
2011-03-10 18:01:08 -06:00
Raphael Sofaer
f2cc51dd0d
Take current user id out of avatar
2011-03-09 17:50:46 -08:00
Raphael Sofaer
eafa965504
Try explicitly querying rather than getting postvisibilities
2011-03-09 16:17:48 -08:00
danielgrippi
5f55dfa1bc
private message inbox wip
2011-03-03 17:32:26 -08:00
zhitomirskiyi
2522ab7ee4
refactoring the conversation views, wip
2011-03-03 10:39:32 -08:00
Raphael Sofaer
a7f149e399
Possible performance gain from not hitting posts relation
2011-03-01 11:42:57 -08:00
Dan Hansen
e4ba498d70
whoops
2011-02-22 23:21:50 -06:00
Dan Hansen
f41bc0c14d
<3z
2011-02-22 23:19:57 -06:00
Raphael Sofaer
74b8921c09
make video urls have correct href
2011-02-22 18:51:40 -08:00
maxwell
e3b298c5d4
this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in"
...
This reverts commit dfa5d875c5
2011-02-17 19:01:42 -08:00
MrZYX
dfa5d875c5
I18n: Workaround for a weired caching issue when multiple users are logged in
2011-02-16 22:40:18 +01:00
Dan Hansen
e2ec4c0424
possibly fix the problem with js i18n that occurs on joindiaspora
2011-02-15 22:43:06 -06:00
MrZYX
20e1316491
it can somehow happen that a person has no profile. somehow. idk why.
2011-02-13 19:29:04 +01:00
danielvincent
01cfeb65b2
fixed build
2011-02-06 23:42:01 -08:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
zhitomirskiyi
34e5ba99bc
removed the image or default
2011-02-01 18:11:02 -08:00
zhitomirskiyi
21e3c2ae73
Merge branch 'open-aspects'
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/home_controller.rb
app/helpers/application_helper.rb
db/migrate/20110201013408_add_open_aspects_to_user.rb
spec/controllers/aspects_controller_spec.rb
spec/controllers/home_controller_spec.rb
2011-02-01 17:32:08 -08:00
zhitomirskiyi
7f026e8271
now updating the open aspects in js
2011-02-01 16:58:33 -08:00
MrZYX
7ca8391739
Javascript I18n: fallback to DEFAULT_LANGUAGE for missing keys
2011-02-01 22:45:02 +01:00
Raphael
518642d0d7
Move image_url defaulting logic into profile
2011-02-01 11:56:56 -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
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07: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
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
Raphael
3729431ccf
don't translate css class to mark request count
2010-10-08 14:46:57 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
ilya
52313b799b
added a warning, moved connected as into a partial, removed the
...
publishing box from settings page
2010-09-27 16:31:19 -07:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Raphael
d748d456b5
Revert "fix in person partial"
...
This reverts commit 8c0bc4b9e6
2010-09-23 16:21:08 -07:00
danielvincent
8c0bc4b9e6
fix in person partial
2010-09-23 10:49:35 -07:00
Raphael
2489f8503f
Merge branch 'master' into HEAD
...
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
2010-09-22 21:32:03 -07:00
Dorian
003a8b454f
Some refactoring again (define code rules would be good)
2010-09-22 02:55:54 +08:00
maxwell
e2fc48c9ff
MS being slightly more proper with application helper, and fixing the person search page
2010-09-20 16:44:35 -07:00
danielvincent
14ad24ba7e
visual tweaks on header. moved upload a file button to header on album#show
2010-09-19 14:27:20 -07:00
Ariel Zavala
0014024870
Added I18n translations to helpers
2010-09-17 15:26:31 -04:00
Raphael
0eb2c97aef
object_path shouldn't create links to users
2010-09-16 14:51:27 -07:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
da8ec589b7
RS, DG; display the correct tab on manage, change edit to manage
2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01
DG RS; passing around params[:aspect]. querying in application controller for current aspect.
2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
Raphael
5ac5f58679
Tabs on the top aren't all selected on group select, some other view tweaks
2010-08-24 19:22:43 -07:00
Raphael
5779610659
messed with the views
2010-08-24 18:31:16 -07:00
Raphael
7ca9d1e791
Changed group_nav a little, deleted people_sidebar
2010-08-24 11:02:30 -07:00
maxwell
361adda6cd
added group picker. sends the right params, but posts only have one group right now so thats a bummer
2010-08-22 22:20:34 -07:00
Raphael
3efa36587a
Took out a bunch of user.owner references
2010-08-16 11:01:58 -07:00
Raphael
838fec4921
RS, DG; Working on group nav, fixed some stuff in photo
2010-08-09 16:34:06 -07:00
maxwell
7be374ac48
MS IZ fixed a couple of view things as well as the dev db seed script
2010-08-09 10:10:41 -07:00
Raphael
d130b82e42
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
2010-08-06 11:52:33 -07:00
maxwell
5d924dadf4
MS DG; 19 failing specs left
2010-08-05 17:16:51 -07:00
Raphael
58addca8dd
RS, IZ; extracted and murdered ostatus.
2010-08-04 16:00:01 -07:00
ilya
3eeb81ad34
DG IZ; time_created_at uses published_at instead of created_at for OstatusPost
2010-07-29 20:43:03 -07:00
maxwell
bdca2348a6
MS IZ profile page has more useful info, but ultimatly kinda ugly
2010-07-27 14:23:31 -07:00
Maxwell Salzberg
66f66b85a6
MS added test, things still seem broken though
2010-07-24 23:21:02 -07:00
danielvincent
03e06cb279
person sidebar has a view all; displays user images with names in tooltips instead of text
2010-07-24 10:24:43 -07:00
maxwell
9095a06738
MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok
2010-07-24 01:56:07 -07:00
maxwell
0f407b11ed
MS DG comments now work on photo show page; full size photos now available
2010-07-21 14:58:06 -07:00
danielvincent
04eb66b2e6
user has a image url field for user picture
2010-07-16 23:02:24 -07:00
Raphael
501620e9fb
DG RS; fixed some visual bugs. request link now turns red on new request
2010-07-15 18:40:55 -07:00
maxwell
902a8cb349
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
2010-07-10 10:34:46 -07:00
maxwell
58ed75a289
MS socket now works in the server, but I can't figure out how to mock this stuff
2010-07-07 22:20:15 -07:00
danielvincent
3d105e7c1e
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
2010-07-07 16:53:52 -07:00
danielvincent
c27bc09e75
fixed user image bug
2010-07-01 16:35:44 -07:00
danielvincent
c0a744b2ce
owner picture selector in application helper
2010-07-01 15:34:35 -07:00
maxwell
fcbe8e42a0
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
2010-06-29 20:54:53 -07:00
ilya
25198a7e86
IZ, RS; Moved XML parser to lib
2010-06-28 15:56:46 -04:00
Maxwell Salzberg
2bbfcb0bb1
putting debug in for master so I can check deployed servers out
2010-06-26 14:16:19 -07:00
maxwell
6467f943da
MS^2 Comments serialize and deserialize properly
2010-06-25 22:49:53 -07:00
maxwell
e4e2d52bcb
reverting typos
2010-06-25 22:29:36 -07:00
maxwell
0d700046c4
MS^2 Object parser can handle comments
2010-06-25 22:29:08 -07:00
maxwell
64c1d99b8c
MS found the stupid nil. from here, i have 33 failures.
2010-06-24 22:20:09 -07:00
ilya
81157190ac
RS, IZ, Merged from master
2010-06-23 20:19:25 -04:00
ilya
8829714e2d
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
2010-06-23 20:17:44 -04:00
maxwell
9fa26f020e
DG MS; clicking on a person's name redirects to that person's post stream
2010-06-23 14:32:51 -07:00
maxwell
663b99924f
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-23 01:26:06 -07:00
maxwell
60fa7e3ac4
view stuffs
2010-06-23 01:26:00 -07:00
Maxwell Salzberg
e6e1c22b07
DG; webhooks apply incoming posts to current friends with a silent fail on no match
2010-06-23 01:20:56 -07:00
maxwell
3064d208eb
added firefox websocket stuffs, only loads if it is not safari or chrome
2010-06-22 14:31:16 -07:00
maxwell
f696ffc3a6
fixed up some views, but some stuff feels like it broke
2010-06-21 16:46:19 -07:00
maxwell
655dd64a54
websockets work
2010-06-21 14:12:05 -07:00
maxwell
5286b6be69
DG MS; require XML root node; added header to XML (not yet required)
2010-06-18 18:03:13 -07:00
maxwell
34df8fa946
DG MS; resolved unknown types going to receive handler. only post objects are inputted
2010-06-18 16:47:34 -07:00
danielvincent
02137b9fb9
DG MS; receive hook working.
2010-06-17 18:29:56 -07:00
maxwell
9e89b2e0a7
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
2010-06-15 21:08:29 -07:00
Raphael Sofaer
0390bbde8a
Activerecord this time\!
2010-06-11 10:40:49 -07:00
