danielgrippi
|
bee8aa8bcd
|
remove unused files/methods
|
2012-01-11 02:26:12 -08:00 |
|
danielgrippi
|
0e5bb81d66
|
remove all references to the websocket. bang bang.
|
2012-01-10 12:28:19 -08:00 |
|
danielgrippi
|
2243778c17
|
add services to be sent to the controller via the Publisher view [ci skip]
|
2012-01-10 11:36:11 -08:00 |
|
danielgrippi
|
6ee257795f
|
hella sod, yo [ci skip]
|
2012-01-10 10:57:13 -08:00 |
|
Daniel Grippi
|
c61e84bc50
|
Merge pull request #2547 from stwf/unread_notifications
Allow users to click on read notifications to mark them as unread
|
2012-01-10 10:46:26 -08:00 |
|
Daniel Grippi
|
b88899ff2a
|
Merge pull request #2624 from CodeBlock/login-page-title
Add the project name to the title of the Devise login page.
|
2012-01-10 10:44:41 -08:00 |
|
Daniel Grippi
|
701ce3ebbf
|
Merge pull request #2620 from jbivins/2610-ie9-backbone-fix-2
Fixes #2610 (attempt 2).
|
2012-01-10 10:43:19 -08:00 |
|
Jamie Wilkinson
|
743c898127
|
Merge pull request #2625 from torrancew/heroku_config_fix
heroku:install_requirements task fails on default heroku apps
|
2012-01-10 08:53:09 -08:00 |
|
Ricky Elrod
|
4556323bda
|
Add the project name to the title of the Devise login page, so that
applications that require a unique name in the window title (like
KeePassX) can use auto fill, etc.
|
2012-01-10 11:23:13 -05:00 |
|
Joe Bivins
|
cb18f204ef
|
Fixes #2610 (attempt 2).
Works-around the IE 9 login problem without modifying vendor/backbone.js.
Tested with IE 9.0.4.
|
2012-01-10 01:59:42 -05:00 |
|
Dennis Collective
|
d0e3d19902
|
Throwing dev warning note at the top of the README
|
2012-01-09 22:47:40 -08:00 |
|
Steven Fuchs
|
176797628e
|
javascript tests for the notification click callback routine.
|
2012-01-10 00:07:42 -05:00 |
|
Tray Torrance
|
def764f29f
|
Remove logging:basic before adding logging:expanded
|
2012-01-09 19:26:33 -08:00 |
|
danielgrippi
|
779de03111
|
added alpha mark to asterisk in the header
|
2012-01-09 16:43:24 -08:00 |
|
Jamie Wilkinson
|
c152ecf5a7
|
Fix typo in 'rake heroku:install_requirements'
|
2012-01-09 16:38:55 -08:00 |
|
Daniel Grippi
|
d8c844714c
|
Merge pull request #2612 from torrancew/heroku_config_fix
No longer skip false values; quote values so that whitespace is valid.
|
2012-01-09 12:23:56 -08:00 |
|
danielgrippi
|
c11fdb0459
|
put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip]
|
2012-01-08 23:43:17 -08:00 |
|
Tray Torrance
|
a35612410f
|
No longer skip false values; quote values so that whitespace is valid.
|
2012-01-08 23:21:21 -08:00 |
|
Daniel Grippi
|
46cffe3b61
|
Merge pull request #2602 from judytuna/master
fixed issue 1991 - giving long pre & code a scrollbar [ci skip]
|
2012-01-08 21:47:36 -08:00 |
|
Daniel Grippi
|
84e47ba159
|
Merge pull request #2601 from Raven24/fix-2567-2
this fixes #2567
|
2012-01-08 20:23:34 -08:00 |
|
Daniel Grippi
|
bdc9421bc5
|
Merge pull request #2549 from lprelle/no_stream_redirect_from_settings
No stream redirection from settings
|
2012-01-08 20:22:53 -08:00 |
|
Judy Tuan
|
b33d82c416
|
Fix bug 1991
|
2012-01-08 19:12:25 -08:00 |
|
Sarah Mei
|
38d0cb15bd
|
Merge pull request #2600 from judytuna/master
Issue 2570: avatar alt text breaks layout
|
2012-01-08 18:47:21 -08:00 |
|
Judy Tuan
|
e36673c1dd
|
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.
|
2012-01-08 18:33:40 -08:00 |
|
danielgrippi
|
f09da04c8a
|
add tooltips to stream faces [ci skip]
|
2012-01-08 17:43:58 -08:00 |
|
danielgrippi
|
a1cf279226
|
support twitter hashbangs in urls for url parsing [ci skip]
|
2012-01-08 17:35:56 -08:00 |
|
Dennis Schubert
|
5a9b17567c
|
Set X-Forwarded-Proto to https in nginx.conf to prevent issues with redirect_to and https:// [ci skip]
|
2012-01-09 02:31:31 +01:00 |
|
danielgrippi
|
c6f11f691d
|
don't block tiff extensions in our out-of-date js uploader [ci skip]
|
2012-01-08 17:23:04 -08:00 |
|
Daniel Grippi
|
fe193741d0
|
Merge pull request #2581 from ChaseReid/patch-1
added support for uploading images with .tiff extensions
|
2012-01-08 17:22:19 -08:00 |
|
danielgrippi
|
5e65c88bd8
|
better regex for capturing urls (sensitive to urls in tags) [ci skip]
|
2012-01-08 17:06:25 -08:00 |
|
danielgrippi
|
665517abfc
|
use app.router.navagate for nav elements that don't expand (i.e. aspects, tags)
|
2012-01-08 14:41:43 -08:00 |
|
Sarah Mei
|
e0f8959647
|
Remove stray console.log. Not skipping CI because I think this may be causing the cucumber failures.
|
2012-01-08 03:24:11 -08:00 |
|
Maxwell Salzberg
|
232c4b7931
|
fix for mobile multi stream [ci skip]
|
2012-01-07 23:31:17 -08:00 |
|
Maxwell Salzberg
|
d38e75c1f5
|
rollback foreman as it seemed to stop liking resque's ENV vars. [ci skip]
|
2012-01-07 22:55:43 -08:00 |
|
danielgrippi
|
334a2edd70
|
remove 1.9.3 from travis instead [ci skip]
|
2012-01-07 22:45:47 -08:00 |
|
danielgrippi
|
eb13464cb5
|
only test ree and 1.9.3 on travis to make it easier on the travis workers [ci skip]
|
2012-01-07 22:44:34 -08:00 |
|
danielgrippi
|
b5dea63774
|
larger buffer for autoscroll
|
2012-01-07 21:25:02 -08:00 |
|
danielgrippi
|
a899e71ce5
|
switch order of auto-linking
|
2012-01-07 21:19:13 -08:00 |
|
danielgrippi
|
07d81e0a85
|
added spinner keyframes to moz
|
2012-01-07 20:59:37 -08:00 |
|
danielgrippi
|
ad2e6a414f
|
autolink urls in content view
|
2012-01-07 20:47:30 -08:00 |
|
danielgrippi
|
70737ddc9d
|
Revert "reference the root o_embed_cache on reshares"
This reverts commit 7020194a57.
|
2012-01-07 20:27:06 -08:00 |
|
danielgrippi
|
7020194a57
|
reference the root o_embed_cache on reshares
|
2012-01-07 20:24:13 -08:00 |
|
danielgrippi
|
d5a4f9eb98
|
use content_view for comments (markdown, tagging)
|
2012-01-07 20:19:47 -08:00 |
|
danielgrippi
|
985657cbc3
|
pass in correct avatar sizes in person json response
|
2012-01-07 20:06:05 -08:00 |
|
danielgrippi
|
c9c7cff479
|
don't fetch more posts from the stream if only one post has been returned
|
2012-01-07 19:59:33 -08:00 |
|
danielgrippi
|
e928cc805a
|
fixed markdown issues with reshares; removed puts from specs
|
2012-01-07 17:33:16 -08:00 |
|
danielgrippi
|
687eb7ba0b
|
double check on photos
|
2012-01-07 15:48:40 -08:00 |
|
danielgrippi
|
36e13893a3
|
fix closes account feature
|
2012-01-07 14:57:44 -08:00 |
|
Dennis Collinson
|
72d141b0a2
|
Merge branch 'backbone-stream'
|
2012-01-07 14:25:45 -08:00 |
|
Dennis Collinson
|
8fa6c46de2
|
DG DC more hashtag fixes, throw in mention clearing cowboy style
|
2012-01-07 14:24:28 -08:00 |
|