nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10295 commits 4 branches 0 tags 121 MiB
Commit graph

10295 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Collective
d0e3d19902 Throwing dev warning note at the top of the README 2012-01-09 22:47:40 -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
Dennis Collinson
daba42c857 mentions now render client side, wow 2012-01-07 14:24:28 -08:00
Dennis Collinson
b13e72bc00 spec fix for markdown 2012-01-07 14:24:28 -08:00
danielgrippi
dea21634a2 add raw_message method to Reshare 2012-01-07 14:24:27 -08:00
danielgrippi
0fb1bf5d4b hash tags are linked on the front end, adding markdown.js file 2012-01-07 14:24:27 -08:00
danielgrippi
fd6e3bae62 move timeago and tooltip logic to the base View 2012-01-07 14:24:27 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 2012-01-07 14:24:27 -08:00
danielgrippi
c3ea1dfc6e DC DG fix search cucumber step 2012-01-07 14:24:27 -08:00
danielgrippi
3db0cd3776 fix all cukes but the tags feature [ci skip] 2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c remove unusued javascript files; GC clearing from application/vanna controller 2012-01-07 14:24:27 -08:00
danielgrippi
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
24950bd364 restored ability to 'unlike' 2012-01-07 14:23:28 -08:00
danielgrippi
ae5fb67f71 long text truncation 2012-01-07 14:23:28 -08:00