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
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
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
Nick van der Burgt
e6127c6aa9
Included ie.js into the layout
2010-12-27 17:33:50 +01: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
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -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
zhitomirskiyi
7796776135
vimeo works, does not yet fetch the title
2010-12-23 15:36:29 -08:00
zhitomirskiyi
1bc168d075
focusing a publisher on reshare
2010-12-22 09:51:50 -08:00
danielvincent
9b6d40544c
fixed _comments bug on show pages
2010-12-21 17:36:14 -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
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
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
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
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
danielvincent
6c12a4c562
photo show page shows more photo.
2010-12-19 21:53:57 -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
