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

12907 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxwell Salzberg
d53b7b5f9a fix trumpeter spec 2012-04-04 23:05:41 -07:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
danielgrippi
169fc743d5 update feature to pending outdated assertion 2012-04-04 19:20:00 -07:00
Maxwell Salzberg
2fd0905591 dump more data in invite rake task 2012-04-04 19:08:36 -07:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Jonne Haß
5866ebe638 using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip] 2012-04-05 03:14:02 +02:00
danielgrippi
59f092c26a added bootstrap extensions to new-templates [ci skip] 2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0 add two more images to the assets 2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9 add favicon back 2012-04-04 13:00:25 -07:00
Maxwell Salzberg
875ec11afc Merge pull request #3105 from Raven24/evil-comment-cuke 
refactored show-page comment cuke to be like normal comment cuke
 2012-04-04 12:01:19 -07:00
Maxwell Salzberg
e61ed383aa disable postgres for now; there is a problem with travis' postgres, and they are planning to upgrade to postgres9 tomorrow, so we can re-enable it ASAP after that gets sorted 2012-04-04 11:03:37 -07:00
Maxwell Salzberg
f36e081a04 mark the trumpter mentioning spec wip so travis rake cucumber returns the right response code if it is green 2012-04-04 10:41:13 -07:00
Maxwell Salzberg
0216385991 Merge pull request #3102 from stevenh512/fix-asset-sync 
Asset Sync causes asset precompilation to fail
 2012-04-04 10:14:53 -07:00
Florian Staudacher
118ae2d657 refactored show-page comment cuke to be like normal comment cuke 2012-04-04 15:23:39 +02:00
Steven Hancock
39b0c2de11 Only load Asset Sync when S3 is configured 
I consider this a hack, it needs review so I won't push it straight
to the main repo. I tried putting the same code in an initializer but
that appears to be too late to properly initialize the asset_sync
engine.

See diaspora/diaspora#3102
 2012-04-04 04:19:37 -07:00
Lennart Prelle
c2195a3c22 new forms 2012-04-04 11:44:57 +02:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
f86aab3fe2 start building rails3.2 branch [ci skip] 2012-04-04 00:17:06 -07:00
Maxwell Salzberg
78146a95d9 try a much longer wait time and see if that makes things pass on travis :*( 2012-04-03 23:03:11 -07:00
Maxwell Salzberg
8ef49586c3 update foreman 2012-04-03 23:02:16 -07:00
Maxwell Salzberg
7b3e2d7680 update spork, rspec, cucumber, and selenium webdriver 2012-04-03 22:54:15 -07:00
Maxwell Salzberg
16354ae712 jammit rip 2012-04-03 22:53:53 -07:00
Maxwell Salzberg
cf3776fde2 remove webmock from cucumber to try and fix the travis timeout errors :( 2012-04-03 22:16:51 -07:00
Maxwell Salzberg
518d2be1e1 use pretty formatter on CI for great justice 2012-04-03 21:51:18 -07:00
Maxwell Salzberg
f6eec580a0 collect invite tokens here, because why not 2012-04-03 19:57:19 -07:00
Maxwell Salzberg
7a37c0f42a dumb rake task to pipe user emails who have failed invites for 
savekeeping [ci skip]
 2012-04-03 19:01:54 -07:00
Maxwell Salzberg
ef74a06d85 reduce timeout to maybe get cukes to pass 2012-04-03 18:04:08 -07:00
Maxwell Salzberg
baf16479b8 add some assets which are for bootstrap which seem to need them to be in public. bootstrap-sass should deal with this 2012-04-03 18:01:05 -07:00
Maxwell Salzberg
0986e412de well that didnt work... Revert "try reconnecting after every cuke for postgres only to try and deal with travis issues" 
This reverts commit 1604aedf03.
 2012-04-03 17:59:51 -07:00
Maxwell Salzberg
1604aedf03 try reconnecting after every cuke for postgres only to try and deal with travis issues 2012-04-03 17:27:28 -07:00
Maxwell Salzberg
f5754d2b71 small fix for jasmie that works in chrome and ff 2012-04-03 17:26:13 -07:00
Maxwell Salzberg
e521ac92f9 make a test slightly dumber for travis 2012-04-03 16:52:34 -07:00
danielgrippi
5459d07339 bump capybara timeout to avoid timeout errorsdefine cucumber step to be pending so travis doesn't freak out 2012-04-03 16:43:44 -07:00
danielgrippi
3bc3f13651 upgrade backbone, fix tests 
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
 2012-04-03 16:31:52 -07:00
Maxwell Salzberg
fb946bd407 remove handle bars template who got lost in the root dir 2012-04-03 16:22:52 -07:00
Maxwell Salzberg
a5b53717ea small typo fixes, in heroku and seed scripts [ci skip] 2012-04-03 15:02:10 -07:00
Maxwell Salzberg
bb5aa2821d use the built in asset_sync initializer. add a rake task to bootstrap 
heroku and asset sync, which puts the S3 config vars in from your app
config.
 2012-04-03 14:47:33 -07:00
Steven Hancock
a8843c1036 Fix JSON caching regression 
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.

Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.

closes #3094
 2012-04-02 21:40:16 -07:00
Maxwell Salzberg
4ba3ec0b42 update initializer 2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
danielgrippi
e156947d0b fix jasmine specs 2012-04-02 18:17:55 -07:00
Maxwell Salzberg
eee5a89382 Merge pull request #3090 from Raven24/ci-stuff 
css should be delivered by asset pipeline for travis(?)
 2012-04-02 17:40:59 -07:00
Maxwell Salzberg
4523add9d2 Merge pull request #3097 from Raven24/fix-comments-error-cuke 
fix cuke unhappiness I introduced with #3088
 2012-04-02 17:39:57 -07:00
Maxwell Salzberg
7ce61fd4b1 Merge pull request #3095 from Raven24/fix-jasmine-comment-error 
fix jasmine unhappiness I introduced with #3088
 2012-04-02 17:39:40 -07:00
Florian Staudacher
c9fa88a1de fix cuke unhappiness I introduced with #3088 2012-04-03 01:13:44 +02:00