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
danielvincent
4e3fe166d1
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-21 10:31:24 -08:00
danielvincent
a1f3ab3046
mark requests as read when a user responds to the request
2010-12-21 10:31:18 -08:00
MrZYX
e10af7fc8a
made "Notifications" translatable
2010-12-21 19:18:29 +01:00
danielvincent
c17425b7fb
fixed one cuke
2010-12-21 10:09:46 -08:00
maxwell
43824c4b33
pushing for dan
2010-12-20 18:45:23 -08: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
Julian Osman
42c602df2f
Issue #735 : Image link fixed and CSS corrected
2010-12-20 12:09:30 -08: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
Sarah Mei
850dcfd322
Updated versions of carrierwave, aws, cucumber, culerity, gherkin, haml, mail, rspec, rspec-core, rspec-expectations, rspec-mocks, and rspec-rails. What could possibly go wrong?
2010-12-20 02:49:44 -08:00
danielvincent
6c12a4c562
photo show page shows more photo.
2010-12-19 21:53:57 -08:00
maxwell
533ff2fc39
improve selector for inf. scroll
2010-12-19 19:30:33 -08:00
maxwell
d5819e3c9e
fix the ajax-loader for scroll on non root page
2010-12-19 19:15:16 -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
MrZYX
6357cd3b95
updated locales - added slovenian and hungarian to languages.yml
2010-12-19 15:01:59 +01:00
MrZYX
b52718e913
small translation fix
2010-12-19 14:41:47 +01:00
MrZYX
1b6f341348
made linking more robust, this fixes #732
2010-12-19 13:49:46 +01: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
lfortin
0393ac5a6f
more JS formatting
2010-12-19 00:15:00 -05:00
danielvincent
01e557ba7a
put ajax:success for publisher where it belongs
2010-12-18 20:31:02 -08:00
danielvincent
d5916c9287
removed comment button from sight
2010-12-18 20:26:27 -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
7b4da22617
shift+enter for a newline, enter for submission. inversion of current implementation.
2010-12-18 18:49:10 -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
Raphael
36b622c998
Fix build
2010-12-18 15:22:56 -08:00
Raphael
02f745900f
Get rid of youtube-title failure
2010-12-18 15:16:05 -08:00
MrZYX
6afba8fb7b
updated locales
2010-12-18 16:07:49 +01:00
MrZYX
c3a79f7298
some fixes to translations
2010-12-18 15:25:21 +01:00
Alec Leamas
5e4219b09e
Pkg update
2010-12-18 15:18:48 +01:00
maxwell
f1ae312e75
changes for person show page
2010-12-18 02:10:00 -08:00
maxwell
bcca61af6b
infinate scroll
2010-12-18 01:33:33 -08:00
Raphael
a64fa0839f
Hide notifications link until we take out queries from it
2010-12-17 20:19:02 -08:00
maxwell
427cf18324
fix birthday spec
2010-12-17 19:41:42 -08:00
maxwell
84c041ba6a
aspects streams now ajax
2010-12-17 19:41:42 -08:00
danielvincent
f6701f2262
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-17 19:29:17 -08:00
Raphael
a64d8943b4
Pulled in spec refactor, thanks blackxored
2010-12-17 18:49:34 -08:00
maxwell
b3c63a3cc0
you can now unset the year of your birthday"
2010-12-17 18:05:13 -08:00
