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

422 commits

Author SHA1 Message Date
wubwubwubcr3w
8e4e5545eb update heroku_san gem 2012-06-05 16:07:27 +02:00
Maxwell Salzberg
0975488964 possible rspec bug? 
updating from 2.9 ~> 2.10 causes
spec/controllers/publics_controller_spec.rb  to break.  Namely, it now
seems that the host_meta, and web finger actions now return successful
http codes, but have blank bodies. Running this code by hand shows that
the response bodies are indeed not  blank, as reported by rspec-rails
2.9.x
 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
b0eeb11464 update a bunch more unlocked gems 2012-06-03 23:52:20 -07:00
Maxwell Salzberg
d62a2ffc78 according to rspec-rails docs, rspec-rails should be in both test and development groups. Also, remove some implied gems which are sucked in by rspec-rails 2012-06-03 23:45:49 -07:00
Maxwell Salzberg
89406b568e update a bunch of gems that DONT break the build 2012-06-03 23:34:10 -07:00
Maxwell Salzberg
80daa05817 update haml to get rid if weird escape_javascript bug 2012-05-31 23:10:34 -07:00
Maxwell Salzberg
4db207b3dd update to 3.2.5 2012-05-31 22:14:32 -07:00
Maxwell Salzberg
324e460cfb updating rails to 3.2.4 2012-05-31 15:34:26 -07:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
Maxwell Salzberg
9e80639ee8 remove some unused gems 2012-05-22 11:03:58 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Jonne Haß
ccf3bc36f2 updated 20 locale files [ci skip] 2012-05-20 00:36:31 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
af1109dcf7 remove a couple more stray files we dont use anymore, and remove rest-client 2012-05-17 18:23:39 -07:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
b55c2ab956 update heroku san to be an official version 2012-05-17 14:27:51 -07:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :( 
This reverts commit c52342b7cb.
 2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
Maxwell Salzberg
e3ccbb3471 use a forked version of heroku_san until upstream updates; rake now freezes args which was causing probs 
'
 2012-05-15 13:13:23 -07:00
Jonne Haß
9950342599 updated locales [ci skip] 2012-05-15 17:09:13 +02:00
Maxwell Salzberg
89d72f7f1e most recent version of rails has a bug which causes conversations to break: see https://github.com/rails/rails/issues/6312 2012-05-14 21:53:36 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Maxwell Salzberg
4d58940e51 update rails admin [ci skip] 2012-05-14 19:58:07 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Jonne Haß
f4d996d644 do not break non heroku setups/do not confront them with a useless cryptic error message/do not use bundler 1.2 features but lock 1.1 in the Gemfile 2012-05-13 17:03:33 +02:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
Helge Rausch
6b3ba24705 cleaning up in the debugger corner 2012-05-09 08:13:30 +02:00
Helge Rausch
b71f380f5d Merge branch 'master' into debugger 
Conflicts:
	Gemfile.lock
 2012-05-09 07:58:45 +02:00
Maxwell Salzberg
ab981d4339 Merge pull request #3225 from stevenh512/refactor-emails 
Use Markerb for emails
 2012-05-08 10:02:13 -07:00
Maxwell Salzberg
00123c0ab2 update unicorn [ci skip] 2012-05-08 00:05:09 -07:00
Steven Hancock
56db268613 Use markerb for emails 
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
 2012-05-07 19:41:30 -07:00
Maxwell Salzberg
4b363548a2 update selenium-webdriver for ff12 2012-05-07 18:25:05 -07:00
Helge Rausch
7b3d921ace adding 'debugger' gem to Gemfile 
It fixes a lot of the issues ruby-debug19 has.
 2012-05-05 11:50:25 +02:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
danielgrippi
90919fa488 don't attempt to favorite with a save if you are not the post owner. in doing so, you will get logged out. also, update the gemfile.lock 2012-04-29 00:05:49 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong. 
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
 2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging 
max isn't a princess
learn2git
learn2bash
lulz
 2012-04-19 14:59:33 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Maxwell Salzberg
672eb1674f use rails admin gem, not the smaller git repo. NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it 2012-04-17 10:20:52 -07:00
Jonne Haß
959523aae8 updated 22 locale files [ci skip] 2012-04-16 23:58:57 +02:00
Maxwell Salzberg
a558f45f9d use shallow copy of rails_admin [ci skip] 2012-04-15 17:08:05 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass 
bootstrap-sass (w00t)
 2012-04-13 17:44:08 -07:00
danielgrippi
ffbc3aa241 update some gems [ci skip] 2012-04-11 12:48:50 -07:00
Steven Hancock
021cc99492 bootstrap-sass 
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
 2012-04-11 06:16:01 -07:00
Maxwell Salzberg
37c3c3a860 update jasmine and move it to the test/development group 
move jasmine to development and test env, update it
 2012-04-10 19:34:13 -07:00