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

9967 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
f4c9b548f9 update cucumber and capybara. one failing cuke. 2011-12-07 18:40:39 -08:00
danielgrippi
f40ed9bb25 DG MS; remove deprication warning in cukes 2011-12-07 17:32:09 -08:00
danielgrippi
910b0e104c added fog back to the Gemfile 2011-12-07 10:49:00 -08:00
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -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
Jonne Hass
4fad432a30 don't break expected update behaviour for now (disable mhtml creation of jammit) 2011-12-06 17:29:02 +01:00
Jonne Hass
4a996493bd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-06 13:13:38 +01:00
Jonne Hass
38cdfa4ab7 updated 55 locale files [ci skip] 2011-12-06 13:13:28 +01:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
Jonne Hass
7a474e8199 small corrections to locale_settings.yml 2011-12-06 11:33:07 +01: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
083bb8fbbf remove patch for db cleaner (version bump seemed to resolve it) 2011-12-05 23:50:50 -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
Sarah Mei
f99dd3683d Add jasmine:ci and cucumber oauth back into travis 2011-12-05 22:26:14 -08:00
Sarah Mei
d245dc91a5 Clearing rake spec before defining it - see if this affects travis 2011-12-05 22:03:24 -08:00
Sarah Mei
c2b22569b0 Let's try a trace on travis and see if it tells us anything useful. 2011-12-05 21:33:36 -08:00
Sarah Mei
d1044298d4 Remove export display for now to see if it affects travis 2011-12-05 21:14:48 -08:00
Sarah Mei
925753e6e4 travis needs to fail faster 2011-12-05 20:50:30 -08:00
Sarah Mei
df06b04d83 Perhaps the bundler prerelease is the reason we're running specs twice? Let's see. 2011-12-05 20:20:48 -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
Jordi Mallach
da6ff549e1 Update Catalan translation to 548c225. 2011-12-05 15:24:15 +01:00
Pistos
548c225102 Can haz idiomatic English? 2011-12-04 21:47:37 -05:00
Sarah Mei
085471fb55 Remove default rake task's dependency on spec:fixtures for now, to see if that stops travis from running all the specs twice 2011-12-04 17:46:26 -08:00
Sarah Mei
e0a74b7806 Config rspec tags for travis 2011-12-04 17:28:16 -08:00
Gonzalo Rodriguez
77d30949a0 Refactor some cucumber steps 2011-12-03 23:09:51 -02:00
tmlee
3b6c6c564f Include "Looking For #link" under params[:q] blank else branch 2011-12-03 21:23:39 -02:00
Gonzalo Rodriguez
3c74f3d848 Failing spec for empty search bug #2427 2011-12-03 21:19:58 -02:00
Gonzalo Rodriguez
c62a9a2e63 Little refactor on PeopleController#index 2011-12-03 21:19:58 -02:00
Jonne Hass
fbb17ec1a5 Merge pull request #2475 from aabril/master 
Just a mispelled 'diaspora' on the Readme.md
 2011-12-03 14:45:57 -08:00
Albert Abril
73bbf08dc8 fix Diasproa->Diaspora mispelled on the README.md 2011-12-03 22:46:27 +01:00
Daniel Grippi
8212268b99 Merge pull request #2379 from Robsteranium/patch-1 
guid default of "" never gets set to a secure random hex (in mysql at least)
 2011-12-02 10:47:24 -08:00
Daniel Grippi
71354a1673 Merge pull request #2469 from geckoxx/comment_stream_new 
better commented_posts_stream
 2011-12-02 10:42:36 -08:00
Pistos
14e5d9b1c7 Merge remote-tracking branch 'kaleemullah/2265-upload-photo-alt-text' 2011-12-02 12:32:08 -05:00
Johannes Hackel
36c9b9ecdd fix next sql error 2011-12-02 16:33:12 +01:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Robsteranium
08b23d3a7f Condensed as per Daniel's comment 2011-12-02 12:17:24 +00:00
Sarah Mei
c77c9df646 Let's see if travis respects the .rspec file 2011-11-30 22:33:01 -08:00
Kaleem Ullah
afa1274d7c change upload photo alt text 2011-12-01 10:22:35 +04:00
Sarah Mei
03f33f9313 Specify exclusion of fixture and performance separately 2011-11-30 22:14:24 -08:00
Sarah Mei
993b410d95 Fix default rake task so it runs the fixture-generation specs first explicitly. 2011-11-30 21:43:04 -08:00
Sarah Mei
4db288bc65 Check order of generation and use of host-meta fixture on travis 2011-11-30 20:55:59 -08:00
Sarah Mei
2518987538 Try doing join differently for travis 2011-11-30 20:23:48 -08:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00