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

527 commits

Author SHA1 Message Date
Maxwell Salzberg
c073cb078f update messagebus gem 2012-01-23 16:29:19 -08:00
Jonne Haß
12575bd7f0 update http_accept_language and try to find the preferred locale first, should fix #2715 2012-01-23 14:59:09 +01:00
Daniel Grippi
2c50de0726 Merge pull request #2714 from stwf/im-sorry-bye-vanna 
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
 2012-01-22 22:15:14 -08:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
Jonne Haß
7fd606ba19 Merge branch '2688-airbreak' of https://github.com/fred/diaspora 
Conflicts:
	config/application.yml.example
 2012-01-22 15:05:37 +01:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
Dennis Collinson
4b960a0061 update factory girl, hopefull fix ci issues 2012-01-19 01:25:01 -08:00
Maxwell Salzberg
18e895c247 include Rack::SSL to upgrade all requests to ssl 2012-01-18 15:09:08 -08:00
danielgrippi
ff615848ca added active_reload to development gem group. HOLY CRAP. [ci skip] 2012-01-18 13:35:17 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -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
danielgrippi
231b650086 update gems [ci skip] 2012-01-15 19:55:27 -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
Tray Torrance
cd4c880f95 Add unicorn to bundle, supply a basic unicorn config. 2012-01-14 12:25:51 -08:00
Maxwell Salzberg
9ecc3005c4 we do not need the mysql gem for heroku after all.... 2012-01-14 11:20:18 -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
Maxwell Salzberg
fedd864082 update heroku bundle to always include mysql 2012-01-13 15:16:59 -08:00
Maxwell Salzberg
c45057bd94 update settings logic, and heroku rake task 2012-01-13 13:59:34 -08:00
danielgrippi
ad78e79ddd updated some gems 2012-01-11 02:40:51 -08:00
danielgrippi
953eb1db95 we can now use an up-to-date json gem now that chef is gone [ci skip] 2012-01-11 02:31:21 -08:00
Tray Torrance
4df6b65dad Remove chef 2012-01-10 21:56:24 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
danielgrippi
6ee257795f hella sod, yo [ci skip] 2012-01-10 10:57:13 -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
Dennis Collinson
9d24b518f5 DC DG; correctly populate the stream jasmine fixture 2012-01-07 14:23:28 -08:00
danielgrippi
91ba6447d0 add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip 2012-01-07 14:23:20 -08:00
danielgrippi
2dd0012d1e update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc) 2012-01-06 22:33:55 -08:00
Maxwell Salzberg
db387b5ed4 MS DC; remove backup.rake as we now use backup' 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
790c2e84ea MS DC; put pg explictly in heroku group for now 2012-01-04 16:14:52 -08:00
Jonne Haß
296730de04 updated 12 locale files [ci skip] 2012-01-04 13:17:36 +01:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
danielgrippi
80a090c766 update twitter gem 2011-12-11 11:48:47 -08:00
Jonne Hass
afb5e5e7f0 fix json in aspects controller spec 2011-12-11 03:35:19 +01:00
Dan Hansen
4dcdf2899d bump will_paginate from 3.0.pre2 to 3.0.2 2011-12-10 14:07:43 -08:00
Jonne Hass
247863c6f7 update diaspora-client 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
danielgrippi
8666c6e209 update linecache, jasmine, selenium-webdriver 2011-12-09 18:36:45 -08:00
danielgrippi
02fb45e6fe update chef, ohai, fuubar, json 2011-12-09 18:15:52 -08:00
danielgrippi
89b3314d01 upgrade rspec-core, parallel, capistrano 2011-12-09 18:04:53 -08:00
danielgrippi
f4c9b548f9 update cucumber and capybara. one failing cuke. 2011-12-07 18:40:39 -08:00
danielgrippi
910b0e104c added fog back to the Gemfile 2011-12-07 10:49:00 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable" 
This reverts commit 0f56ee7b77.
 2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Daniel Grippi
003a17d27a version bump mysql2 gem 2011-12-06 00:08:47 -08:00
Daniel Grippi
cea87f8cbf remove fog, aws, and excon gems; version bump carrierwave & nokogiri 2011-12-05 23:52:57 -08:00
Daniel Grippi
3dc247a4e6 version bump database_cleaner for better truncation 2011-12-05 23:19:30 -08:00
Daniel Grippi
bd0d4f9ca8 upgrade resque, sass, jammit, fixture_builder 2011-12-05 23:08:14 -08:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
Daniel Grippi
908d0b99a7 Merge pull request #2404 from torrancew/capistrano_colorized 
Capistrano colorized
 2011-11-28 09:11:10 -08:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Jonne Hass
c7f19eb592 update to rails 3.0.11 2011-11-19 13:53:49 +01:00
Tray Torrance
bbc165137f Adds capistrano_colors gem; deprecates custom red method 
Also adjusts current_git_branch to use Capistrano's logger for printing to
STDOUT
 2011-11-15 01:41:41 -08:00
Jonne Hass
5d08bddb5b updated SystemTimer to 1.2.3 2011-11-10 21:49:09 +01:00
danielgrippi
77a6c7045b update newrelic_rpm 2011-11-08 15:39:36 -08:00
danielgrippi
0f19076b40 update selenium-driver to work in FF8 2011-11-07 16:48:28 -08:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving 
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
 2011-11-07 12:50:02 -08:00
Jonne Hass
c4a4516369 hm why do we update gems so rarely? Lets do it for em-websocket 2011-11-03 01:08:53 +01:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Maxwell Salzberg
9fd1d7db63 updating gemfile and schema.rb 2011-10-11 16:53:37 -07:00
Ilya Zhitomirskiy
86e52b0799 remove statstample; made our own correlation function 2011-10-11 12:03:35 -07:00
danielgrippi
818167c565 DG IZ; wip 2011-10-11 10:57:26 -07:00
Maxwell Salzberg
75aa3f8f97 include people names in the from field 2011-10-05 17:12:31 -07:00
Maxwell Salzberg
d91ea4b9ce adding support for message bus email service 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Ilya Zhitomirskiy
8d12a57f37 reding from redis cache 2011-10-04 10:32:16 -07:00
danielgrippi
f25707a58e updated sass; removed kaminari gem 2011-10-02 12:35:12 -07:00
Maxwell Salzberg
5348c72209 add sqlite method; fix chubbies cukes 2011-09-30 14:27:54 -07:00
Maxwell Salzberg
5c96705069 fix typo, update webdriver 2011-09-29 14:48:47 -07:00
Jonne Hass
710f241b42 updated 21 locale files [ci skip] 2011-09-29 14:34:17 +02:00
Ilya Zhitomirskiy
1fe9de328b removing newrelic resque for now 2011-09-28 18:47:42 -07:00
Ilya Zhitomirskiy
95c8986b8e added new relic resque support 2011-09-28 17:53:29 -07:00
Jonne Hass
b706edf76f pull in parallel_testing to speed up rspec 
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
 2011-09-16 22:14:12 +02:00
Maxwell Salzberg
d3b6143a45 remove heroku gem' 2011-09-16 09:44:03 -07:00
Jonne Hass
7b06d3039e bump fixture builder since only 0.3.0 is available through rubygems.org 2011-09-16 18:37:24 +02:00
danielgrippi
a396ad811f remove debug line 2011-09-14 18:21:54 -07:00
danielgrippi
ba63c028e6 added heroku gem, slugignore, and heroku rake task to load application.yml vars as config vars 2011-09-14 18:05:40 -07:00
Loïc Guitaut
e25dd94d63 Fixes issue #1395 (utf8 and ruby 1.9.2) 2011-09-14 11:25:20 +02:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
danielgrippi
810d8ab97a remove rcov from Gemfile (we never used it); this makes rbx happy. reverted back to using rbx on travis 2011-09-13 19:45:28 -07:00
Maxwell Salzberg
adaefd0cb5 MS DG rspec is green update gemfile 2011-09-13 13:34:49 -07:00
Jonne Hass
37787605aa updated 44 locale files [ci skip] 2011-09-12 00:00:58 +02:00
Ilya Zhitomirskiy
aeef0b5f6e changed the Gemfile to default to mysql 2011-09-09 12:04:31 -07:00
Maxwell Salzberg
cd7640a971 add resque timeout 2011-09-08 10:46:36 -07:00
Jonne Hass
292b1e7465 small cleanup 2011-09-06 20:13:56 +02:00
Maxwell Salzberg
7ff11188b6 update gemfile 2011-09-05 13:28:08 -07:00
Jonne Hass
c682eb8a7a updated locales 2011-09-05 02:30:30 +02:00
Jonne Hass
835c4447f6 I just want to see if this works :P 
- Removed launchy since I couldn't find any use of it
- Ruby 1.9 seems to need em-synchrony explictly
- No need to recreate the Gemfile.lock on Travis if proper :platforms
options are used in the Gemfile
- Removed group :development, :test and moved the stuff in the
corresponding sections
- Install adapter Gems according to the env var DB, install al if it is
unset
- Merged database.yml.postgres into database.yml.example. Bonus point:
easier switching between mysql and postgres
- May break everything but lets see what CI says
 2011-09-04 14:53:28 +02:00
Sarah Mei
689fd7ec94 Include both mysql and pg in the Gemfile tp reduce travis startup time. 2011-09-03 22:48:56 -07:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Maxwell Salzberg
1df4e76f36 updating gemfile again 2011-08-23 17:43:35 -07:00
Maxwell Salzberg
89bd4f8da5 updating gemfile and gemfile.lock 2011-08-23 17:28:05 -07:00
danielgrippi
a7d9bbed84 wip 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Raphael Sofaer
60e9fd54e2 Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile 2011-08-18 16:05:14 -07:00
Maxwell Salzberg
419707412a update jasmine to destroy deprication warnings in the tests 2011-08-17 20:57:11 -07:00
danielgrippi
4d4d11b90b upgrade selenium-webdriver to 2.4 for FF6 support 2011-08-17 12:49:07 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
685165d133 Lock fixture_builder at 0.2.2 2011-08-10 10:12:14 -07:00
danielgrippi
aac72b12e7 added hoptoad support, API key read from application.yml 2011-08-09 10:46:15 -07:00
Maxwell Salzberg
215fdf6550 update gemfile.lock to account for new diaspora-client gem that doesnt throw warnings 2011-08-09 10:37:34 -07:00
MrZYX
e11de0c7d0 update i18n-inflector and i18n-inflector-rails, this makes them usable with ruby 1.8.7 again 2011-08-09 17:00:33 +02:00
Raphael Sofaer
7052654b25 Update factorygirl, fix the searcheable_person factory to work with factory_girl 2.0.3 2011-08-05 15:45:05 -07:00
Maxwell Salzberg
f0075db694 mac osx only dependenacy is freaking out production gems 2011-07-31 21:46:38 -07:00
Maxwell Salzberg
70e6c8ccb4 update gemfile.lock due to adding guard 2011-07-31 21:42:25 -07:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
MrZYX
67ffdd71aa update rails-i18n 2011-07-25 12:54:25 +02:00
Maxwell Salzberg
9ac88a8c39 update gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
0cc018dd6b i think this works. there is some weird stuff in vannacontroller, but that might have always been there 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
55009a8381 Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch. 2011-07-13 10:59:41 -07:00
MrZYX
98ebb384ca update i18n-inflector-rails 2011-07-12 20:37:13 +02:00
MrZYX
2a15a17983 rails-i18n is now a gem 2011-07-12 15:04:48 +02:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
63902fd273 Lock oauth2-provider 2011-06-29 17:30:12 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Raphael Sofaer
4683047ee0 point diaspora client to the right place in the gemfiles 2011-06-28 17:36:01 -07:00
Raphael Sofaer
3078220bc0 Point diaspora-client to git 2011-06-28 17:25:02 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer
ef7580a698 Notifications page works with Vanna 2011-06-27 19:51:35 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
danielgrippi
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
Raphael Sofaer
728a547cb2 Undo some pg changes 2011-06-19 16:16:30 +02:00
Raphael Sofaer
7c454b7d15 Fix stream query for postgres, shouldn't break mysql 2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
9366b7243a configured the testmode 2011-06-15 16:04:38 -07:00
Ilya Zhitomirskiy
844bf48851 changed back to the git repo for client 2011-06-14 18:35:36 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07:00
Raphael Sofaer
42d177eea4 Lock linecache to avoid require_relative thing 2011-06-14 09:51:19 -07:00
Raphael Sofaer
4815482354 Start some real docs 2011-06-13 16:12:32 -07:00
Ilya Zhitomirskiy
f31a78f23f updated the Gemfile to point to repo instead of path 2011-06-09 17:42:33 -07:00
Raphael Sofaer
6d5169d707 Chubbies is working with local diaspora-client gem 2011-06-09 15:01:09 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
danielgrippi
918284a8f8 include newrelic if the newrelic config file is present. profiling ftw. 2011-06-02 12:10:03 -07:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Sarah Mei
f732d20f0c Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt. 2011-05-28 21:03:39 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
Sarah Mei
7a2ab42948 Locking to older version of rspec-core as new version has invalid specification 2011-05-22 17:51:53 -07:00
Maxwell Salzberg
15c4463c2a gemfile wars 2011-05-20 14:54:04 -07:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
danielgrippi
4875d6557d update nokogiri, require false on sod 2011-05-16 22:30:25 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -07:00
danielgrippi
0e72a91d1b update login page 2011-05-13 22:05:35 -07:00
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -07:00
Raphael Sofaer
89ec768d06 Rev thin again, 1.2.10 segfaults 2011-05-03 14:44:33 -07:00
Raphael Sofaer
cb483beada Rev Thin for a 'can't find Thin::HttpParser' bug 2011-05-02 15:58:57 -07:00
MrZYX
b1d0ef9695 push gherkin to 2.3.6 since 2.3.5 doesn't compile for me 2011-04-24 15:45:09 +02:00
MrZYX
46d2efd80a update sod 2011-04-21 12:59:43 +02:00
zhitomirskiyi
c31b6f18fd Merge branch 'master' of github.com:diaspora/diaspora 2011-04-20 14:03:58 -07:00
zhitomirskiyi
76c24c2848 added debian sod recipies 2011-04-20 14:02:52 -07:00
maxwell
2223c562c0 first fix of notification page 2011-04-18 15:10:47 -07:00
Raphael Sofaer
8ae90e71be OHAI! Y U BREAK BUILD?? 2011-04-15 15:13:19 -07:00
maxwell
86fe2db24e update publish job to include .atom 2011-03-30 10:41:47 -07:00
maxwell
fa27fa2d29 make one translation absolute to attempt to fix 1.9 build 2011-03-30 10:39:40 -07:00
Raphael Sofaer
36a262a3ad Revert "update selenium-webdriver to 0.1.4,fixes #829" 
This reverts commit eddd8d969f.
 2011-03-27 16:32:40 -07:00
MrZYX
eddd8d969f update selenium-webdriver to 0.1.4,fixes #829 2011-03-27 22:52:33 +02:00
Sarah Mei
a5f6b6512d Upgrade cucumber version 2011-03-27 10:46:38 -07:00
Sarah Mei
bec34ec5e8 Perhaps the silent upgrade of selenium-webdriver freaked out CI. Let's see. 2011-03-22 16:53:06 -07:00
maxwell
155290fb51 updating Gemfile.lock 2011-03-11 15:41:28 -08:00
Raphael Sofaer
7ac3692a92 Fix specs, migrate to downcase tags, still testing migration 2011-03-11 14:23:03 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
ac738df8f5 added missing translation 2011-03-08 19:22:49 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
MrZYX
ae0595bca8 fixed #903 2011-03-03 21:25:01 +01:00
Raphael Sofaer
1afc83f356 Revert "memprof" 
This reverts commit 8ee81314d6.
 2011-03-02 13:34:29 -08:00
Raphael Sofaer
8ee81314d6 memprof 2011-03-02 11:47:13 -08:00
Sarah Mei
d183150fa9 Upgrade launchy. 2011-03-01 21:41:28 -08:00
Raphael Sofaer
68f0f7ec21 Add rcov task 2011-03-01 18:12:42 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
Sarah Mei
5e69f7d9a2 Upgrade arel, for some reason. 2011-02-26 16:02:10 -08:00
MrZYX
ee96dea398 update i18n-inflector to 2.5.1; correct Polski to polski; fixed locales; thanks siefca 2011-02-25 21:41:32 +01:00
maxwell
8f6922bcf9 multihttp job and spec 2011-02-23 16:06:54 -08:00
MrZYX
d32fe1ea08 updated Gemfile.lock 2011-02-24 00:34:18 +01:00
maxwell
eb9a943724 parinoid checks for admin page thx dangold 2011-02-22 15:43:10 -08:00
Sarah Mei
dcf7e57a1d Use standard carrierwave gem instead of deleted git repo. This may break photo uploading, but better that than breaking bundle install. 2011-02-21 13:54:08 -08:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
danielvincent
ca0d52c8e2 log character counts of status messages and comments 2011-02-13 00:17:34 -08:00
zhitomirskiyi
057dcc218d locked the excon version 2011-02-10 17:50:46 -08:00
zhitomirskiyi
f857d87475 fixed photos not being updated 2011-02-10 16:59:30 -08:00
Sarah Mei
d872467d2c Add fuubar for nicer spec output 2011-02-09 14:46:12 -08:00
Raphael
a2bb8515f9 Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
Sarah Mei
c40a266910 Deploy with capistrano. 2011-01-30 22:00:32 -08:00
zhitomirskiyi
6242ac64ed removed unique index on email to a regular index in order to make inviting users through fb work (no email present) 2011-01-26 15:04:46 -08:00
zhitomirskiyi
be57170bf9 added the empty email spec 2011-01-26 14:22:04 -08:00
zhitomirskiyi
8bc857cf4d updated devise added a devise_invitable fork and performed migration 2011-01-26 13:46:50 -08:00
Raphael
e890d73de7 Remove mocha 2011-01-26 11:52:14 -08:00
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
danielvincent
1631452669 added in link to search page 2011-01-24 12:22:18 -08:00
Sarah Mei
225e5fc9d7 This much untested code makes me sad. But I fixed the bug whereby no rake tasks worked because of the require line. 2011-01-21 22:03:21 -08:00
zhitomirskiyi
01a4327c2b use google API instead of highcharts due to licensing 2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd getting rid of gruff and it's imagemagic deps. made graphs on stats pending. 2011-01-21 11:11:58 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
Raphael
b580b7bd2c Putting fixtures in specs... 2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7 Fix specs in the presence of fixture_builder 2011-01-18 10:25:26 -08:00
zhitomirskiyi
995d285fdd ssl s3, attrs 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0c8aca3ef8 rebasing 2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Sarah Mei
910ae49fca Lock down gem versions & github refs in mysql branch because it's got that same damn aws problem. 2011-01-15 15:23:34 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
32d1d26e22 updated some dependancies 2011-01-11 14:39:44 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
maxwell
ed0e739ac3 updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with 2010-12-20 11:22:52 -08:00
Sarah Mei
850dcfd322 Updated versions of carrierwave, aws, cucumber, culerity, gherkin, haml, mail, rspec, rspec-core, rspec-expectations, rspec-mocks, and rspec-rails. What could possibly go wrong? 2010-12-20 02:49:44 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
Raphael
0e77577fbd Websocket now uses redis 2010-12-10 11:25:38 -08:00
Alec Leamas
acb3381dc6 Sticking to git: urls for git repos, as we always do. 
Using a single type of url means just a single type of problems ;)
 2010-12-03 12:20:48 +01:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -08:00
maxwell
11f04a060e frustrated 2010-12-02 18:48:50 -08:00
maxwell
b9131c0e46 pushing to my website for further debugging 2010-12-02 18:47:48 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
danielvincent
8cb2a3a79a resque init, config, gemfile 2010-12-02 12:35:26 -08:00
maxwell
9aa093a0a3 api compatabile, but ugly 2010-12-02 12:35:25 -08:00
Sarah Mei
9adadd39fe new versions of lots o' stuff 2010-12-01 22:49:20 -08:00
danielvincent
5e8606169d rolling back twitter gem to 0.9.12 release. 2010-11-23 10:55:40 -08:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
Sarah Mei
ad6f6498ef Updated version of thor and mongomapper. 2010-11-20 19:08:13 -08:00
Sarah Mei
90193a16f5 fix 1.9 build 2010-11-19 23:14:08 -08:00
zhitomirskiyi
e8d86d6d07 pulled out the certlocations to a config file 2010-11-19 18:14:14 -08:00
Raphael
22aa0d3f26 Updating Gemfile.locl 2010-11-18 15:14:01 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
maxwell
3db8da992a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:12 -08:00
maxwell
c08a991130 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:00 -08:00
danielvincent
f59f6be4b0 users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp. 2010-11-17 19:37:08 -08:00
maxwell
045c8f1aac updated magent, now using my fork untill bugfix gets pulled 2010-11-17 13:49:12 -08:00