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

10405 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Schubert
57697dea28 Quick fix: Fix 500 on /conversations when a author is missing. This is a temporary fix, see #2682 2012-01-17 21:10:45 +01:00
Maxwell Salzberg
6e02f61395 MS remove custom resque job logging as it is making heroku very sad 2012-01-16 20:25:56 -08:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
Dennis Collinson
66d71a217e you should be able to reshare reshares again, first pass 2012-01-16 19:56:52 -08:00
Maxwell Salzberg
d5563d8802 TT MS; fix a bug when the mention string is not actually in the mentions 2012-01-16 15:59:40 -08:00
Maxwell Salzberg
5d01904231 fix bookmarklet. fixes #2605 2012-01-16 14:36:21 -08:00
Maxwell Salzberg
efb05be072 MS TT; update Procfile to be aware of jd.com queue ordering; upgrade foreman 2012-01-16 13:42:02 -08:00
Jonne Haß
68fb01b2fd bump typhoeus timeout to 25 seconds too #2590 [ci skip] 2012-01-16 15:20:12 +01:00
danielgrippi
f698e303cb remove old cruise_config and pkg folder [ci skip] 2012-01-15 20:05:14 -08:00
danielgrippi
62b8e1c3e6 added a few more files to ignore for the slugignore [ci skip] 2012-01-15 20:04:46 -08:00
danielgrippi
231b650086 update gems [ci skip] 2012-01-15 19:55:27 -08:00
danielgrippi
8150d32b86 using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app 2012-01-15 18:28:58 -08:00
danielgrippi
f2cc8b4e41 Revert "move unicorn into the heroku group till we decide if we switch completly to it or not" 
This reverts commit 641cedf343.

Revert "Merge pull request #2663 from torrancew/with_unicorn"

This reverts commit 2a2efd097f, reversing
changes made to 78978f051e.
 2012-01-15 16:07:00 -08:00
danielgrippi
177f608276 fix oembed issues in backbone land 2012-01-15 15:56:34 -08:00
Jonne Haß
203607945b updated 12 locale files [ci skip] 2012-01-15 23:04:57 +01:00
Jonne Haß
641cedf343 move unicorn into the heroku group till we decide if we switch completly to it or not 2012-01-15 22:46:06 +01:00
Jonne Haß
17bd7eee13 remove stray dir [ci skip] 2012-01-15 15:10:55 +01:00
Jonne Haß
f1d18c6b52 move stray source graphic to his mates [ci skip] 2012-01-15 14:59:00 +01:00
Daniel Grippi
2a2efd097f Merge pull request #2663 from torrancew/with_unicorn 
Needz moar unicorns please [ci skip]
 2012-01-15 04:22:03 -08:00
Daniel Grippi
78978f051e Merge pull request #2667 from MrZYX/faraday_timeout 
set faradays timeout to 25 seconds [ci skip]
 2012-01-14 18:17:30 -08:00
Jonne Haß
bec3e2c92b set faradays timeout 25 2012-01-15 02:49:14 +01:00
danielgrippi
9d2b1e9415 actually clear photos from the publisher. also, i hate the photo uploader we're using. 2012-01-14 15:40:44 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
danielgrippi
84af585f87 rescue SocketError on UpdateServiceUser job when dev box is in single process mode and not connected to the internet 2012-01-14 15:40:43 -08:00
Jonne Haß
a07b742c85 remove old code from timeago widget 2012-01-14 23:58:34 +01:00
Jonne Haß
b382bdd3e3 load timeago 2012-01-14 23:29:28 +01:00
Jonne Haß
a482d90bf0 do the extra include of language helper for the vanna controller… 2012-01-14 21:59:49 +01:00
Jonne Haß
7e76c55f56 Merge branch 'master' of github.com:diaspora/diaspora 2012-01-14 21:26:54 +01:00
Jonne Haß
5d0223601b fallback to english pluralization rule if none is found 2012-01-14 21:26:01 +01:00
Tray Torrance
fe72e9d45f Use unicorn with foreman/Procfile 2012-01-14 12:25:51 -08:00
Tray Torrance
cd4c880f95 Add unicorn to bundle, supply a basic unicorn config. 2012-01-14 12:25:51 -08:00
Maxwell Salzberg
ca7632776f prevent mobile comments from 500ing 2012-01-14 11:52:24 -08:00
Maxwell Salzberg
4a144f0cd2 Merge pull request #2664 from jbivins/css-mobile-left-align-comments 
Left-align comment text on mobile devices [ci skip]
 2012-01-14 11:31:42 -08:00
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Maxwell Salzberg
9ecc3005c4 we do not need the mysql gem for heroku after all.... 2012-01-14 11:20:18 -08:00
Jonne Haß
8e47b26f01 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-14 20:07:20 +01:00
Jonne Haß
9e482ff1b1 updated 99 locale files [ci skip] 2012-01-14 20:07:11 +01:00
Joe Bivins
7dab5367c4 Left-align comment text on mobile devices [ci skip] 2012-01-14 11:49:48 -05:00
Jonne Haß
ca87a3f9ea add two to the javascript pluralizations 2012-01-14 16:43:35 +01:00
Jordi Mallach
52c88440a2 Update Catalan translation to e1edef9. 2012-01-14 12:49:26 +01:00
Jordi Mallach
685662c3de Merge branch 'master' of git://github.com/diaspora/diaspora 2012-01-14 12:43:46 +01:00
Maxwell Salzberg
0b6c5421c3 use deep merge. since we now have nested js, we need to do the merge recursively; fixes #2660 2012-01-14 02:49:34 -08:00
Maxwell Salzberg
b10eb9e56a we do not need to require this file here. sorry about that 2012-01-14 01:12:16 -08:00
Maxwell Salzberg
2735f531f4 make search box readable when you are typing stuff into it [ci skip] 2012-01-14 00:46:14 -08:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
Maxwell Salzberg
1251f7433c read settings logic from readonly git to make old centos git happier[ci skip] 2012-01-13 23:35:07 -08:00
danielgrippi
240d595714 removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...) 2012-01-13 23:33:59 -08:00
Daniel Grippi
52df1f3e84 Merge pull request #2654 from torrancew/fix_firefox_3x 
Addresses deficiencies with Firefox 3.x (and hopefully some other older browsers). Should fix #2606 [ci skip]
 2012-01-13 23:30:07 -08:00
Maxwell Salzberg
a955f06762 try loading app config in spec_helper to prevent bad fixtures from being generated 2012-01-13 23:15:32 -08:00
Tray Torrance
ca07f5b9a3 Close #2606 and address other FF 3.x deficiencies. 2012-01-13 21:46:37 -08:00