Commits · c47ebd5a18921b3cdd9e329464306bf7e04d203d · Milan / diaspora

Jan 11, 2012
- Merge pull request #2632 from torrancew/remove_chef · c47ebd5a
  Daniel Grippi authored 13 years ago
  
  Remove chef
  c47ebd5a
- remove unused files/methods · bee8aa8b
  danielgrippi authored 13 years ago
  
  bee8aa8b
- Remove chef · 4df6b65d
  Tray Torrance authored 13 years ago
  
  4df6b65d
Jan 10, 2012
- remove all references to the websocket. bang bang. · 0e5bb81d
  danielgrippi authored 13 years ago
  
  0e5bb81d
- add services to be sent to the controller via the Publisher view [ci skip] · 2243778c
  danielgrippi authored 13 years ago
  
  2243778c
- hella sod, yo [ci skip] · 6ee25779
  danielgrippi authored 13 years ago
  
  6ee25779
- Merge pull request #2547 from stwf/unread_notifications · c61e84bc
  Daniel Grippi authored 13 years ago
  
  Allow users to click on read notifications to mark them as unread
  c61e84bc
- Merge pull request #2624 from CodeBlock/login-page-title · b88899ff
  Daniel Grippi authored 13 years ago
  
  Add the project name to the title of the Devise login page.
  b88899ff
- Merge pull request #2620 from jbivins/2610-ie9-backbone-fix-2 · 701ce3eb
  Daniel Grippi authored 13 years ago
  
  Fixes #2610 (attempt 2).
  701ce3eb
- Merge pull request #2625 from torrancew/heroku_config_fix · 743c8981
  Jamie Wilkinson authored 13 years ago
  
  heroku:install_requirements task fails on default heroku apps
  743c8981
- Add the project name to the title of the Devise login page, so that · 4556323b
  Ricky Elrod authored 13 years ago
  
  applications that require a unique name in the window title (like KeePassX) can use auto fill, etc.
  4556323b
- Fixes #2610 (attempt 2). · cb18f204
  Joe Bivins authored 13 years ago
  
  Works-around the IE 9 login problem without modifying vendor/backbone.js. Tested with IE 9.0.4.
  cb18f204
- Throwing dev warning note at the top of the README · d0e3d199
  Dennis Collective authored 13 years ago
  
  d0e3d199
- javascript tests for the notification click callback routine. · 17679762
  Steven Fuchs authored 13 years ago
  
  17679762
- Remove logging:basic before adding logging:expanded · def764f2
  Tray Torrance authored 13 years ago
  
  def764f2
- added alpha mark to asterisk in the header · 779de031
  danielgrippi authored 13 years ago
  
  779de031
- Fix typo in 'rake heroku:install_requirements' · c152ecf5
  Jamie Wilkinson authored 13 years ago
  
  c152ecf5
Jan 09, 2012
- Merge pull request #2612 from torrancew/heroku_config_fix · d8c84471
  Daniel Grippi authored 13 years ago
  
  No longer skip false values; quote values so that whitespace is valid.
  d8c84471
- put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] · c11fdb04
  danielgrippi authored 13 years ago
  
  c11fdb04
- No longer skip false values; quote values so that whitespace is valid. · a3561241
  Tray Torrance authored 13 years ago
  
  a3561241
- Merge pull request #2602 from judytuna/master · 46cffe3b
  Daniel Grippi authored 13 years ago
  
  fixed issue 1991 - giving long pre & code a scrollbar [ci skip]
  46cffe3b
- Merge pull request #2601 from Raven24/fix-2567-2 · 84e47ba1
  Daniel Grippi authored 13 years ago
  
  this fixes #2567
  84e47ba1
- Merge pull request #2549 from lprelle/no_stream_redirect_from_settings · bdc9421b
  Daniel Grippi authored 13 years ago
  
  No stream redirection from settings
  bdc9421b
- Fix bug 1991 · b33d82c4
  Judy Tuan authored 13 years ago
  
  b33d82c4
- Merge pull request #2600 from judytuna/master · 38d0cb15
  Sarah Mei authored 13 years ago
  
  Issue 2570: avatar alt text breaks layout
  38d0cb15
- https://github.com/diaspora/diaspora/issues/2570 says "This can easily be... · e36673c1
  Judy Tuan authored 13 years ago
  
  https://github.com/diaspora/diaspora/issues/2570 says "This can easily be fixed by adding overflow: hidden to the CSS class .avatar." so I added '''':overflow hidden'''' to .avatar.
  e36673c1
- add tooltips to stream faces [ci skip] · f09da04c
  danielgrippi authored 13 years ago
  
  f09da04c
- support twitter hashbangs in urls for url parsing [ci skip] · a1cf2792
  danielgrippi authored 13 years ago
  
  a1cf2792
- Set X-Forwarded-Proto to https in nginx.conf to prevent issues with... · 5a9b1756
  Dennis Schubert authored 13 years ago
  
  Set X-Forwarded-Proto to https in nginx.conf to prevent issues with redirect_to and https:// [ci skip]
  5a9b1756
- don't block tiff extensions in our out-of-date js uploader [ci skip] · c6f11f69
  danielgrippi authored 13 years ago
  
  c6f11f69
- Merge pull request #2581 from ChaseReid/patch-1 · fe193741
  Daniel Grippi authored 13 years ago
  
  added support for uploading images with .tiff extensions
  fe193741
- better regex for capturing urls (sensitive to urls in tags) [ci skip] · 5e65c88b
  danielgrippi authored 13 years ago
  
  5e65c88b
Jan 08, 2012
- use app.router.navagate for nav elements that don't expand (i.e. aspects, tags) · 665517ab
  danielgrippi authored 13 years ago
  
  665517ab
- Remove stray console.log. Not skipping CI because I think this may be causing... · e0f89596
  Sarah Mei authored 13 years ago
  
  Remove stray console.log. Not skipping CI because I think this may be causing the cucumber failures.
  e0f89596
- fix for mobile multi stream [ci skip] · 232c4b79
  Maxwell Salzberg authored 13 years ago
  
  232c4b79
- rollback foreman as it seemed to stop liking resque's ENV vars. [ci skip] · d38e75c1
  Maxwell Salzberg authored 13 years ago
  
  d38e75c1
- remove 1.9.3 from travis instead [ci skip] · 334a2edd
  danielgrippi authored 13 years ago
  
  334a2edd
- only test ree and 1.9.3 on travis to make it easier on the travis workers [ci skip] · eb13464c
  danielgrippi authored 13 years ago
  
  eb13464c
- larger buffer for autoscroll · b5dea637
  danielgrippi authored 13 years ago
  
  b5dea637
- switch order of auto-linking · a899e71c
  danielgrippi authored 13 years ago
  
  a899e71c